You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/09/07 13:42:57 UTC
[1/5] airavata git commit: AIRAVATA-2500 Implement API method to get
provisioner metadata
Repository: airavata
Updated Branches:
refs/heads/AIRAVATA-2500 316656c35 -> b0f6744ef
AIRAVATA-2500 Implement API method to get provisioner metadata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/02392dba
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/02392dba
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/02392dba
Branch: refs/heads/AIRAVATA-2500
Commit: 02392dbae27a329f54769f77e6c178a46af85e4e
Parents: 316656c
Author: Marcus Christie <ma...@apache.org>
Authored: Thu Sep 7 09:41:17 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu Sep 7 09:41:17 2017 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 56 ++++++++++++++------
.../accountprovisioning/SSHAccountManager.java | 3 +-
.../SSHAccountProvisioner.java | 10 ++--
.../SSHAccountProvisionerFactory.java | 14 ++---
.../SSHAccountProvisionerProvider.java | 3 +-
.../IULdapSSHAccountProvisioner.java | 10 ----
.../IULdapSSHAccountProvisionerProvider.java | 31 ++++++++++-
.../SSHAccountProvisionerFactoryTest.java | 4 +-
.../provisioner/TestSSHAccountProvisioner.java | 10 ----
.../TestSSHAccountProvisionerProvider.java | 10 ++++
.../airavata-apis/airavata_api.thrift | 12 ++---
.../account_provisioning_model.thrift | 12 +++--
12 files changed, 107 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/02392dba/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index bb3f2c0..febb703 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -19,7 +19,10 @@
*/
package org.apache.airavata.api.server.handler;
+import org.apache.airavata.accountprovisioning.ConfigParam;
import org.apache.airavata.accountprovisioning.SSHAccountManager;
+import org.apache.airavata.accountprovisioning.SSHAccountProvisionerFactory;
+import org.apache.airavata.accountprovisioning.SSHAccountProvisionerProvider;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.airavata_apiConstants;
import org.apache.airavata.api.server.util.ThriftClientPool;
@@ -38,6 +41,7 @@ import org.apache.airavata.messaging.core.Type;
import org.apache.airavata.model.WorkflowModel;
import org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner;
import org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam;
+import org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParamType;
import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
@@ -3969,30 +3973,48 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
@SecurityCheck
- public List<SSHAccountProvisioner> getSSHAccountProvisionerNames(AuthzToken authzToken) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+ public List<SSHAccountProvisioner> getSSHAccountProvisioners(AuthzToken authzToken) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
- // TODO: implement
- return null;
- }
-
- @Override
- @SecurityCheck
- public List<SSHAccountProvisionerConfigParam> getSSHAccountProvisionerConfigParams(AuthzToken authzToken, String provisionerName) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
-
- // TODO: implement
- return null;
+ List<SSHAccountProvisioner> sshAccountProvisioners = new ArrayList<>();
+ List<SSHAccountProvisionerProvider> sshAccountProvisionerProviders = SSHAccountProvisionerFactory.getSSHAccountProvisionerProviders();
+ for (SSHAccountProvisionerProvider provider : sshAccountProvisionerProviders) {
+ // TODO: Move this Thrift conversion to utility class
+ SSHAccountProvisioner sshAccountProvisioner = new SSHAccountProvisioner();
+ sshAccountProvisioner.setCanCreateAccount(provider.canCreateAccount());
+ sshAccountProvisioner.setCanInstallSSHKey(provider.canInstallSSHKey());
+ sshAccountProvisioner.setName(provider.getName());
+ List<SSHAccountProvisionerConfigParam> sshAccountProvisionerConfigParams = new ArrayList<>();
+ for (ConfigParam configParam : provider.getConfigParams()) {
+ SSHAccountProvisionerConfigParam sshAccountProvisionerConfigParam = new SSHAccountProvisionerConfigParam();
+ sshAccountProvisionerConfigParam.setName(configParam.getName());
+ sshAccountProvisionerConfigParam.setDescription(configParam.getDescription());
+ sshAccountProvisionerConfigParam.setIsOptional(configParam.isOptional());
+ switch (configParam.getType()){
+ case STRING:
+ sshAccountProvisionerConfigParam.setType(SSHAccountProvisionerConfigParamType.STRING);
+ break;
+ case CRED_STORE_PASSWORD_TOKEN:
+ sshAccountProvisionerConfigParam.setType(SSHAccountProvisionerConfigParamType.CRED_STORE_PASSWORD_TOKEN);
+ break;
+ }
+ sshAccountProvisionerConfigParams.add(sshAccountProvisionerConfigParam);
+ }
+ sshAccountProvisioner.setConfigParams(sshAccountProvisionerConfigParams);
+ sshAccountProvisioners.add(sshAccountProvisioner);
+ }
+ return sshAccountProvisioners;
}
@Override
@SecurityCheck
- public boolean doesUserHaveSSHAccount(AuthzToken authzToken, String computeResourceId, String username) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+ public boolean doesUserHaveSSHAccount(AuthzToken authzToken, String computeResourceId, String userId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
String gatewayId = authzToken.getClaimsMap().get(Constants.GATEWAY_ID);
- return SSHAccountManager.doesUserHaveSSHAccount(gatewayId, computeResourceId, username);
+ return SSHAccountManager.doesUserHaveSSHAccount(gatewayId, computeResourceId, userId);
}
@Override
@SecurityCheck
- public UserComputeResourcePreference setupUserComputeResourcePreferencesForSSH(AuthzToken authzToken, String computeResourceId, String username, String airavataCredStoreToken) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+ public UserComputeResourcePreference setupUserComputeResourcePreferencesForSSH(AuthzToken authzToken, String computeResourceId, String userId, String airavataCredStoreToken) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
String gatewayId = authzToken.getClaimsMap().get(Constants.GATEWAY_ID);
CredentialStoreService.Client csClient = csClientPool.getResource();
SSHCredential sshCredential = null;
@@ -4008,13 +4030,13 @@ public class AiravataServerHandler implements Airavata.Iface {
}
try {
- UserComputeResourcePreference userComputeResourcePreference = SSHAccountManager.setupSSHAccount(gatewayId, computeResourceId, username, sshCredential);
+ UserComputeResourcePreference userComputeResourcePreference = SSHAccountManager.setupSSHAccount(gatewayId, computeResourceId, userId, sshCredential);
return userComputeResourcePreference;
}catch (Exception e){
- logger.error("Error occurred while automatically setting up SSH account for user [" + username + "]", e);
+ logger.error("Error occurred while automatically setting up SSH account for user [" + userId + "]", e);
AiravataSystemException exception = new AiravataSystemException();
exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
- exception.setMessage("Error occurred while automatically setting up SSH account for user [" + username + "]. More info : " + e.getMessage());
+ exception.setMessage("Error occurred while automatically setting up SSH account for user [" + userId + "]. More info : " + e.getMessage());
throw exception;
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/02392dba/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountManager.java
----------------------------------------------------------------------
diff --git a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountManager.java b/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountManager.java
index 74c0dd2..8493dc1 100644
--- a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountManager.java
+++ b/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountManager.java
@@ -110,11 +110,12 @@ public class SSHAccountManager {
// instantiate and init the account provisioner
SSHAccountProvisioner sshAccountProvisioner = createSshAccountProvisioner(gatewayId, computeResourcePreference);
+ boolean canCreateAccount = SSHAccountProvisionerFactory.canCreateAccount(computeResourcePreference.getSshAccountProvisioner());
// First check if username has an account
boolean hasAccount = sshAccountProvisioner.hasAccount(username);
- if (!hasAccount && !sshAccountProvisioner.canCreateAccount()) {
+ if (!hasAccount && !canCreateAccount) {
throw new RuntimeException("User [" + username + "] doesn't have account and [" + computeResourceId + "] doesn't have a SSH Account Provisioner that supports creating accounts.");
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/02392dba/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisioner.java
----------------------------------------------------------------------
diff --git a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisioner.java b/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisioner.java
index 5303081..b8abf1f 100644
--- a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisioner.java
+++ b/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisioner.java
@@ -25,10 +25,8 @@ import java.util.Map;
public interface SSHAccountProvisioner {
void init(Map<ConfigParam, String> config);
- boolean hasAccount(String username);
- boolean canCreateAccount();
- void createAccount(String username, String sshPublicKey);
- boolean canInstallSSHKey();
- void installSSHKey(String username, String sshPublicKey);
- String getScratchLocation(String username);
+ boolean hasAccount(String userId);
+ void createAccount(String userId, String sshPublicKey);
+ void installSSHKey(String userId, String sshPublicKey);
+ String getScratchLocation(String userId);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/02392dba/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerFactory.java
----------------------------------------------------------------------
diff --git a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerFactory.java b/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerFactory.java
index 7b1f6c6..09bf4c3 100644
--- a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerFactory.java
+++ b/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerFactory.java
@@ -29,12 +29,10 @@ public class SSHAccountProvisionerFactory {
private static ServiceLoader<SSHAccountProvisionerProvider> sshAccountProvisionerProviders = ServiceLoader.load(SSHAccountProvisionerProvider.class);
- public static List<String> getSSHAccountProvisionerImplementationNames() {
- List<String> names = new ArrayList<>();
- for (SSHAccountProvisionerProvider sshAccountProvisionerProvider : sshAccountProvisionerProviders ) {
- names.add(sshAccountProvisionerProvider.getName());
- }
- return names;
+ public static List<SSHAccountProvisionerProvider> getSSHAccountProvisionerProviders() {
+ List<SSHAccountProvisionerProvider> providers = new ArrayList<>();
+ sshAccountProvisionerProviders.forEach(providers::add);
+ return providers;
}
public static List<ConfigParam> getSSHAccountProvisionerConfigParams(String provisionerName) {
@@ -42,6 +40,10 @@ public class SSHAccountProvisionerFactory {
return getSSHAccountProvisionerProvider(provisionerName).getConfigParams();
}
+ public static boolean canCreateAccount(String provisionerName) {
+ return getSSHAccountProvisionerProvider(provisionerName).canCreateAccount();
+ }
+
public static SSHAccountProvisioner createSSHAccountProvisioner(String provisionerName, Map<ConfigParam, String> config) {
SSHAccountProvisionerProvider sshAccountProvisionerProvider = getSSHAccountProvisionerProvider(provisionerName);
http://git-wip-us.apache.org/repos/asf/airavata/blob/02392dba/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerProvider.java
----------------------------------------------------------------------
diff --git a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerProvider.java b/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerProvider.java
index a43a022..297c757 100644
--- a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerProvider.java
+++ b/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerProvider.java
@@ -34,5 +34,6 @@ public interface SSHAccountProvisionerProvider {
}
List<ConfigParam> getConfigParams();
SSHAccountProvisioner createSSHAccountProvisioner(Map<ConfigParam,String> config);
- // TODO: should canCreateAccount and canInstallSSHKey move here? All metadata about provisioner could be on this class
+ boolean canCreateAccount();
+ boolean canInstallSSHKey();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/02392dba/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/provisioner/IULdapSSHAccountProvisioner.java
----------------------------------------------------------------------
diff --git a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/provisioner/IULdapSSHAccountProvisioner.java b/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/provisioner/IULdapSSHAccountProvisioner.java
index 0714f49..03fa803 100644
--- a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/provisioner/IULdapSSHAccountProvisioner.java
+++ b/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/provisioner/IULdapSSHAccountProvisioner.java
@@ -40,22 +40,12 @@ public class IULdapSSHAccountProvisioner implements SSHAccountProvisioner {
}
@Override
- public boolean canCreateAccount() {
- return false;
- }
-
- @Override
public void createAccount(String username, String sshPublicKey) {
throw new UnsupportedOperationException("IULdapSSHAccountProvisioner does not support creating cluster accounts at this time.");
}
@Override
- public boolean canInstallSSHKey() {
- return true;
- }
-
- @Override
public void installSSHKey(String username, String sshPublicKey) {
// TODO: implement
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/02392dba/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/provisioner/IULdapSSHAccountProvisionerProvider.java
----------------------------------------------------------------------
diff --git a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/provisioner/IULdapSSHAccountProvisionerProvider.java b/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/provisioner/IULdapSSHAccountProvisionerProvider.java
index b54fdc4..45dc0a6 100644
--- a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/provisioner/IULdapSSHAccountProvisionerProvider.java
+++ b/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/provisioner/IULdapSSHAccountProvisionerProvider.java
@@ -24,6 +24,7 @@ import org.apache.airavata.accountprovisioning.ConfigParam;
import org.apache.airavata.accountprovisioning.SSHAccountProvisioner;
import org.apache.airavata.accountprovisioning.SSHAccountProvisionerProvider;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -31,8 +32,24 @@ public class IULdapSSHAccountProvisionerProvider implements SSHAccountProvisione
@Override
public List<ConfigParam> getConfigParams() {
- // TODO: implement
- return null;
+ List<ConfigParam> configParams = new ArrayList<>();
+ configParams.add(new ConfigParam("ldap-host")
+ .setDescription("Hostname of LDAP server")
+ .setOptional(false)
+ .setType(ConfigParam.ConfigParamType.STRING));
+ configParams.add(new ConfigParam("ldap-port")
+ .setDescription("Port of LDAP server")
+ .setOptional(false)
+ .setType(ConfigParam.ConfigParamType.STRING));
+ configParams.add(new ConfigParam("ldap-username")
+ .setDescription("Username for LDAP server")
+ .setOptional(false)
+ .setType(ConfigParam.ConfigParamType.STRING));
+ configParams.add(new ConfigParam("ldap-password")
+ .setDescription("Password for LDAP server")
+ .setOptional(false)
+ .setType(ConfigParam.ConfigParamType.CRED_STORE_PASSWORD_TOKEN));
+ return configParams;
}
@Override
@@ -41,4 +58,14 @@ public class IULdapSSHAccountProvisionerProvider implements SSHAccountProvisione
sshAccountProvisioner.init(config);
return sshAccountProvisioner;
}
+
+ @Override
+ public boolean canCreateAccount() {
+ return false;
+ }
+
+ @Override
+ public boolean canInstallSSHKey() {
+ return true;
+ }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/02392dba/modules/compute-account-provisioning/src/test/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerFactoryTest.java
----------------------------------------------------------------------
diff --git a/modules/compute-account-provisioning/src/test/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerFactoryTest.java b/modules/compute-account-provisioning/src/test/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerFactoryTest.java
index 466896e..89e9ff7 100644
--- a/modules/compute-account-provisioning/src/test/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerFactoryTest.java
+++ b/modules/compute-account-provisioning/src/test/java/org/apache/airavata/accountprovisioning/SSHAccountProvisionerFactoryTest.java
@@ -27,13 +27,15 @@ import org.junit.Test;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
public class SSHAccountProvisionerFactoryTest {
@Test
public void testGetSSHAccountProvisionerImplementationNames() {
- List<String> sshAccountProvisionerNames = SSHAccountProvisionerFactory.getSSHAccountProvisionerImplementationNames();
+ List<SSHAccountProvisionerProvider> sshAccountProvisionerProviders = SSHAccountProvisionerFactory.getSSHAccountProvisionerProviders();
+ List<String> sshAccountProvisionerNames = sshAccountProvisionerProviders.stream().map(SSHAccountProvisionerProvider::getName).collect(Collectors.toList());
Assert.assertTrue("names should contain TestSSHAccountProvisioner", sshAccountProvisionerNames.contains("TestSSHAccountProvisioner"));
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/02392dba/modules/compute-account-provisioning/src/test/java/org/apache/airavata/accountprovisioning/provisioner/TestSSHAccountProvisioner.java
----------------------------------------------------------------------
diff --git a/modules/compute-account-provisioning/src/test/java/org/apache/airavata/accountprovisioning/provisioner/TestSSHAccountProvisioner.java b/modules/compute-account-provisioning/src/test/java/org/apache/airavata/accountprovisioning/provisioner/TestSSHAccountProvisioner.java
index d2ef213..f47552f 100644
--- a/modules/compute-account-provisioning/src/test/java/org/apache/airavata/accountprovisioning/provisioner/TestSSHAccountProvisioner.java
+++ b/modules/compute-account-provisioning/src/test/java/org/apache/airavata/accountprovisioning/provisioner/TestSSHAccountProvisioner.java
@@ -41,21 +41,11 @@ public class TestSSHAccountProvisioner implements SSHAccountProvisioner {
}
@Override
- public boolean canCreateAccount() {
- return false;
- }
-
- @Override
public void createAccount(String username, String sshPublicKey) {
}
@Override
- public boolean canInstallSSHKey() {
- return false;
- }
-
- @Override
public void installSSHKey(String username, String sshPublicKey) {
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/02392dba/modules/compute-account-provisioning/src/test/java/org/apache/airavata/accountprovisioning/provisioner/TestSSHAccountProvisionerProvider.java
----------------------------------------------------------------------
diff --git a/modules/compute-account-provisioning/src/test/java/org/apache/airavata/accountprovisioning/provisioner/TestSSHAccountProvisionerProvider.java b/modules/compute-account-provisioning/src/test/java/org/apache/airavata/accountprovisioning/provisioner/TestSSHAccountProvisionerProvider.java
index 65fcfe5..a8d2cb5 100644
--- a/modules/compute-account-provisioning/src/test/java/org/apache/airavata/accountprovisioning/provisioner/TestSSHAccountProvisionerProvider.java
+++ b/modules/compute-account-provisioning/src/test/java/org/apache/airavata/accountprovisioning/provisioner/TestSSHAccountProvisionerProvider.java
@@ -63,4 +63,14 @@ public class TestSSHAccountProvisionerProvider implements SSHAccountProvisionerP
sshAccountProvisioner.init(config);
return sshAccountProvisioner;
}
+
+ @Override
+ public boolean canCreateAccount() {
+ return false;
+ }
+
+ @Override
+ public boolean canInstallSSHKey() {
+ return true;
+ }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/02392dba/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
index e06c234..1eb7b95 100644
--- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
+++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
@@ -2950,13 +2950,7 @@ service Airavata {
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
- list<account_provisioning_model.SSHAccountProvisioner> getSSHAccountProvisionerNames(1: required security_model.AuthzToken authzToken)
- throws (1: airavata_errors.InvalidRequestException ire,
- 2: airavata_errors.AiravataClientException ace,
- 3: airavata_errors.AiravataSystemException ase,
- 4: airavata_errors.AuthorizationException ae)
-
- list<account_provisioning_model.SSHAccountProvisionerConfigParam> getSSHAccountProvisionerConfigParams(1: required security_model.AuthzToken authzToken, 2: required string provisionerName)
+ list<account_provisioning_model.SSHAccountProvisioner> getSSHAccountProvisioners(1: required security_model.AuthzToken authzToken)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase,
@@ -2966,7 +2960,7 @@ service Airavata {
* Check if user has an SSH account on the given compute resource. This
* method will only work if the compute resource has an SSHAccountProvisioner configured for it.
*/
- bool doesUserHaveSSHAccount(1: required security_model.AuthzToken authzToken, 2: required string computeResourceId, 3: required string username)
+ bool doesUserHaveSSHAccount(1: required security_model.AuthzToken authzToken, 2: required string computeResourceId, 3: required string userId)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase,
@@ -2979,7 +2973,7 @@ service Airavata {
* call addUserComputeResourcePreference to persist it.
*/
user_resource_profile_model.UserComputeResourcePreference setupUserComputeResourcePreferencesForSSH(1: required security_model.AuthzToken authzToken,
- 2: required string computeResourceId, 3: required string username, 4: required string airavataCredStoreToken)
+ 2: required string computeResourceId, 3: required string userId, 4: required string airavataCredStoreToken)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase,
http://git-wip-us.apache.org/repos/asf/airavata/blob/02392dba/thrift-interface-descriptions/data-models/resource-catalog-models/account_provisioning_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/resource-catalog-models/account_provisioning_model.thrift b/thrift-interface-descriptions/data-models/resource-catalog-models/account_provisioning_model.thrift
index 245d295..d314f78 100644
--- a/thrift-interface-descriptions/data-models/resource-catalog-models/account_provisioning_model.thrift
+++ b/thrift-interface-descriptions/data-models/resource-catalog-models/account_provisioning_model.thrift
@@ -28,11 +28,6 @@ enum SSHAccountProvisionerConfigParamType {
CRED_STORE_PASSWORD_TOKEN
}
-struct SSHAccountProvisioner {
- 1: required string name;
- 2: required bool canCreateAccount;
- 3: required bool canInstallSSHKey;
-}
struct SSHAccountProvisionerConfigParam {
1: required string name;
@@ -40,3 +35,10 @@ struct SSHAccountProvisionerConfigParam {
3: required bool isOptional = false;
4: optional string description;
}
+
+struct SSHAccountProvisioner {
+ 1: required string name;
+ 2: required bool canCreateAccount;
+ 3: required bool canInstallSSHKey;
+ 4: required list<SSHAccountProvisionerConfigParam> configParams;
+}
[5/5] airavata git commit: AIRAVATA-2500 Thrift stub code generation
Posted by ma...@apache.org.
AIRAVATA-2500 Thrift stub code generation
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b0f6744e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b0f6744e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b0f6744e
Branch: refs/heads/AIRAVATA-2500
Commit: b0f6744efa6872efa4ef4c34ae3e78c6f348e32d
Parents: 02392db
Author: Marcus Christie <ma...@apache.org>
Authored: Thu Sep 7 09:42:32 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu Sep 7 09:42:32 2017 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/api/Airavata.java | 36866 ++++++++---------
.../resources/lib/Airavata/API/Airavata.php | 11348 ++---
.../Model/AppCatalog/GatewayProfile/Types.php | 120 +-
.../SSHAccountProvisioner.java | 159 +-
.../ComputeResourcePreference.java | 25 +-
5 files changed, 24420 insertions(+), 24098 deletions(-)
----------------------------------------------------------------------
[3/5] airavata git commit: AIRAVATA-2500 Thrift stub code generation
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/b0f6744e/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
index 18bfcf5..1c9f9a2 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
@@ -3428,6 +3428,81 @@ interface AiravataIf {
*/
public function deleteGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageId);
/**
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @return \Airavata\Model\AppCatalog\AccountProvisioning\SSHAccountProvisioner[]
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function getSSHAccountProvisioners(\Airavata\Model\Security\AuthzToken $authzToken);
+ /**
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $provisionerName
+ * @return \Airavata\Model\AppCatalog\AccountProvisioning\SSHAccountProvisionerConfigParam[]
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function getSSHAccountProvisionerConfigParams(\Airavata\Model\Security\AuthzToken $authzToken, $provisionerName);
+ /**
+ * Check if user has an SSH account on the given compute resource. This
+ * method will only work if the compute resource has an SSHAccountProvisioner configured for it.
+ *
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $computeResourceId
+ * @param string $userId
+ * @return bool
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function doesUserHaveSSHAccount(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $userId);
+ /**
+ * Setup and return a UserComputeResourcePreference object for this user to SSH into the given compute resource with
+ * the given SSH credential. This method will only work if the compute resource has an SSHAccountProvisioner
+ * configured for it. The returned UserComputeResourcePreference object is not saved; it is up to the client to
+ * call addUserComputeResourcePreference to persist it.
+ *
+ * @param \Airavata\Model\Security\AuthzToken $authzToken
+ * @param string $computeResourceId
+ * @param string $username
+ * @param string $airavataCredStoreToken
+ * @return \Airavata\Model\AppCatalog\UserResourceProfile\UserComputeResourcePreference User specific preferences for a Computer Resource
+ *
+ * computeResourceId:
+ * Corelate the preference to a compute resource.
+ *
+ *
+ * loginUserName:
+ * If turned true, Airavata will override the preferences of better alternatives exist.
+ *
+ *
+ * preferredBatchQueue:
+ * Gateways can choose a defualt batch queue based on average job dimention, reservations or other metrics.
+ *
+ * scratchLocation:
+ * Path to the local scratch space on a HPC cluster. Typically used to create working directory for job execution.
+ *
+ * allocationProjectNumber:
+ * Typically used on HPC machines to charge computing usage to a account number. For instance, on XSEDE once an
+ * allocation is approved, an allocation number is assigned. Before passing this number with job submittions, the
+ * account to be used has to be added to the allocation.
+ *
+ * resourceSpecificCredentialStoreToken:
+ * Resource specific credential store token. If this token is specified, then it is superceeded by the gateway's
+ * default credential store.
+ *
+ *
+ * @throws \Airavata\API\Error\InvalidRequestException
+ * @throws \Airavata\API\Error\AiravataClientException
+ * @throws \Airavata\API\Error\AiravataSystemException
+ * @throws \Airavata\API\Error\AuthorizationException
+ */
+ public function setupUserComputeResourcePreferencesForSSH(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $username, $airavataCredStoreToken);
+ /**
* Register User Resource Profile.
*
* @param UserResourceProfile
@@ -12720,6 +12795,264 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("deleteGatewayStoragePreference failed: unknown result");
}
+ public function getSSHAccountProvisioners(\Airavata\Model\Security\AuthzToken $authzToken)
+ {
+ $this->send_getSSHAccountProvisioners($authzToken);
+ return $this->recv_getSSHAccountProvisioners();
+ }
+
+ public function send_getSSHAccountProvisioners(\Airavata\Model\Security\AuthzToken $authzToken)
+ {
+ $args = new \Airavata\API\Airavata_getSSHAccountProvisioners_args();
+ $args->authzToken = $authzToken;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'getSSHAccountProvisioners', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('getSSHAccountProvisioners', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
+ }
+ }
+
+ public function recv_getSSHAccountProvisioners()
+ {
+ $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getSSHAccountProvisioners_result', $this->input_->isStrictRead());
+ else
+ {
+ $rseqid = 0;
+ $fname = null;
+ $mtype = 0;
+
+ $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+ if ($mtype == TMessageType::EXCEPTION) {
+ $x = new TApplicationException();
+ $x->read($this->input_);
+ $this->input_->readMessageEnd();
+ throw $x;
+ }
+ $result = new \Airavata\API\Airavata_getSSHAccountProvisioners_result();
+ $result->read($this->input_);
+ $this->input_->readMessageEnd();
+ }
+ if ($result->success !== null) {
+ return $result->success;
+ }
+ if ($result->ire !== null) {
+ throw $result->ire;
+ }
+ if ($result->ace !== null) {
+ throw $result->ace;
+ }
+ if ($result->ase !== null) {
+ throw $result->ase;
+ }
+ if ($result->ae !== null) {
+ throw $result->ae;
+ }
+ throw new \Exception("getSSHAccountProvisioners failed: unknown result");
+ }
+
+ public function getSSHAccountProvisionerConfigParams(\Airavata\Model\Security\AuthzToken $authzToken, $provisionerName)
+ {
+ $this->send_getSSHAccountProvisionerConfigParams($authzToken, $provisionerName);
+ return $this->recv_getSSHAccountProvisionerConfigParams();
+ }
+
+ public function send_getSSHAccountProvisionerConfigParams(\Airavata\Model\Security\AuthzToken $authzToken, $provisionerName)
+ {
+ $args = new \Airavata\API\Airavata_getSSHAccountProvisionerConfigParams_args();
+ $args->authzToken = $authzToken;
+ $args->provisionerName = $provisionerName;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'getSSHAccountProvisionerConfigParams', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('getSSHAccountProvisionerConfigParams', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
+ }
+ }
+
+ public function recv_getSSHAccountProvisionerConfigParams()
+ {
+ $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getSSHAccountProvisionerConfigParams_result', $this->input_->isStrictRead());
+ else
+ {
+ $rseqid = 0;
+ $fname = null;
+ $mtype = 0;
+
+ $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+ if ($mtype == TMessageType::EXCEPTION) {
+ $x = new TApplicationException();
+ $x->read($this->input_);
+ $this->input_->readMessageEnd();
+ throw $x;
+ }
+ $result = new \Airavata\API\Airavata_getSSHAccountProvisionerConfigParams_result();
+ $result->read($this->input_);
+ $this->input_->readMessageEnd();
+ }
+ if ($result->success !== null) {
+ return $result->success;
+ }
+ if ($result->ire !== null) {
+ throw $result->ire;
+ }
+ if ($result->ace !== null) {
+ throw $result->ace;
+ }
+ if ($result->ase !== null) {
+ throw $result->ase;
+ }
+ if ($result->ae !== null) {
+ throw $result->ae;
+ }
+ throw new \Exception("getSSHAccountProvisionerConfigParams failed: unknown result");
+ }
+
+ public function doesUserHaveSSHAccount(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $userId)
+ {
+ $this->send_doesUserHaveSSHAccount($authzToken, $computeResourceId, $userId);
+ return $this->recv_doesUserHaveSSHAccount();
+ }
+
+ public function send_doesUserHaveSSHAccount(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $userId)
+ {
+ $args = new \Airavata\API\Airavata_doesUserHaveSSHAccount_args();
+ $args->authzToken = $authzToken;
+ $args->computeResourceId = $computeResourceId;
+ $args->userId = $userId;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'doesUserHaveSSHAccount', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('doesUserHaveSSHAccount', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
+ }
+ }
+
+ public function recv_doesUserHaveSSHAccount()
+ {
+ $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_doesUserHaveSSHAccount_result', $this->input_->isStrictRead());
+ else
+ {
+ $rseqid = 0;
+ $fname = null;
+ $mtype = 0;
+
+ $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+ if ($mtype == TMessageType::EXCEPTION) {
+ $x = new TApplicationException();
+ $x->read($this->input_);
+ $this->input_->readMessageEnd();
+ throw $x;
+ }
+ $result = new \Airavata\API\Airavata_doesUserHaveSSHAccount_result();
+ $result->read($this->input_);
+ $this->input_->readMessageEnd();
+ }
+ if ($result->success !== null) {
+ return $result->success;
+ }
+ if ($result->ire !== null) {
+ throw $result->ire;
+ }
+ if ($result->ace !== null) {
+ throw $result->ace;
+ }
+ if ($result->ase !== null) {
+ throw $result->ase;
+ }
+ if ($result->ae !== null) {
+ throw $result->ae;
+ }
+ throw new \Exception("doesUserHaveSSHAccount failed: unknown result");
+ }
+
+ public function setupUserComputeResourcePreferencesForSSH(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $username, $airavataCredStoreToken)
+ {
+ $this->send_setupUserComputeResourcePreferencesForSSH($authzToken, $computeResourceId, $username, $airavataCredStoreToken);
+ return $this->recv_setupUserComputeResourcePreferencesForSSH();
+ }
+
+ public function send_setupUserComputeResourcePreferencesForSSH(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $username, $airavataCredStoreToken)
+ {
+ $args = new \Airavata\API\Airavata_setupUserComputeResourcePreferencesForSSH_args();
+ $args->authzToken = $authzToken;
+ $args->computeResourceId = $computeResourceId;
+ $args->username = $username;
+ $args->airavataCredStoreToken = $airavataCredStoreToken;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'setupUserComputeResourcePreferencesForSSH', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('setupUserComputeResourcePreferencesForSSH', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
+ }
+ }
+
+ public function recv_setupUserComputeResourcePreferencesForSSH()
+ {
+ $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_setupUserComputeResourcePreferencesForSSH_result', $this->input_->isStrictRead());
+ else
+ {
+ $rseqid = 0;
+ $fname = null;
+ $mtype = 0;
+
+ $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+ if ($mtype == TMessageType::EXCEPTION) {
+ $x = new TApplicationException();
+ $x->read($this->input_);
+ $this->input_->readMessageEnd();
+ throw $x;
+ }
+ $result = new \Airavata\API\Airavata_setupUserComputeResourcePreferencesForSSH_result();
+ $result->read($this->input_);
+ $this->input_->readMessageEnd();
+ }
+ if ($result->success !== null) {
+ return $result->success;
+ }
+ if ($result->ire !== null) {
+ throw $result->ire;
+ }
+ if ($result->ace !== null) {
+ throw $result->ace;
+ }
+ if ($result->ase !== null) {
+ throw $result->ase;
+ }
+ if ($result->ae !== null) {
+ throw $result->ae;
+ }
+ throw new \Exception("setupUserComputeResourcePreferencesForSSH failed: unknown result");
+ }
+
public function registerUserResourceProfile(\Airavata\Model\Security\AuthzToken $authzToken, \Airavata\Model\AppCatalog\UserResourceProfile\UserResourceProfile $userResourceProfile)
{
$this->send_registerUserResourceProfile($authzToken, $userResourceProfile);
@@ -22792,7 +23125,1210 @@ class Airavata_deleteProject_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->projectId);
+ $xfer += $input->readString($this->projectId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('Airavata_deleteProject_args');
+ if ($this->authzToken !== null) {
+ if (!is_object($this->authzToken)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('authzToken', TType::STRUCT, 1);
+ $xfer += $this->authzToken->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->projectId !== null) {
+ $xfer += $output->writeFieldBegin('projectId', TType::STRING, 2);
+ $xfer += $output->writeString($this->projectId);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Airavata_deleteProject_result {
+ static $_TSPEC;
+
+ /**
+ * @var bool
+ */
+ public $success = null;
+ /**
+ * @var \Airavata\API\Error\InvalidRequestException
+ */
+ public $ire = null;
+ /**
+ * @var \Airavata\API\Error\AiravataClientException
+ */
+ public $ace = null;
+ /**
+ * @var \Airavata\API\Error\AiravataSystemException
+ */
+ public $ase = null;
+ /**
+ * @var \Airavata\API\Error\ProjectNotFoundException
+ */
+ public $pnfe = null;
+ /**
+ * @var \Airavata\API\Error\AuthorizationException
+ */
+ public $ae = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 0 => array(
+ 'var' => 'success',
+ 'type' => TType::BOOL,
+ ),
+ 1 => array(
+ 'var' => 'ire',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\InvalidRequestException',
+ ),
+ 2 => array(
+ 'var' => 'ace',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataClientException',
+ ),
+ 3 => array(
+ 'var' => 'ase',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataSystemException',
+ ),
+ 4 => array(
+ 'var' => 'pnfe',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\ProjectNotFoundException',
+ ),
+ 5 => array(
+ 'var' => 'ae',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AuthorizationException',
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['success'])) {
+ $this->success = $vals['success'];
+ }
+ if (isset($vals['ire'])) {
+ $this->ire = $vals['ire'];
+ }
+ if (isset($vals['ace'])) {
+ $this->ace = $vals['ace'];
+ }
+ if (isset($vals['ase'])) {
+ $this->ase = $vals['ase'];
+ }
+ if (isset($vals['pnfe'])) {
+ $this->pnfe = $vals['pnfe'];
+ }
+ if (isset($vals['ae'])) {
+ $this->ae = $vals['ae'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_deleteProject_result';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 0:
+ if ($ftype == TType::BOOL) {
+ $xfer += $input->readBool($this->success);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 1:
+ if ($ftype == TType::STRUCT) {
+ $this->ire = new \Airavata\API\Error\InvalidRequestException();
+ $xfer += $this->ire->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRUCT) {
+ $this->ace = new \Airavata\API\Error\AiravataClientException();
+ $xfer += $this->ace->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRUCT) {
+ $this->ase = new \Airavata\API\Error\AiravataSystemException();
+ $xfer += $this->ase->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::STRUCT) {
+ $this->pnfe = new \Airavata\API\Error\ProjectNotFoundException();
+ $xfer += $this->pnfe->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
+ if ($ftype == TType::STRUCT) {
+ $this->ae = new \Airavata\API\Error\AuthorizationException();
+ $xfer += $this->ae->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('Airavata_deleteProject_result');
+ if ($this->success !== null) {
+ $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
+ $xfer += $output->writeBool($this->success);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ire !== null) {
+ $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
+ $xfer += $this->ire->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ace !== null) {
+ $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 2);
+ $xfer += $this->ace->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ase !== null) {
+ $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 3);
+ $xfer += $this->ase->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->pnfe !== null) {
+ $xfer += $output->writeFieldBegin('pnfe', TType::STRUCT, 4);
+ $xfer += $this->pnfe->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ae !== null) {
+ $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 5);
+ $xfer += $this->ae->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Airavata_getUserProjects_args {
+ static $_TSPEC;
+
+ /**
+ * @var \Airavata\Model\Security\AuthzToken
+ */
+ public $authzToken = null;
+ /**
+ * @var string
+ */
+ public $gatewayId = null;
+ /**
+ * @var string
+ */
+ public $userName = null;
+ /**
+ * @var int
+ */
+ public $limit = null;
+ /**
+ * @var int
+ */
+ public $offset = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'authzToken',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Security\AuthzToken',
+ ),
+ 2 => array(
+ 'var' => 'gatewayId',
+ 'type' => TType::STRING,
+ ),
+ 3 => array(
+ 'var' => 'userName',
+ 'type' => TType::STRING,
+ ),
+ 4 => array(
+ 'var' => 'limit',
+ 'type' => TType::I32,
+ ),
+ 5 => array(
+ 'var' => 'offset',
+ 'type' => TType::I32,
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['authzToken'])) {
+ $this->authzToken = $vals['authzToken'];
+ }
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
+ }
+ if (isset($vals['userName'])) {
+ $this->userName = $vals['userName'];
+ }
+ if (isset($vals['limit'])) {
+ $this->limit = $vals['limit'];
+ }
+ if (isset($vals['offset'])) {
+ $this->offset = $vals['offset'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_getUserProjects_args';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 1:
+ if ($ftype == TType::STRUCT) {
+ $this->authzToken = new \Airavata\Model\Security\AuthzToken();
+ $xfer += $this->authzToken->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->userName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->limit);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->offset);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('Airavata_getUserProjects_args');
+ if ($this->authzToken !== null) {
+ if (!is_object($this->authzToken)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('authzToken', TType::STRUCT, 1);
+ $xfer += $this->authzToken->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->gatewayId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
+ $xfer += $output->writeString($this->gatewayId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->userName !== null) {
+ $xfer += $output->writeFieldBegin('userName', TType::STRING, 3);
+ $xfer += $output->writeString($this->userName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->limit !== null) {
+ $xfer += $output->writeFieldBegin('limit', TType::I32, 4);
+ $xfer += $output->writeI32($this->limit);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->offset !== null) {
+ $xfer += $output->writeFieldBegin('offset', TType::I32, 5);
+ $xfer += $output->writeI32($this->offset);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Airavata_getUserProjects_result {
+ static $_TSPEC;
+
+ /**
+ * @var \Airavata\Model\Workspace\Project[]
+ */
+ public $success = null;
+ /**
+ * @var \Airavata\API\Error\InvalidRequestException
+ */
+ public $ire = null;
+ /**
+ * @var \Airavata\API\Error\AiravataClientException
+ */
+ public $ace = null;
+ /**
+ * @var \Airavata\API\Error\AiravataSystemException
+ */
+ public $ase = null;
+ /**
+ * @var \Airavata\API\Error\AuthorizationException
+ */
+ public $ae = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 0 => array(
+ 'var' => 'success',
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Workspace\Project',
+ ),
+ ),
+ 1 => array(
+ 'var' => 'ire',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\InvalidRequestException',
+ ),
+ 2 => array(
+ 'var' => 'ace',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataClientException',
+ ),
+ 3 => array(
+ 'var' => 'ase',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataSystemException',
+ ),
+ 4 => array(
+ 'var' => 'ae',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AuthorizationException',
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['success'])) {
+ $this->success = $vals['success'];
+ }
+ if (isset($vals['ire'])) {
+ $this->ire = $vals['ire'];
+ }
+ if (isset($vals['ace'])) {
+ $this->ace = $vals['ace'];
+ }
+ if (isset($vals['ase'])) {
+ $this->ase = $vals['ase'];
+ }
+ if (isset($vals['ae'])) {
+ $this->ae = $vals['ae'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_getUserProjects_result';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 0:
+ if ($ftype == TType::LST) {
+ $this->success = array();
+ $_size53 = 0;
+ $_etype56 = 0;
+ $xfer += $input->readListBegin($_etype56, $_size53);
+ for ($_i57 = 0; $_i57 < $_size53; ++$_i57)
+ {
+ $elem58 = null;
+ $elem58 = new \Airavata\Model\Workspace\Project();
+ $xfer += $elem58->read($input);
+ $this->success []= $elem58;
+ }
+ $xfer += $input->readListEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 1:
+ if ($ftype == TType::STRUCT) {
+ $this->ire = new \Airavata\API\Error\InvalidRequestException();
+ $xfer += $this->ire->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRUCT) {
+ $this->ace = new \Airavata\API\Error\AiravataClientException();
+ $xfer += $this->ace->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRUCT) {
+ $this->ase = new \Airavata\API\Error\AiravataSystemException();
+ $xfer += $this->ase->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::STRUCT) {
+ $this->ae = new \Airavata\API\Error\AuthorizationException();
+ $xfer += $this->ae->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('Airavata_getUserProjects_result');
+ if ($this->success !== null) {
+ if (!is_array($this->success)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('success', TType::LST, 0);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->success));
+ {
+ foreach ($this->success as $iter59)
+ {
+ $xfer += $iter59->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ire !== null) {
+ $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
+ $xfer += $this->ire->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ace !== null) {
+ $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 2);
+ $xfer += $this->ace->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ase !== null) {
+ $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 3);
+ $xfer += $this->ase->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ae !== null) {
+ $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 4);
+ $xfer += $this->ae->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Airavata_searchProjects_args {
+ static $_TSPEC;
+
+ /**
+ * @var \Airavata\Model\Security\AuthzToken
+ */
+ public $authzToken = null;
+ /**
+ * @var string
+ */
+ public $gatewayId = null;
+ /**
+ * @var string
+ */
+ public $userName = null;
+ /**
+ * @var array
+ */
+ public $filters = null;
+ /**
+ * @var int
+ */
+ public $limit = null;
+ /**
+ * @var int
+ */
+ public $offset = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'authzToken',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Security\AuthzToken',
+ ),
+ 2 => array(
+ 'var' => 'gatewayId',
+ 'type' => TType::STRING,
+ ),
+ 3 => array(
+ 'var' => 'userName',
+ 'type' => TType::STRING,
+ ),
+ 4 => array(
+ 'var' => 'filters',
+ 'type' => TType::MAP,
+ 'ktype' => TType::I32,
+ 'vtype' => TType::STRING,
+ 'key' => array(
+ 'type' => TType::I32,
+ ),
+ 'val' => array(
+ 'type' => TType::STRING,
+ ),
+ ),
+ 5 => array(
+ 'var' => 'limit',
+ 'type' => TType::I32,
+ ),
+ 6 => array(
+ 'var' => 'offset',
+ 'type' => TType::I32,
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['authzToken'])) {
+ $this->authzToken = $vals['authzToken'];
+ }
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
+ }
+ if (isset($vals['userName'])) {
+ $this->userName = $vals['userName'];
+ }
+ if (isset($vals['filters'])) {
+ $this->filters = $vals['filters'];
+ }
+ if (isset($vals['limit'])) {
+ $this->limit = $vals['limit'];
+ }
+ if (isset($vals['offset'])) {
+ $this->offset = $vals['offset'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_searchProjects_args';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 1:
+ if ($ftype == TType::STRUCT) {
+ $this->authzToken = new \Airavata\Model\Security\AuthzToken();
+ $xfer += $this->authzToken->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->userName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::MAP) {
+ $this->filters = array();
+ $_size60 = 0;
+ $_ktype61 = 0;
+ $_vtype62 = 0;
+ $xfer += $input->readMapBegin($_ktype61, $_vtype62, $_size60);
+ for ($_i64 = 0; $_i64 < $_size60; ++$_i64)
+ {
+ $key65 = 0;
+ $val66 = '';
+ $xfer += $input->readI32($key65);
+ $xfer += $input->readString($val66);
+ $this->filters[$key65] = $val66;
+ }
+ $xfer += $input->readMapEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->limit);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 6:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->offset);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('Airavata_searchProjects_args');
+ if ($this->authzToken !== null) {
+ if (!is_object($this->authzToken)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('authzToken', TType::STRUCT, 1);
+ $xfer += $this->authzToken->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->gatewayId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
+ $xfer += $output->writeString($this->gatewayId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->userName !== null) {
+ $xfer += $output->writeFieldBegin('userName', TType::STRING, 3);
+ $xfer += $output->writeString($this->userName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->filters !== null) {
+ if (!is_array($this->filters)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('filters', TType::MAP, 4);
+ {
+ $output->writeMapBegin(TType::I32, TType::STRING, count($this->filters));
+ {
+ foreach ($this->filters as $kiter67 => $viter68)
+ {
+ $xfer += $output->writeI32($kiter67);
+ $xfer += $output->writeString($viter68);
+ }
+ }
+ $output->writeMapEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->limit !== null) {
+ $xfer += $output->writeFieldBegin('limit', TType::I32, 5);
+ $xfer += $output->writeI32($this->limit);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->offset !== null) {
+ $xfer += $output->writeFieldBegin('offset', TType::I32, 6);
+ $xfer += $output->writeI32($this->offset);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Airavata_searchProjects_result {
+ static $_TSPEC;
+
+ /**
+ * @var \Airavata\Model\Workspace\Project[]
+ */
+ public $success = null;
+ /**
+ * @var \Airavata\API\Error\InvalidRequestException
+ */
+ public $ire = null;
+ /**
+ * @var \Airavata\API\Error\AiravataClientException
+ */
+ public $ace = null;
+ /**
+ * @var \Airavata\API\Error\AiravataSystemException
+ */
+ public $ase = null;
+ /**
+ * @var \Airavata\API\Error\AuthorizationException
+ */
+ public $ae = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 0 => array(
+ 'var' => 'success',
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Workspace\Project',
+ ),
+ ),
+ 1 => array(
+ 'var' => 'ire',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\InvalidRequestException',
+ ),
+ 2 => array(
+ 'var' => 'ace',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataClientException',
+ ),
+ 3 => array(
+ 'var' => 'ase',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataSystemException',
+ ),
+ 4 => array(
+ 'var' => 'ae',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AuthorizationException',
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['success'])) {
+ $this->success = $vals['success'];
+ }
+ if (isset($vals['ire'])) {
+ $this->ire = $vals['ire'];
+ }
+ if (isset($vals['ace'])) {
+ $this->ace = $vals['ace'];
+ }
+ if (isset($vals['ase'])) {
+ $this->ase = $vals['ase'];
+ }
+ if (isset($vals['ae'])) {
+ $this->ae = $vals['ae'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_searchProjects_result';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 0:
+ if ($ftype == TType::LST) {
+ $this->success = array();
+ $_size69 = 0;
+ $_etype72 = 0;
+ $xfer += $input->readListBegin($_etype72, $_size69);
+ for ($_i73 = 0; $_i73 < $_size69; ++$_i73)
+ {
+ $elem74 = null;
+ $elem74 = new \Airavata\Model\Workspace\Project();
+ $xfer += $elem74->read($input);
+ $this->success []= $elem74;
+ }
+ $xfer += $input->readListEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 1:
+ if ($ftype == TType::STRUCT) {
+ $this->ire = new \Airavata\API\Error\InvalidRequestException();
+ $xfer += $this->ire->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRUCT) {
+ $this->ace = new \Airavata\API\Error\AiravataClientException();
+ $xfer += $this->ace->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRUCT) {
+ $this->ase = new \Airavata\API\Error\AiravataSystemException();
+ $xfer += $this->ase->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::STRUCT) {
+ $this->ae = new \Airavata\API\Error\AuthorizationException();
+ $xfer += $this->ae->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('Airavata_searchProjects_result');
+ if ($this->success !== null) {
+ if (!is_array($this->success)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('success', TType::LST, 0);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->success));
+ {
+ foreach ($this->success as $iter75)
+ {
+ $xfer += $iter75->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ire !== null) {
+ $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
+ $xfer += $this->ire->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ace !== null) {
+ $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 2);
+ $xfer += $this->ace->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ase !== null) {
+ $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 3);
+ $xfer += $this->ase->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ae !== null) {
+ $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 4);
+ $xfer += $this->ae->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Airavata_searchExperiments_args {
+ static $_TSPEC;
+
+ /**
+ * @var \Airavata\Model\Security\AuthzToken
+ */
+ public $authzToken = null;
+ /**
+ * @var string
+ */
+ public $gatewayId = null;
+ /**
+ * @var string
+ */
+ public $userName = null;
+ /**
+ * @var array
+ */
+ public $filters = null;
+ /**
+ * @var int
+ */
+ public $limit = null;
+ /**
+ * @var int
+ */
+ public $offset = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'authzToken',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Security\AuthzToken',
+ ),
+ 2 => array(
+ 'var' => 'gatewayId',
+ 'type' => TType::STRING,
+ ),
+ 3 => array(
+ 'var' => 'userName',
+ 'type' => TType::STRING,
+ ),
+ 4 => array(
+ 'var' => 'filters',
+ 'type' => TType::MAP,
+ 'ktype' => TType::I32,
+ 'vtype' => TType::STRING,
+ 'key' => array(
+ 'type' => TType::I32,
+ ),
+ 'val' => array(
+ 'type' => TType::STRING,
+ ),
+ ),
+ 5 => array(
+ 'var' => 'limit',
+ 'type' => TType::I32,
+ ),
+ 6 => array(
+ 'var' => 'offset',
+ 'type' => TType::I32,
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['authzToken'])) {
+ $this->authzToken = $vals['authzToken'];
+ }
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
+ }
+ if (isset($vals['userName'])) {
+ $this->userName = $vals['userName'];
+ }
+ if (isset($vals['filters'])) {
+ $this->filters = $vals['filters'];
+ }
+ if (isset($vals['limit'])) {
+ $this->limit = $vals['limit'];
+ }
+ if (isset($vals['offset'])) {
+ $this->offset = $vals['offset'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_searchExperiments_args';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 1:
+ if ($ftype == TType::STRUCT) {
+ $this->authzToken = new \Airavata\Model\Security\AuthzToken();
+ $xfer += $this->authzToken->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->userName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 4:
+ if ($ftype == TType::MAP) {
+ $this->filters = array();
+ $_size76 = 0;
+ $_ktype77 = 0;
+ $_vtype78 = 0;
+ $xfer += $input->readMapBegin($_ktype77, $_vtype78, $_size76);
+ for ($_i80 = 0; $_i80 < $_size76; ++$_i80)
+ {
+ $key81 = 0;
+ $val82 = '';
+ $xfer += $input->readI32($key81);
+ $xfer += $input->readString($val82);
+ $this->filters[$key81] = $val82;
+ }
+ $xfer += $input->readMapEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->limit);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 6:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->offset);
} else {
$xfer += $input->skip($ftype);
}
@@ -22809,7 +24345,7 @@ class Airavata_deleteProject_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_deleteProject_args');
+ $xfer += $output->writeStructBegin('Airavata_searchExperiments_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -22818,9 +24354,42 @@ class Airavata_deleteProject_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->projectId !== null) {
- $xfer += $output->writeFieldBegin('projectId', TType::STRING, 2);
- $xfer += $output->writeString($this->projectId);
+ if ($this->gatewayId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
+ $xfer += $output->writeString($this->gatewayId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->userName !== null) {
+ $xfer += $output->writeFieldBegin('userName', TType::STRING, 3);
+ $xfer += $output->writeString($this->userName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->filters !== null) {
+ if (!is_array($this->filters)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('filters', TType::MAP, 4);
+ {
+ $output->writeMapBegin(TType::I32, TType::STRING, count($this->filters));
+ {
+ foreach ($this->filters as $kiter83 => $viter84)
+ {
+ $xfer += $output->writeI32($kiter83);
+ $xfer += $output->writeString($viter84);
+ }
+ }
+ $output->writeMapEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->limit !== null) {
+ $xfer += $output->writeFieldBegin('limit', TType::I32, 5);
+ $xfer += $output->writeI32($this->limit);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->offset !== null) {
+ $xfer += $output->writeFieldBegin('offset', TType::I32, 6);
+ $xfer += $output->writeI32($this->offset);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
@@ -22830,11 +24399,11 @@ class Airavata_deleteProject_args {
}
-class Airavata_deleteProject_result {
+class Airavata_searchExperiments_result {
static $_TSPEC;
/**
- * @var bool
+ * @var \Airavata\Model\Experiment\ExperimentSummaryModel[]
*/
public $success = null;
/**
@@ -22850,10 +24419,6 @@ class Airavata_deleteProject_result {
*/
public $ase = null;
/**
- * @var \Airavata\API\Error\ProjectNotFoundException
- */
- public $pnfe = null;
- /**
* @var \Airavata\API\Error\AuthorizationException
*/
public $ae = null;
@@ -22863,7 +24428,12 @@ class Airavata_deleteProject_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::BOOL,
+ 'type' => TType::LST,
+ 'etype' => TType::STRUCT,
+ 'elem' => array(
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Experiment\ExperimentSummaryModel',
+ ),
),
1 => array(
'var' => 'ire',
@@ -22881,11 +24451,6 @@ class Airavata_deleteProject_result {
'class' => '\Airavata\API\Error\AiravataSystemException',
),
4 => array(
- 'var' => 'pnfe',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\ProjectNotFoundException',
- ),
- 5 => array(
'var' => 'ae',
'type' => TType::STRUCT,
'class' => '\Airavata\API\Error\AuthorizationException',
@@ -22905,9 +24470,6 @@ class Airavata_deleteProject_result {
if (isset($vals['ase'])) {
$this->ase = $vals['ase'];
}
- if (isset($vals['pnfe'])) {
- $this->pnfe = $vals['pnfe'];
- }
if (isset($vals['ae'])) {
$this->ae = $vals['ae'];
}
@@ -22915,7 +24477,7 @@ class Airavata_deleteProject_result {
}
public function getName() {
- return 'Airavata_deleteProject_result';
+ return 'Airavata_searchExperiments_result';
}
public function read($input)
@@ -22934,8 +24496,19 @@ class Airavata_deleteProject_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->success);
+ if ($ftype == TType::LST) {
+ $this->success = array();
+ $_size85 = 0;
+ $_etype88 = 0;
+ $xfer += $input->readListBegin($_etype88, $_size85);
+ for ($_i89 = 0; $_i89 < $_size85; ++$_i89)
+ {
+ $elem90 = null;
+ $elem90 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
+ $xfer += $elem90->read($input);
+ $this->success []= $elem90;
+ }
+ $xfer += $input->readListEnd();
} else {
$xfer += $input->skip($ftype);
}
@@ -22966,14 +24539,6 @@ class Airavata_deleteProject_result {
break;
case 4:
if ($ftype == TType::STRUCT) {
- $this->pnfe = new \Airavata\API\Error\ProjectNotFoundException();
- $xfer += $this->pnfe->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 5:
- if ($ftype == TType::STRUCT) {
$this->ae = new \Airavata\API\Error\AuthorizationException();
$xfer += $this->ae->read($input);
} else {
@@ -22992,10 +24557,22 @@ class Airavata_deleteProject_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_deleteProject_result');
+ $xfer += $output->writeStructBegin('Airavata_searchExperiments_result');
if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
- $xfer += $output->writeBool($this->success);
+ if (!is_array($this->success)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('success', TType::LST, 0);
+ {
+ $output->writeListBegin(TType::STRUCT, count($this->success));
+ {
+ foreach ($this->success as $iter91)
+ {
+ $xfer += $iter91->write($output);
+ }
+ }
+ $output->writeListEnd();
+ }
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -23013,13 +24590,8 @@ class Airavata_deleteProject_result {
$xfer += $this->ase->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->pnfe !== null) {
- $xfer += $output->writeFieldBegin('pnfe', TType::STRUCT, 4);
- $xfer += $this->pnfe->write($output);
- $xfer += $output->writeFieldEnd();
- }
if ($this->ae !== null) {
- $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 5);
+ $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 4);
$xfer += $this->ae->write($output);
$xfer += $output->writeFieldEnd();
}
@@ -23030,7 +24602,7 @@ class Airavata_deleteProject_result {
}
-class Airavata_getUserProjects_args {
+class Airavata_getExperimentStatistics_args {
static $_TSPEC;
/**
@@ -23042,17 +24614,25 @@ class Airavata_getUserProjects_args {
*/
public $gatewayId = null;
/**
+ * @var int
+ */
+ public $fromTime = null;
+ /**
+ * @var int
+ */
+ public $toTime = null;
+ /**
* @var string
*/
public $userName = null;
/**
- * @var int
+ * @var string
*/
- public $limit = null;
+ public $applicationName = null;
/**
- * @var int
+ * @var string
*/
- public $offset = null;
+ public $resourceHostName = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -23067,16 +24647,24 @@ class Airavata_getUserProjects_args {
'type' => TType::STRING,
),
3 => array(
- 'var' => 'userName',
- 'type' => TType::STRING,
+ 'var' => 'fromTime',
+ 'type' => TType::I64,
),
4 => array(
- 'var' => 'limit',
- 'type' => TType::I32,
+ 'var' => 'toTime',
+ 'type' => TType::I64,
),
5 => array(
- 'var' => 'offset',
- 'type' => TType::I32,
+ 'var' => 'userName',
+ 'type' => TType::STRING,
+ ),
+ 6 => array(
+ 'var' => 'applicationName',
+ 'type' => TType::STRING,
+ ),
+ 7 => array(
+ 'var' => 'resourceHostName',
+ 'type' => TType::STRING,
),
);
}
@@ -23087,20 +24675,26 @@ class Airavata_getUserProjects_args {
if (isset($vals['gatewayId'])) {
$this->gatewayId = $vals['gatewayId'];
}
+ if (isset($vals['fromTime'])) {
+ $this->fromTime = $vals['fromTime'];
+ }
+ if (isset($vals['toTime'])) {
+ $this->toTime = $vals['toTime'];
+ }
if (isset($vals['userName'])) {
$this->userName = $vals['userName'];
}
- if (isset($vals['limit'])) {
- $this->limit = $vals['limit'];
+ if (isset($vals['applicationName'])) {
+ $this->applicationName = $vals['applicationName'];
}
- if (isset($vals['offset'])) {
- $this->offset = $vals['offset'];
+ if (isset($vals['resourceHostName'])) {
+ $this->resourceHostName = $vals['resourceHostName'];
}
}
}
public function getName() {
- return 'Airavata_getUserProjects_args';
+ return 'Airavata_getExperimentStatistics_args';
}
public function read($input)
@@ -23134,22 +24728,36 @@ class Airavata_getUserProjects_args {
}
break;
case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userName);
+ if ($ftype == TType::I64) {
+ $xfer += $input->readI64($this->fromTime);
} else {
$xfer += $input->skip($ftype);
}
break;
case 4:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->limit);
+ if ($ftype == TType::I64) {
+ $xfer += $input->readI64($this->toTime);
} else {
$xfer += $input->skip($ftype);
}
break;
case 5:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->offset);
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->userName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 6:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->applicationName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 7:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->resourceHostName);
} else {
$xfer += $input->skip($ftype);
}
@@ -23166,7 +24774,7 @@ class Airavata_getUserProjects_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getUserProjects_args');
+ $xfer += $output->writeStructBegin('Airavata_getExperimentStatistics_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -23180,19 +24788,29 @@ class Airavata_getUserProjects_args {
$xfer += $output->writeString($this->gatewayId);
$xfer += $output->writeFieldEnd();
}
+ if ($this->fromTime !== null) {
+ $xfer += $output->writeFieldBegin('fromTime', TType::I64, 3);
+ $xfer += $output->writeI64($this->fromTime);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->toTime !== null) {
+ $xfer += $output->writeFieldBegin('toTime', TType::I64, 4);
+ $xfer += $output->writeI64($this->toTime);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->userName !== null) {
- $xfer += $output->writeFieldBegin('userName', TType::STRING, 3);
+ $xfer += $output->writeFieldBegin('userName', TType::STRING, 5);
$xfer += $output->writeString($this->userName);
$xfer += $output->writeFieldEnd();
}
- if ($this->limit !== null) {
- $xfer += $output->writeFieldBegin('limit', TType::I32, 4);
- $xfer += $output->writeI32($this->limit);
+ if ($this->applicationName !== null) {
+ $xfer += $output->writeFieldBegin('applicationName', TType::STRING, 6);
+ $xfer += $output->writeString($this->applicationName);
$xfer += $output->writeFieldEnd();
}
- if ($this->offset !== null) {
- $xfer += $output->writeFieldBegin('offset', TType::I32, 5);
- $xfer += $output->writeI32($this->offset);
+ if ($this->resourceHostName !== null) {
+ $xfer += $output->writeFieldBegin('resourceHostName', TType::STRING, 7);
+ $xfer += $output->writeString($this->resourceHostName);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
@@ -23202,11 +24820,11 @@ class Airavata_getUserProjects_args {
}
-class Airavata_getUserProjects_result {
+class Airavata_getExperimentStatistics_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Project[]
+ * @var \Airavata\Model\Experiment\ExperimentStatistics
*/
public $success = null;
/**
@@ -23231,12 +24849,8 @@ class Airavata_getUserProjects_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::LST,
- 'etype' => TType::STRUCT,
- 'elem' => array(
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Project',
- ),
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Experiment\ExperimentStatistics',
),
1 => array(
'var' => 'ire',
@@ -23280,7 +24894,7 @@ class Airavata_getUserProjects_result {
}
public function getName() {
- return 'Airavata_getUserProjects_result';
+ return 'Airavata_getExperimentStatistics_result';
}
public function read($input)
@@ -23299,19 +24913,9 @@ class Airavata_getUserProjects_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::LST) {
- $this->success = array();
- $_size53 = 0;
- $_etype56 = 0;
- $xfer += $input->readListBegin($_etype56, $_size53);
- for ($_i57 = 0; $_i57 < $_size53; ++$_i57)
- {
- $elem58 = null;
- $elem58 = new \Airavata\Model\Workspace\Project();
- $xfer += $elem58->read($input);
- $this->success []= $elem58;
- }
- $xfer += $input->readListEnd();
+ if ($ftype == TType::STRUCT) {
+ $this->success = new \Airavata\Model\Experiment\ExperimentStatistics();
+ $xfer += $this->success->read($input);
} else {
$xfer += $input->skip($ftype);
}
@@ -23360,22 +24964,13 @@ class Airavata_getUserProjects_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getUserProjects_result');
+ $xfer += $output->writeStructBegin('Airavata_getExperimentStatistics_result');
if ($this->success !== null) {
- if (!is_array($this->success)) {
+ if (!is_object($this->success)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('success', TType::LST, 0);
- {
- $output->writeListBegin(TType::STRUCT, count($this->success));
- {
- foreach ($this->success as $iter59)
- {
- $xfer += $iter59->write($output);
- }
- }
- $output->writeListEnd();
- }
+ $xfer += $output->writeFieldBegin('success', TType::STRUCT, 0);
+ $xfer += $this->success->write($output);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -23405,7 +25000,7 @@ class Airavata_getUserProjects_result {
}
-class Airavata_searchProjects_args {
+class Airavata_getExperimentsInProject_args {
static $_TSPEC;
/**
@@ -23415,15 +25010,7 @@ class Airavata_searchProjects_args {
/**
* @var string
*/
- public $gatewayId = null;
- /**
- * @var string
- */
- public $userName = null;
- /**
- * @var array
- */
- public $filters = null;
+ public $projectId = null;
/**
* @var int
*/
@@ -23442,30 +25029,14 @@ class Airavata_searchProjects_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'gatewayId',
+ 'var' => 'projectId',
'type' => TType::STRING,
),
3 => array(
- 'var' => 'userName',
- 'type' => TType::STRING,
- ),
- 4 => array(
- 'var' => 'filters',
- 'type' => TType::MAP,
- 'ktype' => TType::I32,
- 'vtype' => TType::STRING,
- 'key' => array(
- 'type' => TType::I32,
- ),
- 'val' => array(
- 'type' => TType::STRING,
- ),
- ),
- 5 => array(
'var' => 'limit',
'type' => TType::I32,
),
- 6 => array(
+ 4 => array(
'var' => 'offset',
'type' => TType::I32,
),
@@ -23475,14 +25046,8 @@ class Airavata_searchProjects_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['gatewayId'])) {
- $this->gatewayId = $vals['gatewayId'];
- }
- if (isset($vals['userName'])) {
- $this->userName = $vals['userName'];
- }
- if (isset($vals['filters'])) {
- $this->filters = $vals['filters'];
+ if (isset($vals['projectId'])) {
+ $this->projectId = $vals['projectId'];
}
if (isset($vals['limit'])) {
$this->limit = $vals['limit'];
@@ -23494,7 +25059,7 @@ class Airavata_searchProjects_args {
}
public function getName() {
- return 'Airavata_searchProjects_args';
+ return 'Airavata_getExperimentsInProject_args';
}
public function read($input)
@@ -23522,46 +25087,19 @@ class Airavata_searchProjects_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
+ $xfer += $input->readString($this->projectId);
} else {
$xfer += $input->skip($ftype);
}
break;
case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::MAP) {
- $this->filters = array();
- $_size60 = 0;
- $_ktype61 = 0;
- $_vtype62 = 0;
- $xfer += $input->readMapBegin($_ktype61, $_vtype62, $_size60);
- for ($_i64 = 0; $_i64 < $_size60; ++$_i64)
- {
- $key65 = 0;
- $val66 = '';
- $xfer += $input->readI32($key65);
- $xfer += $input->readString($val66);
- $this->filters[$key65] = $val66;
- }
- $xfer += $input->readMapEnd();
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 5:
if ($ftype == TType::I32) {
$xfer += $input->readI32($this->limit);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 6:
+ case 4:
if ($ftype == TType::I32) {
$xfer += $input->readI32($this->offset);
} else {
@@ -23580,7 +25118,7 @@ class Airavata_searchProjects_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_searchProjects_args');
+ $xfer += $output->writeStructBegin('Airavata_getExperimentsInProject_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -23589,41 +25127,18 @@ class Airavata_searchProjects_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 2);
- $xfer += $output->writeString($this->gatewayId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->userName !== null) {
- $xfer += $output->writeFieldBegin('userName', TType::STRING, 3);
- $xfer += $output->writeString($this->userName);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->filters !== null) {
- if (!is_array($this->filters)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('filters', TType::MAP, 4);
- {
- $output->writeMapBegin(TType::I32, TType::STRING, count($this->filters));
- {
- foreach ($this->filters as $kiter67 => $viter68)
- {
- $xfer += $output->writeI32($kiter67);
- $xfer += $output->writeString($viter68);
- }
- }
- $output->writeMapEnd();
- }
+ if ($this->projectId !== null) {
+ $xfer += $output->writeFieldBegin('projectId', TType::STRING, 2);
+ $xfer += $output->writeString($this->projectId);
$xfer += $output->writeFieldEnd();
}
if ($this->limit !== null) {
- $xfer += $output->writeFieldBegin('limit', TType::I32, 5);
+ $xfer += $output->writeFieldBegin('limit', TType::I32, 3);
$xfer += $output->writeI32($this->limit);
$xfer += $output->writeFieldEnd();
}
if ($this->offset !== null) {
- $xfer += $output->writeFieldBegin('offset', TType::I32, 6);
+ $xfer += $output->writeFieldBegin('offset', TType::I32, 4);
$xfer += $output->writeI32($this->offset);
$xfer += $output->writeFieldEnd();
}
@@ -23634,11 +25149,11 @@ class Airavata_searchProjects_args {
}
-class Airavata_searchProjects_result {
+class Airavata_getExperimentsInProject_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Workspace\Project[]
+ * @var \Airavata\Model\Experiment\ExperimentModel[]
*/
public $success = null;
/**
@@ -23654,6 +25169,10 @@ class Airavata_searchProjects_result {
*/
public $ase = null;
/**
+ * @var \Airavata\API\Error\ProjectNotFoundException
+ */
+ public $pnfe = null;
+ /**
* @var \Airavata\API\Error\AuthorizationException
*/
public $ae = null;
@@ -23667,7 +25186,7 @@ class Airavata_searchProjects_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Workspace\Project',
+ 'class' => '\Airavata\Model\Experiment\ExperimentModel',
),
),
1 => array(
@@ -23686,6 +25205,11 @@ class Airavata_searchProjects_result {
'class' => '\Airavata\API\Error\AiravataSystemException',
),
4 => array(
+ 'var' => 'pnfe',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\ProjectNotFoundException',
+ ),
+ 5 => array(
'var' => 'ae',
'type' => TType::STRUCT,
'class' => '\Airavata\API\Error\AuthorizationException',
@@ -23705,6 +25229,9 @@ class Airavata_searchProjects_result {
if (isset($vals['ase'])) {
$this->ase = $vals['ase'];
}
+ if (isset($vals['pnfe'])) {
+ $this->pnfe = $vals['pnfe'];
+ }
if (isset($vals['ae'])) {
$this->ae = $vals['ae'];
}
@@ -23712,7 +25239,7 @@ class Airavata_searchProjects_result {
}
public function getName() {
- return 'Airavata_searchProjects_result';
+ return 'Airavata_getExperimentsInProject_result';
}
public function read($input)
@@ -23733,15 +25260,15 @@ class Airavata_searchProjects_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size69 = 0;
- $_etype72 = 0;
- $xfer += $input->readListBegin($_etype72, $_size69);
- for ($_i73 = 0; $_i73 < $_size69; ++$_i73)
+ $_size92 = 0;
+ $_etype95 = 0;
+ $xfer += $input->readListBegin($_etype95, $_size92);
+ for ($_i96 = 0; $_i96 < $_size92; ++$_i96)
{
- $elem74 = null;
- $elem74 = new \Airavata\Model\Workspace\Project();
- $xfer += $elem74->read($input);
- $this->success []= $elem74;
+ $elem97 = null;
+ $elem97 = new \Airavata\Model\Experiment\ExperimentModel();
+ $xfer += $elem97->read($input);
+ $this->success []= $elem97;
}
$xfer += $input->readListEnd();
} else {
@@ -23774,6 +25301,14 @@ class Airavata_searchProjects_result {
break;
case 4:
if ($ftype == TType::STRUCT) {
+ $this->pnfe = new \Airavata\API\Error\ProjectNotFoundException();
+ $xfer += $this->pnfe->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
+ if ($ftype == TType::STRUCT) {
$this->ae = new \Airavata\API\Error\AuthorizationException();
$xfer += $this->ae->read($input);
} else {
@@ -23792,7 +25327,7 @@ class Airavata_searchProjects_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_searchProjects_result');
+ $xfer += $output->writeStructBegin('Airavata_getExperimentsInProject_result');
if ($this->success !== null) {
if (!is_array($this->success)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -23801,9 +25336,9 @@ class Airavata_searchProjects_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter75)
+ foreach ($this->success as $iter98)
{
- $xfer += $iter75->write($output);
+ $xfer += $iter98->write($output);
}
}
$output->writeListEnd();
@@ -23825,8 +25360,13 @@ class Airavata_searchProjects_result {
$xfer += $this->ase->write($output);
$xfer += $output->writeFieldEnd();
}
+ if ($this->pnfe !== null) {
+ $xfer += $output->writeFieldBegin('pnfe', TType::STRUCT, 4);
+ $xfer += $this->pnfe->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->ae !== null) {
- $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 4);
+ $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 5);
$xfer += $this->ae->write($output);
$xfer += $output->writeFieldEnd();
}
@@ -23837,7 +25377,7 @@ class Airavata_searchProjects_result {
}
-class Airavata_searchExperiments_args {
+class Airavata_getUserExperiments_args {
static $_TSPEC;
/**
@@ -23853,10 +25393,6 @@ class Airavata_searchExperiments_args {
*/
public $userName = null;
/**
- * @var array
- */
- public $filters = null;
- /**
* @var int
*/
public $limit = null;
@@ -23882,22 +25418,10 @@ class Airavata_searchExperiments_args {
'type' => TType::STRING,
),
4 => array(
- 'var' => 'filters',
- 'type' => TType::MAP,
- 'ktype' => TType::I32,
- 'vtype' => TType::STRING,
- 'key' => array(
- 'type' => TType::I32,
- ),
- 'val' => array(
- 'type' => TType::STRING,
- ),
- ),
- 5 => array(
'var' => 'limit',
'type' => TType::I32,
),
- 6 => array(
+ 5 => array(
'var' => 'offset',
'type' => TType::I32,
),
@@ -23913,9 +25437,6 @@ class Airavata_searchExperiments_args {
if (isset($vals['userName'])) {
$this->userName = $vals['userName'];
}
- if (isset($vals['filters'])) {
- $this->filters = $vals['filters'];
- }
if (isset($vals['limit'])) {
$this->limit = $vals['limit'];
}
@@ -23926,7 +25447,7 @@ class Airavata_searchExperiments_args {
}
public function getName() {
- return 'Airavata_searchExperiments_args';
+ return 'Airavata_getUserExperiments_args';
}
public function read($input)
@@ -23967,33 +25488,13 @@ class Airavata_searchExperiments_args {
}
break;
case 4:
- if ($ftype == TType::MAP) {
- $this->filters = array();
- $_size76 = 0;
- $_ktype77 = 0;
- $_vtype78 = 0;
- $xfer += $input->readMapBegin($_ktype77, $_vtype78, $_size76);
- for ($_i80 = 0; $_i80 < $_size76; ++$_i80)
- {
- $key81 = 0;
- $val82 = '';
- $xfer += $input->readI32($key81);
- $xfer += $input->readString($val82);
- $this->filters[$key81] = $val82;
- }
- $xfer += $input->readMapEnd();
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 5:
if ($ftype == TType::I32) {
$xfer += $input->readI32($this->limit);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 6:
+ case 5:
if ($ftype == TType::I32) {
$xfer += $input->readI32($this->offset);
} else {
@@ -24012,7 +25513,7 @@ class Airavata_searchExperiments_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_searchExperiments_args');
+ $xfer += $output->writeStructBegin('Airavata_getUserExperiments_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -24031,31 +25532,13 @@ class Airavata_searchExperiments_args {
$xfer += $output->writeString($this->userName);
$xfer += $output->writeFieldEnd();
}
- if ($this->filters !== null) {
- if (!is_array($this->filters)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('filters', TType::MAP, 4);
- {
- $output->writeMapBegin(TType::I32, TType::STRING, count($this->filters));
- {
- foreach ($this->filters as $kiter83 => $viter84)
- {
- $xfer += $output->writeI32($kiter83);
- $xfer += $output->writeString($viter84);
- }
- }
- $output->writeMapEnd();
- }
- $xfer += $output->writeFieldEnd();
- }
if ($this->limit !== null) {
- $xfer += $output->writeFieldBegin('limit', TType::I32, 5);
+ $xfer += $output->writeFieldBegin('limit', TType::I32, 4);
$xfer += $output->writeI32($this->limit);
$xfer += $output->writeFieldEnd();
}
if ($this->offset !== null) {
- $xfer += $output->writeFieldBegin('offset', TType::I32, 6);
+ $xfer += $output->writeFieldBegin('offset', TType::I32, 5);
$xfer += $output->writeI32($this->offset);
$xfer += $output->writeFieldEnd();
}
@@ -24066,11 +25549,11 @@ class Airavata_searchExperiments_args {
}
-class Airavata_searchExperiments_result {
+class Airavata_getUserExperiments_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\Experiment\ExperimentSummaryModel[]
+ * @var \Airavata\Model\Experiment\ExperimentModel[]
*/
public $success = null;
/**
@@ -24099,7 +25582,7 @@ class Airavata_searchExperiments_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Experiment\ExperimentSummaryModel',
+ 'class' => '\Airavata\Model\Experiment\ExperimentModel',
),
),
1 => array(
@@ -24144,7 +25627,7 @@ class Airavata_searchExperiments_result {
}
public function getName() {
- return 'Airavata_searchExperiments_result';
+ return 'Airavata_getUserExperiments_result';
}
public function read($input)
@@ -24165,15 +25648,15 @@ class Airavata_searchExperiments_result {
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size85 = 0;
- $_etype88 = 0;
- $xfer += $input->readListBegin($_etype88, $_size85);
- for ($_i89 = 0; $_i89 < $_size85; ++$_i89)
+ $_size99 = 0;
+ $_etype102 = 0;
+ $xfer += $input->readListBegin($_etype102, $_size99);
+ for ($_i103 = 0; $_i103 < $_size99; ++$_i103)
{
- $elem90 = null;
- $elem90 = new \Airavata\Model\Experiment\ExperimentSummaryModel();
- $xfer += $elem90->read($input);
- $this->success []= $elem90;
+ $elem104 = null;
+ $elem104 = new \Airavata\Model\Experiment\ExperimentModel();
+ $xfer += $elem104->read($input);
+ $this->success []= $elem104;
}
$xfer += $input->readListEnd();
} else {
@@ -24224,7 +25707,7 @@ class Airavata_searchExperiments_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_searchExperiments_result');
+ $xfer += $output->writeStructBegin('Airavata_getUserExperiments_result');
if ($this->success !== null) {
if (!is_array($this->success)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -24233,9 +25716,9 @@ class Airavata_searchExperiments_result {
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter91)
+ foreach ($this->success as $iter105)
{
- $xfer += $iter91->write($output);
+ $xfer += $iter105->write($output);
}
}
$output->writeListEnd();
@@ -24269,7 +25752,7 @@ class Airavata_searchExperiments_result {
}
-class Airavata_getExperimentStatistics_args {
+class Airavata_createExperiment_args {
static $_TSPEC;
/**
@@ -24281,25 +25764,9 @@ class Airavata_getExperimentStatistics_args {
*/
public $gatewayId = null;
/**
- * @var int
- */
- public $fromTime = null;
- /**
- * @var int
- */
- public $toTime = null;
- /**
- * @var string
- */
- public $userName = null;
- /**
- * @var string
- */
- public $applicationName = null;
- /**
- * @var string
+ * @var \Airavata\Model\Experiment\ExperimentModel
*/
- public $resourceHostName = null;
+ public $experiment = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -24314,24 +25781,9 @@ class Airavata_getExperimentStatistics_args {
'type' => TType::STRING,
),
3 => array(
- 'var' => 'fromTime',
- 'type' => TType::I64,
- ),
- 4 => array(
- 'var' => 'toTime',
- 'type' => TType::I64,
- ),
- 5 => array(
- 'var' => 'userName',
- 'type' => TType::STRING,
- ),
- 6 => array(
- 'var' => 'applicationName',
- 'type' => TType::STRING,
- ),
- 7 => array(
- 'var' => 'resourceHostName',
- 'type' => TType::STRING,
+ 'var' => 'experiment',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\Experiment\ExperimentModel',
),
);
}
@@ -24342,26 +25794,14 @@ class Airavata_getExperimentStatistics_args {
if (isset($vals['gatewayId'])) {
$this->gatewayId = $vals['gatewayId'];
}
- if (isset($vals['fromTime'])) {
- $this->fromTime = $vals['fromTime'];
- }
- if (isset($vals['toTime'])) {
- $this->toTime = $vals['toTime'];
- }
- if (isset($vals['userName'])) {
- $this->userName = $vals['userName'];
- }
- if (isset($vals['applicationName'])) {
- $this->applicationName = $vals['applicationName'];
- }
- if (isset($vals['resourceHostName'])) {
- $this->resourceHostName = $vals['resourceHostName'];
+ if (isset($vals['experiment'])) {
+ $this->experiment = $vals['experiment'];
}
}
}
public function getName() {
- return 'Airavata_getExperimentStatistics_args';
+ return 'Airavata_createExperiment_args';
}
public function read($input)
@@ -24395,36 +25835,9 @@ class Airavata_getExperimentStatistics_args {
}
break;
case 3:
- if ($ftype == TType::I64) {
- $xfer += $input->readI64($this->fromTime);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::I64) {
- $xfer += $input->readI64($this->toTime);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 5:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 6:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->applicationName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 7:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->resourceHostName);
+ if ($ftype == TType::STRUCT) {
+ $this->experiment = new \Airavata\Model\Experiment\ExperimentModel();
+ $xfer += $this->experiment->read($input);
} else {
$xfer += $input->skip($ftype);
}
@@ -24441,7 +25854,7 @@ class Airavata_getExperimentStatistics_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getExperimentStatistics_args');
+ $xfer += $output->writeStructBegin('Airavata_createExperiment_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::IN
<TRUNCATED>
[4/5] airavata git commit: AIRAVATA-2500 Thrift stub code generation
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/b0f6744e/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 d92d222..48fdbd8 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
@@ -2621,9 +2621,7 @@ public class Airavata {
*/
public boolean deleteGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
- public List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner> getSSHAccountProvisionerNames(org.apache.airavata.model.security.AuthzToken authzToken) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
-
- public List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam> getSSHAccountProvisionerConfigParams(org.apache.airavata.model.security.AuthzToken authzToken, String provisionerName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+ public List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner> getSSHAccountProvisioners(org.apache.airavata.model.security.AuthzToken authzToken) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
/**
* Check if user has an SSH account on the given compute resource. This
@@ -2631,9 +2629,9 @@ public class Airavata {
*
* @param authzToken
* @param computeResourceId
- * @param username
+ * @param userId
*/
- public boolean doesUserHaveSSHAccount(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String username) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+ public boolean doesUserHaveSSHAccount(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String userId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
/**
* Setup and return a UserComputeResourcePreference object for this user to SSH into the given compute resource with
@@ -2643,10 +2641,10 @@ public class Airavata {
*
* @param authzToken
* @param computeResourceId
- * @param username
+ * @param userId
* @param airavataCredStoreToken
*/
- public org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference setupUserComputeResourcePreferencesForSSH(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String username, String airavataCredStoreToken) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+ public org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference setupUserComputeResourcePreferencesForSSH(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String userId, String airavataCredStoreToken) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
/**
* Register User Resource Profile.
@@ -3318,13 +3316,11 @@ public class Airavata {
public void deleteGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getSSHAccountProvisionerNames(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void getSSHAccountProvisioners(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getSSHAccountProvisionerConfigParams(org.apache.airavata.model.security.AuthzToken authzToken, String provisionerName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void doesUserHaveSSHAccount(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String userId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void doesUserHaveSSHAccount(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String username, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
- public void setupUserComputeResourcePreferencesForSSH(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String username, String airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void setupUserComputeResourcePreferencesForSSH(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String userId, String airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void registerUserResourceProfile(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile userResourceProfile, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
@@ -8310,23 +8306,23 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteGatewayStoragePreference failed: unknown result");
}
- public List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner> getSSHAccountProvisionerNames(org.apache.airavata.model.security.AuthzToken authzToken) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner> getSSHAccountProvisioners(org.apache.airavata.model.security.AuthzToken authzToken) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
- send_getSSHAccountProvisionerNames(authzToken);
- return recv_getSSHAccountProvisionerNames();
+ send_getSSHAccountProvisioners(authzToken);
+ return recv_getSSHAccountProvisioners();
}
- public void send_getSSHAccountProvisionerNames(org.apache.airavata.model.security.AuthzToken authzToken) throws org.apache.thrift.TException
+ public void send_getSSHAccountProvisioners(org.apache.airavata.model.security.AuthzToken authzToken) throws org.apache.thrift.TException
{
- getSSHAccountProvisionerNames_args args = new getSSHAccountProvisionerNames_args();
+ getSSHAccountProvisioners_args args = new getSSHAccountProvisioners_args();
args.setAuthzToken(authzToken);
- sendBase("getSSHAccountProvisionerNames", args);
+ sendBase("getSSHAccountProvisioners", args);
}
- public List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner> recv_getSSHAccountProvisionerNames() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner> recv_getSSHAccountProvisioners() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
- getSSHAccountProvisionerNames_result result = new getSSHAccountProvisionerNames_result();
- receiveBase(result, "getSSHAccountProvisionerNames");
+ getSSHAccountProvisioners_result result = new getSSHAccountProvisioners_result();
+ receiveBase(result, "getSSHAccountProvisioners");
if (result.isSetSuccess()) {
return result.success;
}
@@ -8342,57 +8338,21 @@ public class Airavata {
if (result.ae != null) {
throw result.ae;
}
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getSSHAccountProvisionerNames failed: unknown result");
- }
-
- public List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam> getSSHAccountProvisionerConfigParams(org.apache.airavata.model.security.AuthzToken authzToken, String provisionerName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
- {
- send_getSSHAccountProvisionerConfigParams(authzToken, provisionerName);
- return recv_getSSHAccountProvisionerConfigParams();
- }
-
- public void send_getSSHAccountProvisionerConfigParams(org.apache.airavata.model.security.AuthzToken authzToken, String provisionerName) throws org.apache.thrift.TException
- {
- getSSHAccountProvisionerConfigParams_args args = new getSSHAccountProvisionerConfigParams_args();
- args.setAuthzToken(authzToken);
- args.setProvisionerName(provisionerName);
- sendBase("getSSHAccountProvisionerConfigParams", args);
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getSSHAccountProvisioners failed: unknown result");
}
- public List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam> recv_getSSHAccountProvisionerConfigParams() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public boolean doesUserHaveSSHAccount(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String userId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
- getSSHAccountProvisionerConfigParams_result result = new getSSHAccountProvisionerConfigParams_result();
- receiveBase(result, "getSSHAccountProvisionerConfigParams");
- if (result.isSetSuccess()) {
- return result.success;
- }
- if (result.ire != null) {
- throw result.ire;
- }
- if (result.ace != null) {
- throw result.ace;
- }
- if (result.ase != null) {
- throw result.ase;
- }
- if (result.ae != null) {
- throw result.ae;
- }
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getSSHAccountProvisionerConfigParams failed: unknown result");
- }
-
- public boolean doesUserHaveSSHAccount(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String username) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
- {
- send_doesUserHaveSSHAccount(authzToken, computeResourceId, username);
+ send_doesUserHaveSSHAccount(authzToken, computeResourceId, userId);
return recv_doesUserHaveSSHAccount();
}
- public void send_doesUserHaveSSHAccount(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String username) throws org.apache.thrift.TException
+ public void send_doesUserHaveSSHAccount(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String userId) throws org.apache.thrift.TException
{
doesUserHaveSSHAccount_args args = new doesUserHaveSSHAccount_args();
args.setAuthzToken(authzToken);
args.setComputeResourceId(computeResourceId);
- args.setUsername(username);
+ args.setUserId(userId);
sendBase("doesUserHaveSSHAccount", args);
}
@@ -8418,18 +8378,18 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "doesUserHaveSSHAccount failed: unknown result");
}
- public org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference setupUserComputeResourcePreferencesForSSH(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String username, String airavataCredStoreToken) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference setupUserComputeResourcePreferencesForSSH(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String userId, String airavataCredStoreToken) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
- send_setupUserComputeResourcePreferencesForSSH(authzToken, computeResourceId, username, airavataCredStoreToken);
+ send_setupUserComputeResourcePreferencesForSSH(authzToken, computeResourceId, userId, airavataCredStoreToken);
return recv_setupUserComputeResourcePreferencesForSSH();
}
- public void send_setupUserComputeResourcePreferencesForSSH(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String username, String airavataCredStoreToken) throws org.apache.thrift.TException
+ public void send_setupUserComputeResourcePreferencesForSSH(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String userId, String airavataCredStoreToken) throws org.apache.thrift.TException
{
setupUserComputeResourcePreferencesForSSH_args args = new setupUserComputeResourcePreferencesForSSH_args();
args.setAuthzToken(authzToken);
args.setComputeResourceId(computeResourceId);
- args.setUsername(username);
+ args.setUserId(userId);
args.setAiravataCredStoreToken(airavataCredStoreToken);
sendBase("setupUserComputeResourcePreferencesForSSH", args);
}
@@ -14767,23 +14727,23 @@ public class Airavata {
}
}
- public void getSSHAccountProvisionerNames(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void getSSHAccountProvisioners(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- getSSHAccountProvisionerNames_call method_call = new getSSHAccountProvisionerNames_call(authzToken, resultHandler, this, ___protocolFactory, ___transport);
+ getSSHAccountProvisioners_call method_call = new getSSHAccountProvisioners_call(authzToken, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
- public static class getSSHAccountProvisionerNames_call extends org.apache.thrift.async.TAsyncMethodCall {
+ public static class getSSHAccountProvisioners_call extends org.apache.thrift.async.TAsyncMethodCall {
private org.apache.airavata.model.security.AuthzToken authzToken;
- public getSSHAccountProvisionerNames_call(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public getSSHAccountProvisioners_call(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.authzToken = authzToken;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
- prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getSSHAccountProvisionerNames", org.apache.thrift.protocol.TMessageType.CALL, 0));
- getSSHAccountProvisionerNames_args args = new getSSHAccountProvisionerNames_args();
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getSSHAccountProvisioners", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ getSSHAccountProvisioners_args args = new getSSHAccountProvisioners_args();
args.setAuthzToken(authzToken);
args.write(prot);
prot.writeMessageEnd();
@@ -14795,48 +14755,13 @@ public class Airavata {
}
org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
- return (new Client(prot)).recv_getSSHAccountProvisionerNames();
+ return (new Client(prot)).recv_getSSHAccountProvisioners();
}
}
- public void getSSHAccountProvisionerConfigParams(org.apache.airavata.model.security.AuthzToken authzToken, String provisionerName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void doesUserHaveSSHAccount(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String userId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- getSSHAccountProvisionerConfigParams_call method_call = new getSSHAccountProvisionerConfigParams_call(authzToken, provisionerName, resultHandler, this, ___protocolFactory, ___transport);
- this.___currentMethod = method_call;
- ___manager.call(method_call);
- }
-
- public static class getSSHAccountProvisionerConfigParams_call extends org.apache.thrift.async.TAsyncMethodCall {
- private org.apache.airavata.model.security.AuthzToken authzToken;
- private String provisionerName;
- public getSSHAccountProvisionerConfigParams_call(org.apache.airavata.model.security.AuthzToken authzToken, String provisionerName, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
- super(client, protocolFactory, transport, resultHandler, false);
- this.authzToken = authzToken;
- this.provisionerName = provisionerName;
- }
-
- public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
- prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getSSHAccountProvisionerConfigParams", org.apache.thrift.protocol.TMessageType.CALL, 0));
- getSSHAccountProvisionerConfigParams_args args = new getSSHAccountProvisionerConfigParams_args();
- args.setAuthzToken(authzToken);
- args.setProvisionerName(provisionerName);
- args.write(prot);
- prot.writeMessageEnd();
- }
-
- public List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam> getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException {
- if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
- throw new IllegalStateException("Method call not finished!");
- }
- org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
- org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
- return (new Client(prot)).recv_getSSHAccountProvisionerConfigParams();
- }
- }
-
- public void doesUserHaveSSHAccount(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String username, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
- checkReady();
- doesUserHaveSSHAccount_call method_call = new doesUserHaveSSHAccount_call(authzToken, computeResourceId, username, resultHandler, this, ___protocolFactory, ___transport);
+ doesUserHaveSSHAccount_call method_call = new doesUserHaveSSHAccount_call(authzToken, computeResourceId, userId, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
@@ -14844,12 +14769,12 @@ public class Airavata {
public static class doesUserHaveSSHAccount_call extends org.apache.thrift.async.TAsyncMethodCall {
private org.apache.airavata.model.security.AuthzToken authzToken;
private String computeResourceId;
- private String username;
- public doesUserHaveSSHAccount_call(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String username, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ private String userId;
+ public doesUserHaveSSHAccount_call(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String userId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.authzToken = authzToken;
this.computeResourceId = computeResourceId;
- this.username = username;
+ this.userId = userId;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
@@ -14857,7 +14782,7 @@ public class Airavata {
doesUserHaveSSHAccount_args args = new doesUserHaveSSHAccount_args();
args.setAuthzToken(authzToken);
args.setComputeResourceId(computeResourceId);
- args.setUsername(username);
+ args.setUserId(userId);
args.write(prot);
prot.writeMessageEnd();
}
@@ -14872,9 +14797,9 @@ public class Airavata {
}
}
- public void setupUserComputeResourcePreferencesForSSH(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String username, String airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void setupUserComputeResourcePreferencesForSSH(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String userId, String airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- setupUserComputeResourcePreferencesForSSH_call method_call = new setupUserComputeResourcePreferencesForSSH_call(authzToken, computeResourceId, username, airavataCredStoreToken, resultHandler, this, ___protocolFactory, ___transport);
+ setupUserComputeResourcePreferencesForSSH_call method_call = new setupUserComputeResourcePreferencesForSSH_call(authzToken, computeResourceId, userId, airavataCredStoreToken, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
@@ -14882,13 +14807,13 @@ public class Airavata {
public static class setupUserComputeResourcePreferencesForSSH_call extends org.apache.thrift.async.TAsyncMethodCall {
private org.apache.airavata.model.security.AuthzToken authzToken;
private String computeResourceId;
- private String username;
+ private String userId;
private String airavataCredStoreToken;
- public setupUserComputeResourcePreferencesForSSH_call(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String username, String airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public setupUserComputeResourcePreferencesForSSH_call(org.apache.airavata.model.security.AuthzToken authzToken, String computeResourceId, String userId, String airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.authzToken = authzToken;
this.computeResourceId = computeResourceId;
- this.username = username;
+ this.userId = userId;
this.airavataCredStoreToken = airavataCredStoreToken;
}
@@ -14897,7 +14822,7 @@ public class Airavata {
setupUserComputeResourcePreferencesForSSH_args args = new setupUserComputeResourcePreferencesForSSH_args();
args.setAuthzToken(authzToken);
args.setComputeResourceId(computeResourceId);
- args.setUsername(username);
+ args.setUserId(userId);
args.setAiravataCredStoreToken(airavataCredStoreToken);
args.write(prot);
prot.writeMessageEnd();
@@ -16418,8 +16343,7 @@ public class Airavata {
processMap.put("updateGatewayStoragePreference", new updateGatewayStoragePreference());
processMap.put("deleteGatewayComputeResourcePreference", new deleteGatewayComputeResourcePreference());
processMap.put("deleteGatewayStoragePreference", new deleteGatewayStoragePreference());
- processMap.put("getSSHAccountProvisionerNames", new getSSHAccountProvisionerNames());
- processMap.put("getSSHAccountProvisionerConfigParams", new getSSHAccountProvisionerConfigParams());
+ processMap.put("getSSHAccountProvisioners", new getSSHAccountProvisioners());
processMap.put("doesUserHaveSSHAccount", new doesUserHaveSSHAccount());
processMap.put("setupUserComputeResourcePreferencesForSSH", new setupUserComputeResourcePreferencesForSSH());
processMap.put("registerUserResourceProfile", new registerUserResourceProfile());
@@ -20507,53 +20431,23 @@ public class Airavata {
}
}
- public static class getSSHAccountProvisionerNames<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getSSHAccountProvisionerNames_args> {
- public getSSHAccountProvisionerNames() {
- super("getSSHAccountProvisionerNames");
- }
-
- public getSSHAccountProvisionerNames_args getEmptyArgsInstance() {
- return new getSSHAccountProvisionerNames_args();
- }
-
- protected boolean isOneway() {
- return false;
- }
-
- public getSSHAccountProvisionerNames_result getResult(I iface, getSSHAccountProvisionerNames_args args) throws org.apache.thrift.TException {
- getSSHAccountProvisionerNames_result result = new getSSHAccountProvisionerNames_result();
- try {
- result.success = iface.getSSHAccountProvisionerNames(args.authzToken);
- } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
- result.ire = ire;
- } catch (org.apache.airavata.model.error.AiravataClientException ace) {
- result.ace = ace;
- } catch (org.apache.airavata.model.error.AiravataSystemException ase) {
- result.ase = ase;
- } catch (org.apache.airavata.model.error.AuthorizationException ae) {
- result.ae = ae;
- }
- return result;
- }
- }
-
- public static class getSSHAccountProvisionerConfigParams<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getSSHAccountProvisionerConfigParams_args> {
- public getSSHAccountProvisionerConfigParams() {
- super("getSSHAccountProvisionerConfigParams");
+ public static class getSSHAccountProvisioners<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getSSHAccountProvisioners_args> {
+ public getSSHAccountProvisioners() {
+ super("getSSHAccountProvisioners");
}
- public getSSHAccountProvisionerConfigParams_args getEmptyArgsInstance() {
- return new getSSHAccountProvisionerConfigParams_args();
+ public getSSHAccountProvisioners_args getEmptyArgsInstance() {
+ return new getSSHAccountProvisioners_args();
}
protected boolean isOneway() {
return false;
}
- public getSSHAccountProvisionerConfigParams_result getResult(I iface, getSSHAccountProvisionerConfigParams_args args) throws org.apache.thrift.TException {
- getSSHAccountProvisionerConfigParams_result result = new getSSHAccountProvisionerConfigParams_result();
+ public getSSHAccountProvisioners_result getResult(I iface, getSSHAccountProvisioners_args args) throws org.apache.thrift.TException {
+ getSSHAccountProvisioners_result result = new getSSHAccountProvisioners_result();
try {
- result.success = iface.getSSHAccountProvisionerConfigParams(args.authzToken, args.provisionerName);
+ result.success = iface.getSSHAccountProvisioners(args.authzToken);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
} catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -20583,7 +20477,7 @@ public class Airavata {
public doesUserHaveSSHAccount_result getResult(I iface, doesUserHaveSSHAccount_args args) throws org.apache.thrift.TException {
doesUserHaveSSHAccount_result result = new doesUserHaveSSHAccount_result();
try {
- result.success = iface.doesUserHaveSSHAccount(args.authzToken, args.computeResourceId, args.username);
+ result.success = iface.doesUserHaveSSHAccount(args.authzToken, args.computeResourceId, args.userId);
result.setSuccessIsSet(true);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
@@ -20614,7 +20508,7 @@ public class Airavata {
public setupUserComputeResourcePreferencesForSSH_result getResult(I iface, setupUserComputeResourcePreferencesForSSH_args args) throws org.apache.thrift.TException {
setupUserComputeResourcePreferencesForSSH_result result = new setupUserComputeResourcePreferencesForSSH_result();
try {
- result.success = iface.setupUserComputeResourcePreferencesForSSH(args.authzToken, args.computeResourceId, args.username, args.airavataCredStoreToken);
+ result.success = iface.setupUserComputeResourcePreferencesForSSH(args.authzToken, args.computeResourceId, args.userId, args.airavataCredStoreToken);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
} catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -21867,8 +21761,7 @@ public class Airavata {
processMap.put("updateGatewayStoragePreference", new updateGatewayStoragePreference());
processMap.put("deleteGatewayComputeResourcePreference", new deleteGatewayComputeResourcePreference());
processMap.put("deleteGatewayStoragePreference", new deleteGatewayStoragePreference());
- processMap.put("getSSHAccountProvisionerNames", new getSSHAccountProvisionerNames());
- processMap.put("getSSHAccountProvisionerConfigParams", new getSSHAccountProvisionerConfigParams());
+ processMap.put("getSSHAccountProvisioners", new getSSHAccountProvisioners());
processMap.put("doesUserHaveSSHAccount", new doesUserHaveSSHAccount());
processMap.put("setupUserComputeResourcePreferencesForSSH", new setupUserComputeResourcePreferencesForSSH());
processMap.put("registerUserResourceProfile", new registerUserResourceProfile());
@@ -31551,20 +31444,20 @@ public class Airavata {
}
}
- public static class getSSHAccountProvisionerNames<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getSSHAccountProvisionerNames_args, List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner>> {
- public getSSHAccountProvisionerNames() {
- super("getSSHAccountProvisionerNames");
+ public static class getSSHAccountProvisioners<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getSSHAccountProvisioners_args, List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner>> {
+ public getSSHAccountProvisioners() {
+ super("getSSHAccountProvisioners");
}
- public getSSHAccountProvisionerNames_args getEmptyArgsInstance() {
- return new getSSHAccountProvisionerNames_args();
+ public getSSHAccountProvisioners_args getEmptyArgsInstance() {
+ return new getSSHAccountProvisioners_args();
}
public AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
return new AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner>>() {
public void onComplete(List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner> o) {
- getSSHAccountProvisionerNames_result result = new getSSHAccountProvisionerNames_result();
+ getSSHAccountProvisioners_result result = new getSSHAccountProvisioners_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -31577,7 +31470,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getSSHAccountProvisionerNames_result result = new getSSHAccountProvisionerNames_result();
+ getSSHAccountProvisioners_result result = new getSSHAccountProvisioners_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -31618,26 +31511,27 @@ public class Airavata {
return false;
}
- public void start(I iface, getSSHAccountProvisionerNames_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner>> resultHandler) throws TException {
- iface.getSSHAccountProvisionerNames(args.authzToken,resultHandler);
+ public void start(I iface, getSSHAccountProvisioners_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner>> resultHandler) throws TException {
+ iface.getSSHAccountProvisioners(args.authzToken,resultHandler);
}
}
- public static class getSSHAccountProvisionerConfigParams<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getSSHAccountProvisionerConfigParams_args, List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam>> {
- public getSSHAccountProvisionerConfigParams() {
- super("getSSHAccountProvisionerConfigParams");
+ public static class doesUserHaveSSHAccount<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, doesUserHaveSSHAccount_args, Boolean> {
+ public doesUserHaveSSHAccount() {
+ super("doesUserHaveSSHAccount");
}
- public getSSHAccountProvisionerConfigParams_args getEmptyArgsInstance() {
- return new getSSHAccountProvisionerConfigParams_args();
+ public doesUserHaveSSHAccount_args getEmptyArgsInstance() {
+ return new doesUserHaveSSHAccount_args();
}
- public AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam>>() {
- public void onComplete(List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam> o) {
- getSSHAccountProvisionerConfigParams_result result = new getSSHAccountProvisionerConfigParams_result();
+ return new AsyncMethodCallback<Boolean>() {
+ public void onComplete(Boolean o) {
+ doesUserHaveSSHAccount_result result = new doesUserHaveSSHAccount_result();
result.success = o;
+ result.setSuccessIsSet(true);
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -31649,7 +31543,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getSSHAccountProvisionerConfigParams_result result = new getSSHAccountProvisionerConfigParams_result();
+ doesUserHaveSSHAccount_result result = new doesUserHaveSSHAccount_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -31690,25 +31584,241 @@ public class Airavata {
return false;
}
- public void start(I iface, getSSHAccountProvisionerConfigParams_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam>> resultHandler) throws TException {
- iface.getSSHAccountProvisionerConfigParams(args.authzToken, args.provisionerName,resultHandler);
+ public void start(I iface, doesUserHaveSSHAccount_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ iface.doesUserHaveSSHAccount(args.authzToken, args.computeResourceId, args.userId,resultHandler);
}
}
- public static class doesUserHaveSSHAccount<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, doesUserHaveSSHAccount_args, Boolean> {
- public doesUserHaveSSHAccount() {
- super("doesUserHaveSSHAccount");
+ public static class setupUserComputeResourcePreferencesForSSH<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, setupUserComputeResourcePreferencesForSSH_args, org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference> {
+ public setupUserComputeResourcePreferencesForSSH() {
+ super("setupUserComputeResourcePreferencesForSSH");
}
- public doesUserHaveSSHAccount_args getEmptyArgsInstance() {
- return new doesUserHaveSSHAccount_args();
+ public setupUserComputeResourcePreferencesForSSH_args getEmptyArgsInstance() {
+ return new setupUserComputeResourcePreferencesForSSH_args();
+ }
+
+ public AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>() {
+ public void onComplete(org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference o) {
+ setupUserComputeResourcePreferencesForSSH_result result = new setupUserComputeResourcePreferencesForSSH_result();
+ result.success = o;
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ setupUserComputeResourcePreferencesForSSH_result result = new setupUserComputeResourcePreferencesForSSH_result();
+ if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
+ result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
+ result.setIreIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataClientException) {
+ result.ace = (org.apache.airavata.model.error.AiravataClientException) e;
+ result.setAceIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataSystemException) {
+ result.ase = (org.apache.airavata.model.error.AiravataSystemException) e;
+ result.setAseIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AuthorizationException) {
+ result.ae = (org.apache.airavata.model.error.AuthorizationException) e;
+ result.setAeIsSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, setupUserComputeResourcePreferencesForSSH_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference> resultHandler) throws TException {
+ iface.setupUserComputeResourcePreferencesForSSH(args.authzToken, args.computeResourceId, args.userId, args.airavataCredStoreToken,resultHandler);
+ }
+ }
+
+ public static class registerUserResourceProfile<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerUserResourceProfile_args, String> {
+ public registerUserResourceProfile() {
+ super("registerUserResourceProfile");
+ }
+
+ public registerUserResourceProfile_args getEmptyArgsInstance() {
+ return new registerUserResourceProfile_args();
+ }
+
+ public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<String>() {
+ public void onComplete(String o) {
+ registerUserResourceProfile_result result = new registerUserResourceProfile_result();
+ result.success = o;
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ registerUserResourceProfile_result result = new registerUserResourceProfile_result();
+ if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
+ result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
+ result.setIreIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataClientException) {
+ result.ace = (org.apache.airavata.model.error.AiravataClientException) e;
+ result.setAceIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataSystemException) {
+ result.ase = (org.apache.airavata.model.error.AiravataSystemException) e;
+ result.setAseIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AuthorizationException) {
+ result.ae = (org.apache.airavata.model.error.AuthorizationException) e;
+ result.setAeIsSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, registerUserResourceProfile_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
+ iface.registerUserResourceProfile(args.authzToken, args.userResourceProfile,resultHandler);
+ }
+ }
+
+ public static class getUserResourceProfile<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUserResourceProfile_args, org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile> {
+ public getUserResourceProfile() {
+ super("getUserResourceProfile");
+ }
+
+ public getUserResourceProfile_args getEmptyArgsInstance() {
+ return new getUserResourceProfile_args();
+ }
+
+ public AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile>() {
+ public void onComplete(org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile o) {
+ getUserResourceProfile_result result = new getUserResourceProfile_result();
+ result.success = o;
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ getUserResourceProfile_result result = new getUserResourceProfile_result();
+ if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
+ result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
+ result.setIreIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataClientException) {
+ result.ace = (org.apache.airavata.model.error.AiravataClientException) e;
+ result.setAceIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataSystemException) {
+ result.ase = (org.apache.airavata.model.error.AiravataSystemException) e;
+ result.setAseIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AuthorizationException) {
+ result.ae = (org.apache.airavata.model.error.AuthorizationException) e;
+ result.setAeIsSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, getUserResourceProfile_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile> resultHandler) throws TException {
+ iface.getUserResourceProfile(args.authzToken, args.userId, args.gatewayID,resultHandler);
+ }
+ }
+
+ public static class updateUserResourceProfile<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateUserResourceProfile_args, Boolean> {
+ public updateUserResourceProfile() {
+ super("updateUserResourceProfile");
+ }
+
+ public updateUserResourceProfile_args getEmptyArgsInstance() {
+ return new updateUserResourceProfile_args();
}
public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
return new AsyncMethodCallback<Boolean>() {
public void onComplete(Boolean o) {
- doesUserHaveSSHAccount_result result = new doesUserHaveSSHAccount_result();
+ updateUserResourceProfile_result result = new updateUserResourceProfile_result();
result.success = o;
result.setSuccessIsSet(true);
try {
@@ -31722,7 +31832,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- doesUserHaveSSHAccount_result result = new doesUserHaveSSHAccount_result();
+ updateUserResourceProfile_result result = new updateUserResourceProfile_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -31763,98 +31873,27 @@ public class Airavata {
return false;
}
- public void start(I iface, doesUserHaveSSHAccount_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
- iface.doesUserHaveSSHAccount(args.authzToken, args.computeResourceId, args.username,resultHandler);
- }
- }
-
- public static class setupUserComputeResourcePreferencesForSSH<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, setupUserComputeResourcePreferencesForSSH_args, org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference> {
- public setupUserComputeResourcePreferencesForSSH() {
- super("setupUserComputeResourcePreferencesForSSH");
- }
-
- public setupUserComputeResourcePreferencesForSSH_args getEmptyArgsInstance() {
- return new setupUserComputeResourcePreferencesForSSH_args();
- }
-
- public AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
- final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>() {
- public void onComplete(org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference o) {
- setupUserComputeResourcePreferencesForSSH_result result = new setupUserComputeResourcePreferencesForSSH_result();
- result.success = o;
- try {
- fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
- return;
- } catch (Exception e) {
- LOGGER.error("Exception writing to internal frame buffer", e);
- }
- fb.close();
- }
- public void onError(Exception e) {
- byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
- org.apache.thrift.TBase msg;
- setupUserComputeResourcePreferencesForSSH_result result = new setupUserComputeResourcePreferencesForSSH_result();
- if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
- result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
- result.setIreIsSet(true);
- msg = result;
- }
- else if (e instanceof org.apache.airavata.model.error.AiravataClientException) {
- result.ace = (org.apache.airavata.model.error.AiravataClientException) e;
- result.setAceIsSet(true);
- msg = result;
- }
- else if (e instanceof org.apache.airavata.model.error.AiravataSystemException) {
- result.ase = (org.apache.airavata.model.error.AiravataSystemException) e;
- result.setAseIsSet(true);
- msg = result;
- }
- else if (e instanceof org.apache.airavata.model.error.AuthorizationException) {
- result.ae = (org.apache.airavata.model.error.AuthorizationException) e;
- result.setAeIsSet(true);
- msg = result;
- }
- else
- {
- msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
- msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
- }
- try {
- fcall.sendResponse(fb,msg,msgType,seqid);
- return;
- } catch (Exception ex) {
- LOGGER.error("Exception writing to internal frame buffer", ex);
- }
- fb.close();
- }
- };
- }
-
- protected boolean isOneway() {
- return false;
- }
-
- public void start(I iface, setupUserComputeResourcePreferencesForSSH_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference> resultHandler) throws TException {
- iface.setupUserComputeResourcePreferencesForSSH(args.authzToken, args.computeResourceId, args.username, args.airavataCredStoreToken,resultHandler);
+ public void start(I iface, updateUserResourceProfile_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ iface.updateUserResourceProfile(args.authzToken, args.userId, args.gatewayID, args.userResourceProfile,resultHandler);
}
}
- public static class registerUserResourceProfile<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerUserResourceProfile_args, String> {
- public registerUserResourceProfile() {
- super("registerUserResourceProfile");
+ public static class deleteUserResourceProfile<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteUserResourceProfile_args, Boolean> {
+ public deleteUserResourceProfile() {
+ super("deleteUserResourceProfile");
}
- public registerUserResourceProfile_args getEmptyArgsInstance() {
- return new registerUserResourceProfile_args();
+ public deleteUserResourceProfile_args getEmptyArgsInstance() {
+ return new deleteUserResourceProfile_args();
}
- public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<String>() {
- public void onComplete(String o) {
- registerUserResourceProfile_result result = new registerUserResourceProfile_result();
+ return new AsyncMethodCallback<Boolean>() {
+ public void onComplete(Boolean o) {
+ deleteUserResourceProfile_result result = new deleteUserResourceProfile_result();
result.success = o;
+ result.setSuccessIsSet(true);
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -31866,7 +31905,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- registerUserResourceProfile_result result = new registerUserResourceProfile_result();
+ deleteUserResourceProfile_result result = new deleteUserResourceProfile_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -31907,26 +31946,27 @@ public class Airavata {
return false;
}
- public void start(I iface, registerUserResourceProfile_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
- iface.registerUserResourceProfile(args.authzToken, args.userResourceProfile,resultHandler);
+ public void start(I iface, deleteUserResourceProfile_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ iface.deleteUserResourceProfile(args.authzToken, args.userId, args.gatewayID,resultHandler);
}
}
- public static class getUserResourceProfile<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUserResourceProfile_args, org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile> {
- public getUserResourceProfile() {
- super("getUserResourceProfile");
+ public static class addUserComputeResourcePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addUserComputeResourcePreference_args, Boolean> {
+ public addUserComputeResourcePreference() {
+ super("addUserComputeResourcePreference");
}
- public getUserResourceProfile_args getEmptyArgsInstance() {
- return new getUserResourceProfile_args();
+ public addUserComputeResourcePreference_args getEmptyArgsInstance() {
+ return new addUserComputeResourcePreference_args();
}
- public AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile>() {
- public void onComplete(org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile o) {
- getUserResourceProfile_result result = new getUserResourceProfile_result();
+ return new AsyncMethodCallback<Boolean>() {
+ public void onComplete(Boolean o) {
+ addUserComputeResourcePreference_result result = new addUserComputeResourcePreference_result();
result.success = o;
+ result.setSuccessIsSet(true);
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -31938,7 +31978,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getUserResourceProfile_result result = new getUserResourceProfile_result();
+ addUserComputeResourcePreference_result result = new addUserComputeResourcePreference_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -31979,25 +32019,25 @@ public class Airavata {
return false;
}
- public void start(I iface, getUserResourceProfile_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile> resultHandler) throws TException {
- iface.getUserResourceProfile(args.authzToken, args.userId, args.gatewayID,resultHandler);
+ public void start(I iface, addUserComputeResourcePreference_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ iface.addUserComputeResourcePreference(args.authzToken, args.userId, args.gatewayID, args.userComputeResourceId, args.userComputeResourcePreference,resultHandler);
}
}
- public static class updateUserResourceProfile<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateUserResourceProfile_args, Boolean> {
- public updateUserResourceProfile() {
- super("updateUserResourceProfile");
+ public static class addUserStoragePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addUserStoragePreference_args, Boolean> {
+ public addUserStoragePreference() {
+ super("addUserStoragePreference");
}
- public updateUserResourceProfile_args getEmptyArgsInstance() {
- return new updateUserResourceProfile_args();
+ public addUserStoragePreference_args getEmptyArgsInstance() {
+ return new addUserStoragePreference_args();
}
public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
return new AsyncMethodCallback<Boolean>() {
public void onComplete(Boolean o) {
- updateUserResourceProfile_result result = new updateUserResourceProfile_result();
+ addUserStoragePreference_result result = new addUserStoragePreference_result();
result.success = o;
result.setSuccessIsSet(true);
try {
@@ -32011,7 +32051,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- updateUserResourceProfile_result result = new updateUserResourceProfile_result();
+ addUserStoragePreference_result result = new addUserStoragePreference_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -32052,27 +32092,26 @@ public class Airavata {
return false;
}
- public void start(I iface, updateUserResourceProfile_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
- iface.updateUserResourceProfile(args.authzToken, args.userId, args.gatewayID, args.userResourceProfile,resultHandler);
+ public void start(I iface, addUserStoragePreference_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ iface.addUserStoragePreference(args.authzToken, args.userId, args.gatewayID, args.userStorageResourceId, args.userStoragePreference,resultHandler);
}
}
- public static class deleteUserResourceProfile<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteUserResourceProfile_args, Boolean> {
- public deleteUserResourceProfile() {
- super("deleteUserResourceProfile");
+ public static class getUserComputeResourcePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUserComputeResourcePreference_args, org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference> {
+ public getUserComputeResourcePreference() {
+ super("getUserComputeResourcePreference");
}
- public deleteUserResourceProfile_args getEmptyArgsInstance() {
- return new deleteUserResourceProfile_args();
+ public getUserComputeResourcePreference_args getEmptyArgsInstance() {
+ return new getUserComputeResourcePreference_args();
}
- public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<Boolean>() {
- public void onComplete(Boolean o) {
- deleteUserResourceProfile_result result = new deleteUserResourceProfile_result();
+ return new AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>() {
+ public void onComplete(org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference o) {
+ getUserComputeResourcePreference_result result = new getUserComputeResourcePreference_result();
result.success = o;
- result.setSuccessIsSet(true);
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -32084,7 +32123,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- deleteUserResourceProfile_result result = new deleteUserResourceProfile_result();
+ getUserComputeResourcePreference_result result = new getUserComputeResourcePreference_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -32125,27 +32164,26 @@ public class Airavata {
return false;
}
- public void start(I iface, deleteUserResourceProfile_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
- iface.deleteUserResourceProfile(args.authzToken, args.userId, args.gatewayID,resultHandler);
+ public void start(I iface, getUserComputeResourcePreference_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference> resultHandler) throws TException {
+ iface.getUserComputeResourcePreference(args.authzToken, args.userId, args.gatewayID, args.userComputeResourceId,resultHandler);
}
}
- public static class addUserComputeResourcePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addUserComputeResourcePreference_args, Boolean> {
- public addUserComputeResourcePreference() {
- super("addUserComputeResourcePreference");
+ public static class getUserStoragePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUserStoragePreference_args, org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference> {
+ public getUserStoragePreference() {
+ super("getUserStoragePreference");
}
- public addUserComputeResourcePreference_args getEmptyArgsInstance() {
- return new addUserComputeResourcePreference_args();
+ public getUserStoragePreference_args getEmptyArgsInstance() {
+ return new getUserStoragePreference_args();
}
- public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<Boolean>() {
- public void onComplete(Boolean o) {
- addUserComputeResourcePreference_result result = new addUserComputeResourcePreference_result();
+ return new AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference>() {
+ public void onComplete(org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference o) {
+ getUserStoragePreference_result result = new getUserStoragePreference_result();
result.success = o;
- result.setSuccessIsSet(true);
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -32157,7 +32195,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- addUserComputeResourcePreference_result result = new addUserComputeResourcePreference_result();
+ getUserStoragePreference_result result = new getUserStoragePreference_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -32198,27 +32236,26 @@ public class Airavata {
return false;
}
- public void start(I iface, addUserComputeResourcePreference_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
- iface.addUserComputeResourcePreference(args.authzToken, args.userId, args.gatewayID, args.userComputeResourceId, args.userComputeResourcePreference,resultHandler);
+ public void start(I iface, getUserStoragePreference_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference> resultHandler) throws TException {
+ iface.getUserStoragePreference(args.authzToken, args.userId, args.gatewayID, args.userStorageResourceId,resultHandler);
}
}
- public static class addUserStoragePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addUserStoragePreference_args, Boolean> {
- public addUserStoragePreference() {
- super("addUserStoragePreference");
+ public static class getAllUserComputeResourcePreferences<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllUserComputeResourcePreferences_args, List<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>> {
+ public getAllUserComputeResourcePreferences() {
+ super("getAllUserComputeResourcePreferences");
}
- public addUserStoragePreference_args getEmptyArgsInstance() {
- return new addUserStoragePreference_args();
+ public getAllUserComputeResourcePreferences_args getEmptyArgsInstance() {
+ return new getAllUserComputeResourcePreferences_args();
}
- public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<Boolean>() {
- public void onComplete(Boolean o) {
- addUserStoragePreference_result result = new addUserStoragePreference_result();
+ return new AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>>() {
+ public void onComplete(List<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference> o) {
+ getAllUserComputeResourcePreferences_result result = new getAllUserComputeResourcePreferences_result();
result.success = o;
- result.setSuccessIsSet(true);
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -32230,7 +32267,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- addUserStoragePreference_result result = new addUserStoragePreference_result();
+ getAllUserComputeResourcePreferences_result result = new getAllUserComputeResourcePreferences_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -32271,25 +32308,25 @@ public class Airavata {
return false;
}
- public void start(I iface, addUserStoragePreference_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
- iface.addUserStoragePreference(args.authzToken, args.userId, args.gatewayID, args.userStorageResourceId, args.userStoragePreference,resultHandler);
+ public void start(I iface, getAllUserComputeResourcePreferences_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>> resultHandler) throws TException {
+ iface.getAllUserComputeResourcePreferences(args.authzToken, args.userId, args.gatewayID,resultHandler);
}
}
- public static class getUserComputeResourcePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUserComputeResourcePreference_args, org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference> {
- public getUserComputeResourcePreference() {
- super("getUserComputeResourcePreference");
+ public static class getAllUserStoragePreferences<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllUserStoragePreferences_args, List<org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference>> {
+ public getAllUserStoragePreferences() {
+ super("getAllUserStoragePreferences");
}
- public getUserComputeResourcePreference_args getEmptyArgsInstance() {
- return new getUserComputeResourcePreference_args();
+ public getAllUserStoragePreferences_args getEmptyArgsInstance() {
+ return new getAllUserStoragePreferences_args();
}
- public AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>() {
- public void onComplete(org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference o) {
- getUserComputeResourcePreference_result result = new getUserComputeResourcePreference_result();
+ return new AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference>>() {
+ public void onComplete(List<org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference> o) {
+ getAllUserStoragePreferences_result result = new getAllUserStoragePreferences_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -32302,7 +32339,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getUserComputeResourcePreference_result result = new getUserComputeResourcePreference_result();
+ getAllUserStoragePreferences_result result = new getAllUserStoragePreferences_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -32343,25 +32380,25 @@ public class Airavata {
return false;
}
- public void start(I iface, getUserComputeResourcePreference_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference> resultHandler) throws TException {
- iface.getUserComputeResourcePreference(args.authzToken, args.userId, args.gatewayID, args.userComputeResourceId,resultHandler);
+ public void start(I iface, getAllUserStoragePreferences_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference>> resultHandler) throws TException {
+ iface.getAllUserStoragePreferences(args.authzToken, args.userId, args.gatewayID,resultHandler);
}
}
- public static class getUserStoragePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUserStoragePreference_args, org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference> {
- public getUserStoragePreference() {
- super("getUserStoragePreference");
+ public static class getAllUserResourceProfiles<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllUserResourceProfiles_args, List<org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile>> {
+ public getAllUserResourceProfiles() {
+ super("getAllUserResourceProfiles");
}
- public getUserStoragePreference_args getEmptyArgsInstance() {
- return new getUserStoragePreference_args();
+ public getAllUserResourceProfiles_args getEmptyArgsInstance() {
+ return new getAllUserResourceProfiles_args();
}
- public AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference>() {
- public void onComplete(org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference o) {
- getUserStoragePreference_result result = new getUserStoragePreference_result();
+ return new AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile>>() {
+ public void onComplete(List<org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile> o) {
+ getAllUserResourceProfiles_result result = new getAllUserResourceProfiles_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -32374,7 +32411,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getUserStoragePreference_result result = new getUserStoragePreference_result();
+ getAllUserResourceProfiles_result result = new getAllUserResourceProfiles_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -32415,98 +32452,27 @@ public class Airavata {
return false;
}
- public void start(I iface, getUserStoragePreference_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference> resultHandler) throws TException {
- iface.getUserStoragePreference(args.authzToken, args.userId, args.gatewayID, args.userStorageResourceId,resultHandler);
- }
- }
-
- public static class getAllUserComputeResourcePreferences<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllUserComputeResourcePreferences_args, List<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>> {
- public getAllUserComputeResourcePreferences() {
- super("getAllUserComputeResourcePreferences");
- }
-
- public getAllUserComputeResourcePreferences_args getEmptyArgsInstance() {
- return new getAllUserComputeResourcePreferences_args();
- }
-
- public AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
- final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>>() {
- public void onComplete(List<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference> o) {
- getAllUserComputeResourcePreferences_result result = new getAllUserComputeResourcePreferences_result();
- result.success = o;
- try {
- fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
- return;
- } catch (Exception e) {
- LOGGER.error("Exception writing to internal frame buffer", e);
- }
- fb.close();
- }
- public void onError(Exception e) {
- byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
- org.apache.thrift.TBase msg;
- getAllUserComputeResourcePreferences_result result = new getAllUserComputeResourcePreferences_result();
- if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
- result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
-
<TRUNCATED>
[2/5] airavata git commit: AIRAVATA-2500 Thrift stub code generation
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/b0f6744e/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
index f0b329d..da3071a 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
@@ -110,6 +110,14 @@ class ComputeResourcePreference {
* @var int
*/
public $reservationEndTime = null;
+ /**
+ * @var string
+ */
+ public $sshAccountProvisioner = null;
+ /**
+ * @var array
+ */
+ public $sshAccountProvisionerConfig = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -170,6 +178,22 @@ class ComputeResourcePreference {
'var' => 'reservationEndTime',
'type' => TType::I64,
),
+ 15 => array(
+ 'var' => 'sshAccountProvisioner',
+ 'type' => TType::STRING,
+ ),
+ 16 => array(
+ 'var' => 'sshAccountProvisionerConfig',
+ 'type' => TType::MAP,
+ 'ktype' => TType::STRING,
+ 'vtype' => TType::STRING,
+ 'key' => array(
+ 'type' => TType::STRING,
+ ),
+ 'val' => array(
+ 'type' => TType::STRING,
+ ),
+ ),
);
}
if (is_array($vals)) {
@@ -215,6 +239,12 @@ class ComputeResourcePreference {
if (isset($vals['reservationEndTime'])) {
$this->reservationEndTime = $vals['reservationEndTime'];
}
+ if (isset($vals['sshAccountProvisioner'])) {
+ $this->sshAccountProvisioner = $vals['sshAccountProvisioner'];
+ }
+ if (isset($vals['sshAccountProvisionerConfig'])) {
+ $this->sshAccountProvisionerConfig = $vals['sshAccountProvisionerConfig'];
+ }
}
}
@@ -335,6 +365,33 @@ class ComputeResourcePreference {
$xfer += $input->skip($ftype);
}
break;
+ case 15:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->sshAccountProvisioner);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 16:
+ if ($ftype == TType::MAP) {
+ $this->sshAccountProvisionerConfig = array();
+ $_size0 = 0;
+ $_ktype1 = 0;
+ $_vtype2 = 0;
+ $xfer += $input->readMapBegin($_ktype1, $_vtype2, $_size0);
+ for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
+ {
+ $key5 = '';
+ $val6 = '';
+ $xfer += $input->readString($key5);
+ $xfer += $input->readString($val6);
+ $this->sshAccountProvisionerConfig[$key5] = $val6;
+ }
+ $xfer += $input->readMapEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -418,6 +475,29 @@ class ComputeResourcePreference {
$xfer += $output->writeI64($this->reservationEndTime);
$xfer += $output->writeFieldEnd();
}
+ if ($this->sshAccountProvisioner !== null) {
+ $xfer += $output->writeFieldBegin('sshAccountProvisioner', TType::STRING, 15);
+ $xfer += $output->writeString($this->sshAccountProvisioner);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->sshAccountProvisionerConfig !== null) {
+ if (!is_array($this->sshAccountProvisionerConfig)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('sshAccountProvisionerConfig', TType::MAP, 16);
+ {
+ $output->writeMapBegin(TType::STRING, TType::STRING, count($this->sshAccountProvisionerConfig));
+ {
+ foreach ($this->sshAccountProvisionerConfig as $kiter7 => $viter8)
+ {
+ $xfer += $output->writeString($kiter7);
+ $xfer += $output->writeString($viter8);
+ }
+ }
+ $output->writeMapEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -711,15 +791,15 @@ class GatewayResourceProfile {
case 3:
if ($ftype == TType::LST) {
$this->computeResourcePreferences = array();
- $_size0 = 0;
- $_etype3 = 0;
- $xfer += $input->readListBegin($_etype3, $_size0);
- for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
+ $_size9 = 0;
+ $_etype12 = 0;
+ $xfer += $input->readListBegin($_etype12, $_size9);
+ for ($_i13 = 0; $_i13 < $_size9; ++$_i13)
{
- $elem5 = null;
- $elem5 = new \Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference();
- $xfer += $elem5->read($input);
- $this->computeResourcePreferences []= $elem5;
+ $elem14 = null;
+ $elem14 = new \Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference();
+ $xfer += $elem14->read($input);
+ $this->computeResourcePreferences []= $elem14;
}
$xfer += $input->readListEnd();
} else {
@@ -729,15 +809,15 @@ class GatewayResourceProfile {
case 4:
if ($ftype == TType::LST) {
$this->storagePreferences = array();
- $_size6 = 0;
- $_etype9 = 0;
- $xfer += $input->readListBegin($_etype9, $_size6);
- for ($_i10 = 0; $_i10 < $_size6; ++$_i10)
+ $_size15 = 0;
+ $_etype18 = 0;
+ $xfer += $input->readListBegin($_etype18, $_size15);
+ for ($_i19 = 0; $_i19 < $_size15; ++$_i19)
{
- $elem11 = null;
- $elem11 = new \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference();
- $xfer += $elem11->read($input);
- $this->storagePreferences []= $elem11;
+ $elem20 = null;
+ $elem20 = new \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference();
+ $xfer += $elem20->read($input);
+ $this->storagePreferences []= $elem20;
}
$xfer += $input->readListEnd();
} else {
@@ -789,9 +869,9 @@ class GatewayResourceProfile {
{
$output->writeListBegin(TType::STRUCT, count($this->computeResourcePreferences));
{
- foreach ($this->computeResourcePreferences as $iter12)
+ foreach ($this->computeResourcePreferences as $iter21)
{
- $xfer += $iter12->write($output);
+ $xfer += $iter21->write($output);
}
}
$output->writeListEnd();
@@ -806,9 +886,9 @@ class GatewayResourceProfile {
{
$output->writeListBegin(TType::STRUCT, count($this->storagePreferences));
{
- foreach ($this->storagePreferences as $iter13)
+ foreach ($this->storagePreferences as $iter22)
{
- $xfer += $iter13->write($output);
+ $xfer += $iter22->write($output);
}
}
$output->writeListEnd();
http://git-wip-us.apache.org/repos/asf/airavata/blob/b0f6744e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/accountprovisioning/SSHAccountProvisioner.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/accountprovisioning/SSHAccountProvisioner.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/accountprovisioning/SSHAccountProvisioner.java
index fb0a965..0dcadc4 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/accountprovisioning/SSHAccountProvisioner.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/accountprovisioning/SSHAccountProvisioner.java
@@ -58,6 +58,7 @@ public class SSHAccountProvisioner implements org.apache.thrift.TBase<SSHAccount
private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField CAN_CREATE_ACCOUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("canCreateAccount", org.apache.thrift.protocol.TType.BOOL, (short)2);
private static final org.apache.thrift.protocol.TField CAN_INSTALL_SSHKEY_FIELD_DESC = new org.apache.thrift.protocol.TField("canInstallSSHKey", org.apache.thrift.protocol.TType.BOOL, (short)3);
+ private static final org.apache.thrift.protocol.TField CONFIG_PARAMS_FIELD_DESC = new org.apache.thrift.protocol.TField("configParams", org.apache.thrift.protocol.TType.LIST, (short)4);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -68,12 +69,14 @@ public class SSHAccountProvisioner implements org.apache.thrift.TBase<SSHAccount
private String name; // required
private boolean canCreateAccount; // required
private boolean canInstallSSHKey; // required
+ private List<SSHAccountProvisionerConfigParam> configParams; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
NAME((short)1, "name"),
CAN_CREATE_ACCOUNT((short)2, "canCreateAccount"),
- CAN_INSTALL_SSHKEY((short)3, "canInstallSSHKey");
+ CAN_INSTALL_SSHKEY((short)3, "canInstallSSHKey"),
+ CONFIG_PARAMS((short)4, "configParams");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -94,6 +97,8 @@ public class SSHAccountProvisioner implements org.apache.thrift.TBase<SSHAccount
return CAN_CREATE_ACCOUNT;
case 3: // CAN_INSTALL_SSHKEY
return CAN_INSTALL_SSHKEY;
+ case 4: // CONFIG_PARAMS
+ return CONFIG_PARAMS;
default:
return null;
}
@@ -146,6 +151,9 @@ public class SSHAccountProvisioner implements org.apache.thrift.TBase<SSHAccount
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
tmpMap.put(_Fields.CAN_INSTALL_SSHKEY, new org.apache.thrift.meta_data.FieldMetaData("canInstallSSHKey", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+ tmpMap.put(_Fields.CONFIG_PARAMS, new org.apache.thrift.meta_data.FieldMetaData("configParams", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SSHAccountProvisionerConfigParam.class))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SSHAccountProvisioner.class, metaDataMap);
}
@@ -156,7 +164,8 @@ public class SSHAccountProvisioner implements org.apache.thrift.TBase<SSHAccount
public SSHAccountProvisioner(
String name,
boolean canCreateAccount,
- boolean canInstallSSHKey)
+ boolean canInstallSSHKey,
+ List<SSHAccountProvisionerConfigParam> configParams)
{
this();
this.name = name;
@@ -164,6 +173,7 @@ public class SSHAccountProvisioner implements org.apache.thrift.TBase<SSHAccount
setCanCreateAccountIsSet(true);
this.canInstallSSHKey = canInstallSSHKey;
setCanInstallSSHKeyIsSet(true);
+ this.configParams = configParams;
}
/**
@@ -176,6 +186,13 @@ public class SSHAccountProvisioner implements org.apache.thrift.TBase<SSHAccount
}
this.canCreateAccount = other.canCreateAccount;
this.canInstallSSHKey = other.canInstallSSHKey;
+ if (other.isSetConfigParams()) {
+ List<SSHAccountProvisionerConfigParam> __this__configParams = new ArrayList<SSHAccountProvisionerConfigParam>(other.configParams.size());
+ for (SSHAccountProvisionerConfigParam other_element : other.configParams) {
+ __this__configParams.add(new SSHAccountProvisionerConfigParam(other_element));
+ }
+ this.configParams = __this__configParams;
+ }
}
public SSHAccountProvisioner deepCopy() {
@@ -189,6 +206,7 @@ public class SSHAccountProvisioner implements org.apache.thrift.TBase<SSHAccount
this.canCreateAccount = false;
setCanInstallSSHKeyIsSet(false);
this.canInstallSSHKey = false;
+ this.configParams = null;
}
public String getName() {
@@ -258,6 +276,44 @@ public class SSHAccountProvisioner implements org.apache.thrift.TBase<SSHAccount
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CANINSTALLSSHKEY_ISSET_ID, value);
}
+ public int getConfigParamsSize() {
+ return (this.configParams == null) ? 0 : this.configParams.size();
+ }
+
+ public java.util.Iterator<SSHAccountProvisionerConfigParam> getConfigParamsIterator() {
+ return (this.configParams == null) ? null : this.configParams.iterator();
+ }
+
+ public void addToConfigParams(SSHAccountProvisionerConfigParam elem) {
+ if (this.configParams == null) {
+ this.configParams = new ArrayList<SSHAccountProvisionerConfigParam>();
+ }
+ this.configParams.add(elem);
+ }
+
+ public List<SSHAccountProvisionerConfigParam> getConfigParams() {
+ return this.configParams;
+ }
+
+ public void setConfigParams(List<SSHAccountProvisionerConfigParam> configParams) {
+ this.configParams = configParams;
+ }
+
+ public void unsetConfigParams() {
+ this.configParams = null;
+ }
+
+ /** Returns true if field configParams is set (has been assigned a value) and false otherwise */
+ public boolean isSetConfigParams() {
+ return this.configParams != null;
+ }
+
+ public void setConfigParamsIsSet(boolean value) {
+ if (!value) {
+ this.configParams = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case NAME:
@@ -284,6 +340,14 @@ public class SSHAccountProvisioner implements org.apache.thrift.TBase<SSHAccount
}
break;
+ case CONFIG_PARAMS:
+ if (value == null) {
+ unsetConfigParams();
+ } else {
+ setConfigParams((List<SSHAccountProvisionerConfigParam>)value);
+ }
+ break;
+
}
}
@@ -298,6 +362,9 @@ public class SSHAccountProvisioner implements org.apache.thrift.TBase<SSHAccount
case CAN_INSTALL_SSHKEY:
return isCanInstallSSHKey();
+ case CONFIG_PARAMS:
+ return getConfigParams();
+
}
throw new IllegalStateException();
}
@@ -315,6 +382,8 @@ public class SSHAccountProvisioner implements org.apache.thrift.TBase<SSHAccount
return isSetCanCreateAccount();
case CAN_INSTALL_SSHKEY:
return isSetCanInstallSSHKey();
+ case CONFIG_PARAMS:
+ return isSetConfigParams();
}
throw new IllegalStateException();
}
@@ -359,6 +428,15 @@ public class SSHAccountProvisioner implements org.apache.thrift.TBase<SSHAccount
return false;
}
+ boolean this_present_configParams = true && this.isSetConfigParams();
+ boolean that_present_configParams = true && that.isSetConfigParams();
+ if (this_present_configParams || that_present_configParams) {
+ if (!(this_present_configParams && that_present_configParams))
+ return false;
+ if (!this.configParams.equals(that.configParams))
+ return false;
+ }
+
return true;
}
@@ -381,6 +459,11 @@ public class SSHAccountProvisioner implements org.apache.thrift.TBase<SSHAccount
if (present_canInstallSSHKey)
list.add(canInstallSSHKey);
+ boolean present_configParams = true && (isSetConfigParams());
+ list.add(present_configParams);
+ if (present_configParams)
+ list.add(configParams);
+
return list.hashCode();
}
@@ -422,6 +505,16 @@ public class SSHAccountProvisioner implements org.apache.thrift.TBase<SSHAccount
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetConfigParams()).compareTo(other.isSetConfigParams());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetConfigParams()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.configParams, other.configParams);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -457,6 +550,14 @@ public class SSHAccountProvisioner implements org.apache.thrift.TBase<SSHAccount
sb.append("canInstallSSHKey:");
sb.append(this.canInstallSSHKey);
first = false;
+ if (!first) sb.append(", ");
+ sb.append("configParams:");
+ if (this.configParams == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.configParams);
+ }
+ first = false;
sb.append(")");
return sb.toString();
}
@@ -475,6 +576,10 @@ public class SSHAccountProvisioner implements org.apache.thrift.TBase<SSHAccount
throw new org.apache.thrift.protocol.TProtocolException("Required field 'canInstallSSHKey' is unset! Struct:" + toString());
}
+ if (!isSetConfigParams()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'configParams' is unset! Struct:" + toString());
+ }
+
// check for sub-struct validity
}
@@ -538,6 +643,25 @@ public class SSHAccountProvisioner implements org.apache.thrift.TBase<SSHAccount
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 4: // CONFIG_PARAMS
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
+ struct.configParams = new ArrayList<SSHAccountProvisionerConfigParam>(_list0.size);
+ SSHAccountProvisionerConfigParam _elem1;
+ for (int _i2 = 0; _i2 < _list0.size; ++_i2)
+ {
+ _elem1 = new SSHAccountProvisionerConfigParam();
+ _elem1.read(iprot);
+ struct.configParams.add(_elem1);
+ }
+ iprot.readListEnd();
+ }
+ struct.setConfigParamsIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -562,6 +686,18 @@ public class SSHAccountProvisioner implements org.apache.thrift.TBase<SSHAccount
oprot.writeFieldBegin(CAN_INSTALL_SSHKEY_FIELD_DESC);
oprot.writeBool(struct.canInstallSSHKey);
oprot.writeFieldEnd();
+ if (struct.configParams != null) {
+ oprot.writeFieldBegin(CONFIG_PARAMS_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.configParams.size()));
+ for (SSHAccountProvisionerConfigParam _iter3 : struct.configParams)
+ {
+ _iter3.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -582,6 +718,13 @@ public class SSHAccountProvisioner implements org.apache.thrift.TBase<SSHAccount
oprot.writeString(struct.name);
oprot.writeBool(struct.canCreateAccount);
oprot.writeBool(struct.canInstallSSHKey);
+ {
+ oprot.writeI32(struct.configParams.size());
+ for (SSHAccountProvisionerConfigParam _iter4 : struct.configParams)
+ {
+ _iter4.write(oprot);
+ }
+ }
}
@Override
@@ -593,6 +736,18 @@ public class SSHAccountProvisioner implements org.apache.thrift.TBase<SSHAccount
struct.setCanCreateAccountIsSet(true);
struct.canInstallSSHKey = iprot.readBool();
struct.setCanInstallSSHKeyIsSet(true);
+ {
+ org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.configParams = new ArrayList<SSHAccountProvisionerConfigParam>(_list5.size);
+ SSHAccountProvisionerConfigParam _elem6;
+ for (int _i7 = 0; _i7 < _list5.size; ++_i7)
+ {
+ _elem6 = new SSHAccountProvisionerConfigParam();
+ _elem6.read(iprot);
+ struct.configParams.add(_elem6);
+ }
+ }
+ struct.setConfigParamsIsSet(true);
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/b0f6744e/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 5601424..3edf60c 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
@@ -23,15 +23,32 @@
*/
package org.apache.airavata.model.appcatalog.gatewayprofile;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
import javax.annotation.Generated;
-import java.util.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/**