You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/10/08 22:39:01 UTC
[1/2] airavata git commit: changing method name and adding cs token
at the gateway profile level
Repository: airavata
Updated Branches:
refs/heads/master e66c52bc6 -> c5585979d
http://git-wip-us.apache.org/repos/asf/airavata/blob/c5585979/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/GatewayProfileResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/GatewayProfileResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/GatewayProfileResource.java
index be24822..7d92dcb 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/GatewayProfileResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/GatewayProfileResource.java
@@ -41,6 +41,7 @@ public class GatewayProfileResource extends AppCatAbstractResource {
private String gatewayID;
private Timestamp createdTime;
private Timestamp updatedTime;
+ private String credentialStoreToken;
public Timestamp getCreatedTime() {
return createdTime;
@@ -58,6 +59,14 @@ public class GatewayProfileResource extends AppCatAbstractResource {
this.updatedTime = updatedTime;
}
+ public String getCredentialStoreToken() {
+ return credentialStoreToken;
+ }
+
+ public void setCredentialStoreToken(String credentialStoreToken) {
+ this.credentialStoreToken = credentialStoreToken;
+ }
+
public void remove(Object identifier) throws AppCatalogException {
EntityManager em = null;
try {
@@ -266,11 +275,13 @@ public class GatewayProfileResource extends AppCatAbstractResource {
em.getTransaction().begin();
if (existingGatewayProfile != null) {
existingGatewayProfile.setUpdateTime(AiravataUtils.getCurrentTimestamp());
+ existingGatewayProfile.setCredentialStoreToken(credentialStoreToken);
em.merge(existingGatewayProfile);
} else {
GatewayProfile gatewayProfile = new GatewayProfile();
gatewayProfile.setGatewayID(gatewayID);
gatewayProfile.setCreationTime(AiravataUtils.getCurrentTimestamp());
+ gatewayProfile.setCredentialStoreToken(credentialStoreToken);
em.persist(gatewayProfile);
}
em.getTransaction().commit();
http://git-wip-us.apache.org/repos/asf/airavata/blob/c5585979/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
index a027ef4..33ce626 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
@@ -867,6 +867,7 @@ public class AppCatalogJPAUtils {
if (o != null) {
resource.setGatewayID(o.getGatewayID());
resource.setCreatedTime(o.getCreationTime());
+ resource.setCredentialStoreToken(o.getCredentialStoreToken());
if (o.getUpdateTime() != null){
resource.setUpdatedTime(o.getUpdateTime());
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/c5585979/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
index 58e9659..f419e6e 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
@@ -805,6 +805,7 @@ public class AppCatalogThriftConversion {
public static GatewayResourceProfile getGatewayResourceProfile(GatewayProfileResource gw, List<ComputeResourcePreference> preferences, List<DataStoragePreference> storagePreferences){
GatewayResourceProfile gatewayProfile = new GatewayResourceProfile();
gatewayProfile.setGatewayID(gw.getGatewayID());
+ gatewayProfile.setCredentialStoreToken(gw.getCredentialStoreToken());
gatewayProfile.setComputeResourcePreferences(preferences);
gatewayProfile.setDataStoragePreferences(storagePreferences);
return gatewayProfile;
http://git-wip-us.apache.org/repos/asf/airavata/blob/c5585979/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql b/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
index f148e9c..e68d165 100644
--- a/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
+++ b/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
@@ -318,6 +318,7 @@ CREATE TABLE GATEWAY_PROFILE
GATEWAY_ID VARCHAR(255),
CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+ CS_TOKEN VARCHAR (255),
PRIMARY KEY(GATEWAY_ID)
);
http://git-wip-us.apache.org/repos/asf/airavata/blob/c5585979/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
index 5cc5b8e..14a8132 100644
--- a/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
@@ -316,6 +316,7 @@ CREATE TABLE GATEWAY_PROFILE
GATEWAY_ID VARCHAR(255),
CREATION_TIME TIMESTAMP DEFAULT NOW(),
UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ,
+ CS_TOKEN VARCHAR (255),
PRIMARY KEY(GATEWAY_ID)
);
http://git-wip-us.apache.org/repos/asf/airavata/blob/c5585979/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ComputeResourceRegister.java
----------------------------------------------------------------------
diff --git a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ComputeResourceRegister.java b/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ComputeResourceRegister.java
index f063e99..33db776 100644
--- a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ComputeResourceRegister.java
+++ b/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ComputeResourceRegister.java
@@ -190,7 +190,7 @@ public class ComputeResourceRegister {
loginNamesWithResourceIds = getLoginNamesWithResourceIDs();
- List<GatewayResourceProfile> allGatewayComputeResources = airavata.getAllGatewayComputeResources(authzToken);
+ List<GatewayResourceProfile> allGatewayComputeResources = airavata.getAllGatewayResourceProfiles(authzToken);
for (GatewayResourceProfile gatewayResourceProfile : allGatewayComputeResources) {
for (String resourceId : loginNamesWithResourceIds.keySet()) {
String loginUserName = loginNamesWithResourceIds.get(resourceId);
http://git-wip-us.apache.org/repos/asf/airavata/blob/c5585979/thrift-interface-descriptions/airavata-api/airavata_api.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-api/airavata_api.thrift b/thrift-interface-descriptions/airavata-api/airavata_api.thrift
index 3ad051f..1dd70f6 100644
--- a/thrift-interface-descriptions/airavata-api/airavata_api.thrift
+++ b/thrift-interface-descriptions/airavata-api/airavata_api.thrift
@@ -2050,7 +2050,7 @@ service Airavata {
* Fetch all gateway profiles registered
**/
list<gateway_resource_profile_model.GatewayResourceProfile>
- getAllGatewayComputeResources(1: required security_model.AuthzToken authzToken)
+ getAllGatewayResourceProfiles(1: required security_model.AuthzToken authzToken)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase,
[2/2] airavata git commit: changing method name and adding cs token
at the gateway profile level
Posted by ch...@apache.org.
changing method name and adding cs token at the gateway profile level
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c5585979
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c5585979
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c5585979
Branch: refs/heads/master
Commit: c5585979d4fb257a6fabc994fbdd9956b5921905
Parents: e66c52b
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Thu Oct 8 16:38:51 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Thu Oct 8 16:38:51 2015 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 2 +-
.../java/org/apache/airavata/api/Airavata.java | 196 +++++++++----------
.../main/resources/lib/airavata/Airavata.cpp | 72 +++----
.../src/main/resources/lib/airavata/Airavata.h | 84 ++++----
.../lib/airavata/Airavata_server.skeleton.cpp | 4 +-
.../resources/lib/Airavata/API/Airavata.php | 36 ++--
.../lib/apache/airavata/api/Airavata-remote | 8 +-
.../lib/apache/airavata/api/Airavata.py | 40 ++--
.../catalog/impl/GwyResourceProfileImpl.java | 3 +
.../core/app/catalog/model/GatewayProfile.java | 10 +
.../resources/GatewayProfileResource.java | 11 ++
.../app/catalog/util/AppCatalogJPAUtils.java | 1 +
.../util/AppCatalogThriftConversion.java | 1 +
.../src/main/resources/appcatalog-derby.sql | 1 +
.../src/main/resources/appcatalog-mysql.sql | 1 +
.../ComputeResourceRegister.java | 2 +-
.../airavata-api/airavata_api.thrift | 2 +-
17 files changed, 251 insertions(+), 223 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/c5585979/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 72fe13a..3307121 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
@@ -3510,7 +3510,7 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
@SecurityCheck
- public List<GatewayResourceProfile> getAllGatewayComputeResources(AuthzToken authzToken) throws InvalidRequestException,
+ public List<GatewayResourceProfile> getAllGatewayResourceProfiles(AuthzToken authzToken) throws InvalidRequestException,
AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
appCatalog = RegistryFactory.getAppCatalog();
http://git-wip-us.apache.org/repos/asf/airavata/blob/c5585979/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 28cba9b..62bf830 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
@@ -1708,7 +1708,7 @@ public class Airavata {
*
* @param authzToken
*/
- public List<org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile> getAllGatewayComputeResources(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.gatewayprofile.GatewayResourceProfile> getAllGatewayResourceProfiles(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;
/**
* Update a Compute Resource Preference to a registered gateway profile.
@@ -1996,7 +1996,7 @@ public class Airavata {
public void getAllGatewayDataStoragePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getAllGatewayComputeResources(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void getAllGatewayResourceProfiles(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void updateGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId, org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference computeResourcePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
@@ -6133,23 +6133,23 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllGatewayDataStoragePreferences failed: unknown result");
}
- public List<org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile> getAllGatewayComputeResources(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.gatewayprofile.GatewayResourceProfile> getAllGatewayResourceProfiles(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_getAllGatewayComputeResources(authzToken);
- return recv_getAllGatewayComputeResources();
+ send_getAllGatewayResourceProfiles(authzToken);
+ return recv_getAllGatewayResourceProfiles();
}
- public void send_getAllGatewayComputeResources(org.apache.airavata.model.security.AuthzToken authzToken) throws org.apache.thrift.TException
+ public void send_getAllGatewayResourceProfiles(org.apache.airavata.model.security.AuthzToken authzToken) throws org.apache.thrift.TException
{
- getAllGatewayComputeResources_args args = new getAllGatewayComputeResources_args();
+ getAllGatewayResourceProfiles_args args = new getAllGatewayResourceProfiles_args();
args.setAuthzToken(authzToken);
- sendBase("getAllGatewayComputeResources", args);
+ sendBase("getAllGatewayResourceProfiles", args);
}
- public List<org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile> recv_getAllGatewayComputeResources() 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.gatewayprofile.GatewayResourceProfile> recv_getAllGatewayResourceProfiles() 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
{
- getAllGatewayComputeResources_result result = new getAllGatewayComputeResources_result();
- receiveBase(result, "getAllGatewayComputeResources");
+ getAllGatewayResourceProfiles_result result = new getAllGatewayResourceProfiles_result();
+ receiveBase(result, "getAllGatewayResourceProfiles");
if (result.isSetSuccess()) {
return result.success;
}
@@ -6165,7 +6165,7 @@ public class Airavata {
if (result.ae != null) {
throw result.ae;
}
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllGatewayComputeResources failed: unknown result");
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllGatewayResourceProfiles failed: unknown result");
}
public boolean updateGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId, org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference computeResourcePreference) 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
@@ -10763,23 +10763,23 @@ public class Airavata {
}
}
- public void getAllGatewayComputeResources(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void getAllGatewayResourceProfiles(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- getAllGatewayComputeResources_call method_call = new getAllGatewayComputeResources_call(authzToken, resultHandler, this, ___protocolFactory, ___transport);
+ getAllGatewayResourceProfiles_call method_call = new getAllGatewayResourceProfiles_call(authzToken, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
- public static class getAllGatewayComputeResources_call extends org.apache.thrift.async.TAsyncMethodCall {
+ public static class getAllGatewayResourceProfiles_call extends org.apache.thrift.async.TAsyncMethodCall {
private org.apache.airavata.model.security.AuthzToken authzToken;
- public getAllGatewayComputeResources_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 getAllGatewayResourceProfiles_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("getAllGatewayComputeResources", org.apache.thrift.protocol.TMessageType.CALL, 0));
- getAllGatewayComputeResources_args args = new getAllGatewayComputeResources_args();
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getAllGatewayResourceProfiles", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ getAllGatewayResourceProfiles_args args = new getAllGatewayResourceProfiles_args();
args.setAuthzToken(authzToken);
args.write(prot);
prot.writeMessageEnd();
@@ -10791,7 +10791,7 @@ 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_getAllGatewayComputeResources();
+ return (new Client(prot)).recv_getAllGatewayResourceProfiles();
}
}
@@ -11328,7 +11328,7 @@ public class Airavata {
processMap.put("getGatewayDataStoragePreference", new getGatewayDataStoragePreference());
processMap.put("getAllGatewayComputeResourcePreferences", new getAllGatewayComputeResourcePreferences());
processMap.put("getAllGatewayDataStoragePreferences", new getAllGatewayDataStoragePreferences());
- processMap.put("getAllGatewayComputeResources", new getAllGatewayComputeResources());
+ processMap.put("getAllGatewayResourceProfiles", new getAllGatewayResourceProfiles());
processMap.put("updateGatewayComputeResourcePreference", new updateGatewayComputeResourcePreference());
processMap.put("updateGatewayDataStoragePreference", new updateGatewayDataStoragePreference());
processMap.put("deleteGatewayComputeResourcePreference", new deleteGatewayComputeResourcePreference());
@@ -14718,23 +14718,23 @@ public class Airavata {
}
}
- public static class getAllGatewayComputeResources<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllGatewayComputeResources_args> {
- public getAllGatewayComputeResources() {
- super("getAllGatewayComputeResources");
+ public static class getAllGatewayResourceProfiles<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllGatewayResourceProfiles_args> {
+ public getAllGatewayResourceProfiles() {
+ super("getAllGatewayResourceProfiles");
}
- public getAllGatewayComputeResources_args getEmptyArgsInstance() {
- return new getAllGatewayComputeResources_args();
+ public getAllGatewayResourceProfiles_args getEmptyArgsInstance() {
+ return new getAllGatewayResourceProfiles_args();
}
protected boolean isOneway() {
return false;
}
- public getAllGatewayComputeResources_result getResult(I iface, getAllGatewayComputeResources_args args) throws org.apache.thrift.TException {
- getAllGatewayComputeResources_result result = new getAllGatewayComputeResources_result();
+ public getAllGatewayResourceProfiles_result getResult(I iface, getAllGatewayResourceProfiles_args args) throws org.apache.thrift.TException {
+ getAllGatewayResourceProfiles_result result = new getAllGatewayResourceProfiles_result();
try {
- result.success = iface.getAllGatewayComputeResources(args.authzToken);
+ result.success = iface.getAllGatewayResourceProfiles(args.authzToken);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
} catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -15207,7 +15207,7 @@ public class Airavata {
processMap.put("getGatewayDataStoragePreference", new getGatewayDataStoragePreference());
processMap.put("getAllGatewayComputeResourcePreferences", new getAllGatewayComputeResourcePreferences());
processMap.put("getAllGatewayDataStoragePreferences", new getAllGatewayDataStoragePreferences());
- processMap.put("getAllGatewayComputeResources", new getAllGatewayComputeResources());
+ processMap.put("getAllGatewayResourceProfiles", new getAllGatewayResourceProfiles());
processMap.put("updateGatewayComputeResourcePreference", new updateGatewayComputeResourcePreference());
processMap.put("updateGatewayDataStoragePreference", new updateGatewayDataStoragePreference());
processMap.put("deleteGatewayComputeResourcePreference", new deleteGatewayComputeResourcePreference());
@@ -23270,20 +23270,20 @@ public class Airavata {
}
}
- public static class getAllGatewayComputeResources<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllGatewayComputeResources_args, List<org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile>> {
- public getAllGatewayComputeResources() {
- super("getAllGatewayComputeResources");
+ public static class getAllGatewayResourceProfiles<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllGatewayResourceProfiles_args, List<org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile>> {
+ public getAllGatewayResourceProfiles() {
+ super("getAllGatewayResourceProfiles");
}
- public getAllGatewayComputeResources_args getEmptyArgsInstance() {
- return new getAllGatewayComputeResources_args();
+ public getAllGatewayResourceProfiles_args getEmptyArgsInstance() {
+ return new getAllGatewayResourceProfiles_args();
}
public AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
return new AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile>>() {
public void onComplete(List<org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile> o) {
- getAllGatewayComputeResources_result result = new getAllGatewayComputeResources_result();
+ getAllGatewayResourceProfiles_result result = new getAllGatewayResourceProfiles_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -23296,7 +23296,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getAllGatewayComputeResources_result result = new getAllGatewayComputeResources_result();
+ getAllGatewayResourceProfiles_result result = new getAllGatewayResourceProfiles_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -23337,8 +23337,8 @@ public class Airavata {
return false;
}
- public void start(I iface, getAllGatewayComputeResources_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile>> resultHandler) throws TException {
- iface.getAllGatewayComputeResources(args.authzToken,resultHandler);
+ public void start(I iface, getAllGatewayResourceProfiles_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile>> resultHandler) throws TException {
+ iface.getAllGatewayResourceProfiles(args.authzToken,resultHandler);
}
}
@@ -174512,15 +174512,15 @@ public class Airavata {
}
- public static class getAllGatewayComputeResources_args implements org.apache.thrift.TBase<getAllGatewayComputeResources_args, getAllGatewayComputeResources_args._Fields>, java.io.Serializable, Cloneable, Comparable<getAllGatewayComputeResources_args> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAllGatewayComputeResources_args");
+ public static class getAllGatewayResourceProfiles_args implements org.apache.thrift.TBase<getAllGatewayResourceProfiles_args, getAllGatewayResourceProfiles_args._Fields>, java.io.Serializable, Cloneable, Comparable<getAllGatewayResourceProfiles_args> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAllGatewayResourceProfiles_args");
private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
- schemes.put(StandardScheme.class, new getAllGatewayComputeResources_argsStandardSchemeFactory());
- schemes.put(TupleScheme.class, new getAllGatewayComputeResources_argsTupleSchemeFactory());
+ schemes.put(StandardScheme.class, new getAllGatewayResourceProfiles_argsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new getAllGatewayResourceProfiles_argsTupleSchemeFactory());
}
public org.apache.airavata.model.security.AuthzToken authzToken; // required
@@ -174590,13 +174590,13 @@ public class Airavata {
tmpMap.put(_Fields.AUTHZ_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authzToken", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAllGatewayComputeResources_args.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAllGatewayResourceProfiles_args.class, metaDataMap);
}
- public getAllGatewayComputeResources_args() {
+ public getAllGatewayResourceProfiles_args() {
}
- public getAllGatewayComputeResources_args(
+ public getAllGatewayResourceProfiles_args(
org.apache.airavata.model.security.AuthzToken authzToken)
{
this();
@@ -174606,14 +174606,14 @@ public class Airavata {
/**
* Performs a deep copy on <i>other</i>.
*/
- public getAllGatewayComputeResources_args(getAllGatewayComputeResources_args other) {
+ public getAllGatewayResourceProfiles_args(getAllGatewayResourceProfiles_args other) {
if (other.isSetAuthzToken()) {
this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken);
}
}
- public getAllGatewayComputeResources_args deepCopy() {
- return new getAllGatewayComputeResources_args(this);
+ public getAllGatewayResourceProfiles_args deepCopy() {
+ return new getAllGatewayResourceProfiles_args(this);
}
@Override
@@ -174625,7 +174625,7 @@ public class Airavata {
return this.authzToken;
}
- public getAllGatewayComputeResources_args setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) {
+ public getAllGatewayResourceProfiles_args setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) {
this.authzToken = authzToken;
return this;
}
@@ -174684,12 +174684,12 @@ public class Airavata {
public boolean equals(Object that) {
if (that == null)
return false;
- if (that instanceof getAllGatewayComputeResources_args)
- return this.equals((getAllGatewayComputeResources_args)that);
+ if (that instanceof getAllGatewayResourceProfiles_args)
+ return this.equals((getAllGatewayResourceProfiles_args)that);
return false;
}
- public boolean equals(getAllGatewayComputeResources_args that) {
+ public boolean equals(getAllGatewayResourceProfiles_args that) {
if (that == null)
return false;
@@ -174718,7 +174718,7 @@ public class Airavata {
}
@Override
- public int compareTo(getAllGatewayComputeResources_args other) {
+ public int compareTo(getAllGatewayResourceProfiles_args other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
@@ -174752,7 +174752,7 @@ public class Airavata {
@Override
public String toString() {
- StringBuilder sb = new StringBuilder("getAllGatewayComputeResources_args(");
+ StringBuilder sb = new StringBuilder("getAllGatewayResourceProfiles_args(");
boolean first = true;
sb.append("authzToken:");
@@ -174793,15 +174793,15 @@ public class Airavata {
}
}
- private static class getAllGatewayComputeResources_argsStandardSchemeFactory implements SchemeFactory {
- public getAllGatewayComputeResources_argsStandardScheme getScheme() {
- return new getAllGatewayComputeResources_argsStandardScheme();
+ private static class getAllGatewayResourceProfiles_argsStandardSchemeFactory implements SchemeFactory {
+ public getAllGatewayResourceProfiles_argsStandardScheme getScheme() {
+ return new getAllGatewayResourceProfiles_argsStandardScheme();
}
}
- private static class getAllGatewayComputeResources_argsStandardScheme extends StandardScheme<getAllGatewayComputeResources_args> {
+ private static class getAllGatewayResourceProfiles_argsStandardScheme extends StandardScheme<getAllGatewayResourceProfiles_args> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, getAllGatewayComputeResources_args struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, getAllGatewayResourceProfiles_args struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -174831,7 +174831,7 @@ public class Airavata {
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, getAllGatewayComputeResources_args struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, getAllGatewayResourceProfiles_args struct) throws org.apache.thrift.TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -174846,22 +174846,22 @@ public class Airavata {
}
- private static class getAllGatewayComputeResources_argsTupleSchemeFactory implements SchemeFactory {
- public getAllGatewayComputeResources_argsTupleScheme getScheme() {
- return new getAllGatewayComputeResources_argsTupleScheme();
+ private static class getAllGatewayResourceProfiles_argsTupleSchemeFactory implements SchemeFactory {
+ public getAllGatewayResourceProfiles_argsTupleScheme getScheme() {
+ return new getAllGatewayResourceProfiles_argsTupleScheme();
}
}
- private static class getAllGatewayComputeResources_argsTupleScheme extends TupleScheme<getAllGatewayComputeResources_args> {
+ private static class getAllGatewayResourceProfiles_argsTupleScheme extends TupleScheme<getAllGatewayResourceProfiles_args> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, getAllGatewayComputeResources_args struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, getAllGatewayResourceProfiles_args struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
struct.authzToken.write(oprot);
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, getAllGatewayComputeResources_args struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, getAllGatewayResourceProfiles_args struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.authzToken = new org.apache.airavata.model.security.AuthzToken();
struct.authzToken.read(iprot);
@@ -174871,8 +174871,8 @@ public class Airavata {
}
- public static class getAllGatewayComputeResources_result implements org.apache.thrift.TBase<getAllGatewayComputeResources_result, getAllGatewayComputeResources_result._Fields>, java.io.Serializable, Cloneable, Comparable<getAllGatewayComputeResources_result> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAllGatewayComputeResources_result");
+ public static class getAllGatewayResourceProfiles_result implements org.apache.thrift.TBase<getAllGatewayResourceProfiles_result, getAllGatewayResourceProfiles_result._Fields>, java.io.Serializable, Cloneable, Comparable<getAllGatewayResourceProfiles_result> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAllGatewayResourceProfiles_result");
private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0);
private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -174882,8 +174882,8 @@ public class Airavata {
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
- schemes.put(StandardScheme.class, new getAllGatewayComputeResources_resultStandardSchemeFactory());
- schemes.put(TupleScheme.class, new getAllGatewayComputeResources_resultTupleSchemeFactory());
+ schemes.put(StandardScheme.class, new getAllGatewayResourceProfiles_resultStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new getAllGatewayResourceProfiles_resultTupleSchemeFactory());
}
public List<org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile> success; // required
@@ -174978,13 +174978,13 @@ public class Airavata {
tmpMap.put(_Fields.AE, new org.apache.thrift.meta_data.FieldMetaData("ae", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAllGatewayComputeResources_result.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAllGatewayResourceProfiles_result.class, metaDataMap);
}
- public getAllGatewayComputeResources_result() {
+ public getAllGatewayResourceProfiles_result() {
}
- public getAllGatewayComputeResources_result(
+ public getAllGatewayResourceProfiles_result(
List<org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile> success,
org.apache.airavata.model.error.InvalidRequestException ire,
org.apache.airavata.model.error.AiravataClientException ace,
@@ -175002,7 +175002,7 @@ public class Airavata {
/**
* Performs a deep copy on <i>other</i>.
*/
- public getAllGatewayComputeResources_result(getAllGatewayComputeResources_result other) {
+ public getAllGatewayResourceProfiles_result(getAllGatewayResourceProfiles_result other) {
if (other.isSetSuccess()) {
List<org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile> __this__success = new ArrayList<org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile>(other.success.size());
for (org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile other_element : other.success) {
@@ -175024,8 +175024,8 @@ public class Airavata {
}
}
- public getAllGatewayComputeResources_result deepCopy() {
- return new getAllGatewayComputeResources_result(this);
+ public getAllGatewayResourceProfiles_result deepCopy() {
+ return new getAllGatewayResourceProfiles_result(this);
}
@Override
@@ -175056,7 +175056,7 @@ public class Airavata {
return this.success;
}
- public getAllGatewayComputeResources_result setSuccess(List<org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile> success) {
+ public getAllGatewayResourceProfiles_result setSuccess(List<org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile> success) {
this.success = success;
return this;
}
@@ -175080,7 +175080,7 @@ public class Airavata {
return this.ire;
}
- public getAllGatewayComputeResources_result setIre(org.apache.airavata.model.error.InvalidRequestException ire) {
+ public getAllGatewayResourceProfiles_result setIre(org.apache.airavata.model.error.InvalidRequestException ire) {
this.ire = ire;
return this;
}
@@ -175104,7 +175104,7 @@ public class Airavata {
return this.ace;
}
- public getAllGatewayComputeResources_result setAce(org.apache.airavata.model.error.AiravataClientException ace) {
+ public getAllGatewayResourceProfiles_result setAce(org.apache.airavata.model.error.AiravataClientException ace) {
this.ace = ace;
return this;
}
@@ -175128,7 +175128,7 @@ public class Airavata {
return this.ase;
}
- public getAllGatewayComputeResources_result setAse(org.apache.airavata.model.error.AiravataSystemException ase) {
+ public getAllGatewayResourceProfiles_result setAse(org.apache.airavata.model.error.AiravataSystemException ase) {
this.ase = ase;
return this;
}
@@ -175152,7 +175152,7 @@ public class Airavata {
return this.ae;
}
- public getAllGatewayComputeResources_result setAe(org.apache.airavata.model.error.AuthorizationException ae) {
+ public getAllGatewayResourceProfiles_result setAe(org.apache.airavata.model.error.AuthorizationException ae) {
this.ae = ae;
return this;
}
@@ -175263,12 +175263,12 @@ public class Airavata {
public boolean equals(Object that) {
if (that == null)
return false;
- if (that instanceof getAllGatewayComputeResources_result)
- return this.equals((getAllGatewayComputeResources_result)that);
+ if (that instanceof getAllGatewayResourceProfiles_result)
+ return this.equals((getAllGatewayResourceProfiles_result)that);
return false;
}
- public boolean equals(getAllGatewayComputeResources_result that) {
+ public boolean equals(getAllGatewayResourceProfiles_result that) {
if (that == null)
return false;
@@ -175353,7 +175353,7 @@ public class Airavata {
}
@Override
- public int compareTo(getAllGatewayComputeResources_result other) {
+ public int compareTo(getAllGatewayResourceProfiles_result other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
@@ -175427,7 +175427,7 @@ public class Airavata {
@Override
public String toString() {
- StringBuilder sb = new StringBuilder("getAllGatewayComputeResources_result(");
+ StringBuilder sb = new StringBuilder("getAllGatewayResourceProfiles_result(");
boolean first = true;
sb.append("success:");
@@ -175494,15 +175494,15 @@ public class Airavata {
}
}
- private static class getAllGatewayComputeResources_resultStandardSchemeFactory implements SchemeFactory {
- public getAllGatewayComputeResources_resultStandardScheme getScheme() {
- return new getAllGatewayComputeResources_resultStandardScheme();
+ private static class getAllGatewayResourceProfiles_resultStandardSchemeFactory implements SchemeFactory {
+ public getAllGatewayResourceProfiles_resultStandardScheme getScheme() {
+ return new getAllGatewayResourceProfiles_resultStandardScheme();
}
}
- private static class getAllGatewayComputeResources_resultStandardScheme extends StandardScheme<getAllGatewayComputeResources_result> {
+ private static class getAllGatewayResourceProfiles_resultStandardScheme extends StandardScheme<getAllGatewayResourceProfiles_result> {
- public void read(org.apache.thrift.protocol.TProtocol iprot, getAllGatewayComputeResources_result struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol iprot, getAllGatewayResourceProfiles_result struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
iprot.readStructBegin();
while (true)
@@ -175578,7 +175578,7 @@ public class Airavata {
struct.validate();
}
- public void write(org.apache.thrift.protocol.TProtocol oprot, getAllGatewayComputeResources_result struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot, getAllGatewayResourceProfiles_result struct) throws org.apache.thrift.TException {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -175620,16 +175620,16 @@ public class Airavata {
}
- private static class getAllGatewayComputeResources_resultTupleSchemeFactory implements SchemeFactory {
- public getAllGatewayComputeResources_resultTupleScheme getScheme() {
- return new getAllGatewayComputeResources_resultTupleScheme();
+ private static class getAllGatewayResourceProfiles_resultTupleSchemeFactory implements SchemeFactory {
+ public getAllGatewayResourceProfiles_resultTupleScheme getScheme() {
+ return new getAllGatewayResourceProfiles_resultTupleScheme();
}
}
- private static class getAllGatewayComputeResources_resultTupleScheme extends TupleScheme<getAllGatewayComputeResources_result> {
+ private static class getAllGatewayResourceProfiles_resultTupleScheme extends TupleScheme<getAllGatewayResourceProfiles_result> {
@Override
- public void write(org.apache.thrift.protocol.TProtocol prot, getAllGatewayComputeResources_result struct) throws org.apache.thrift.TException {
+ public void write(org.apache.thrift.protocol.TProtocol prot, getAllGatewayResourceProfiles_result struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
BitSet optionals = new BitSet();
if (struct.isSetSuccess()) {
@@ -175672,7 +175672,7 @@ public class Airavata {
}
@Override
- public void read(org.apache.thrift.protocol.TProtocol prot, getAllGatewayComputeResources_result struct) throws org.apache.thrift.TException {
+ public void read(org.apache.thrift.protocol.TProtocol prot, getAllGatewayResourceProfiles_result struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
BitSet incoming = iprot.readBitSet(5);
if (incoming.get(0)) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/c5585979/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
index 693e7bb..04dbfcb 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
@@ -34855,11 +34855,11 @@ uint32_t Airavata_getAllGatewayDataStoragePreferences_presult::read(::apache::th
}
-Airavata_getAllGatewayComputeResources_args::~Airavata_getAllGatewayComputeResources_args() throw() {
+Airavata_getAllGatewayResourceProfiles_args::~Airavata_getAllGatewayResourceProfiles_args() throw() {
}
-uint32_t Airavata_getAllGatewayComputeResources_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getAllGatewayResourceProfiles_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -34902,10 +34902,10 @@ uint32_t Airavata_getAllGatewayComputeResources_args::read(::apache::thrift::pro
return xfer;
}
-uint32_t Airavata_getAllGatewayComputeResources_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getAllGatewayResourceProfiles_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_getAllGatewayComputeResources_args");
+ xfer += oprot->writeStructBegin("Airavata_getAllGatewayResourceProfiles_args");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->authzToken.write(oprot);
@@ -34918,14 +34918,14 @@ uint32_t Airavata_getAllGatewayComputeResources_args::write(::apache::thrift::pr
}
-Airavata_getAllGatewayComputeResources_pargs::~Airavata_getAllGatewayComputeResources_pargs() throw() {
+Airavata_getAllGatewayResourceProfiles_pargs::~Airavata_getAllGatewayResourceProfiles_pargs() throw() {
}
-uint32_t Airavata_getAllGatewayComputeResources_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getAllGatewayResourceProfiles_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_getAllGatewayComputeResources_pargs");
+ xfer += oprot->writeStructBegin("Airavata_getAllGatewayResourceProfiles_pargs");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += (*(this->authzToken)).write(oprot);
@@ -34938,11 +34938,11 @@ uint32_t Airavata_getAllGatewayComputeResources_pargs::write(::apache::thrift::p
}
-Airavata_getAllGatewayComputeResources_result::~Airavata_getAllGatewayComputeResources_result() throw() {
+Airavata_getAllGatewayResourceProfiles_result::~Airavata_getAllGatewayResourceProfiles_result() throw() {
}
-uint32_t Airavata_getAllGatewayComputeResources_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getAllGatewayResourceProfiles_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -35026,11 +35026,11 @@ uint32_t Airavata_getAllGatewayComputeResources_result::read(::apache::thrift::p
return xfer;
}
-uint32_t Airavata_getAllGatewayComputeResources_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getAllGatewayResourceProfiles_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_getAllGatewayComputeResources_result");
+ xfer += oprot->writeStructBegin("Airavata_getAllGatewayResourceProfiles_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
@@ -35067,11 +35067,11 @@ uint32_t Airavata_getAllGatewayComputeResources_result::write(::apache::thrift::
}
-Airavata_getAllGatewayComputeResources_presult::~Airavata_getAllGatewayComputeResources_presult() throw() {
+Airavata_getAllGatewayResourceProfiles_presult::~Airavata_getAllGatewayResourceProfiles_presult() throw() {
}
-uint32_t Airavata_getAllGatewayComputeResources_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getAllGatewayResourceProfiles_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -46429,18 +46429,18 @@ void AiravataClient::recv_getAllGatewayDataStoragePreferences(std::vector< ::apa
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAllGatewayDataStoragePreferences failed: unknown result");
}
-void AiravataClient::getAllGatewayComputeResources(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken)
+void AiravataClient::getAllGatewayResourceProfiles(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken)
{
- send_getAllGatewayComputeResources(authzToken);
- recv_getAllGatewayComputeResources(_return);
+ send_getAllGatewayResourceProfiles(authzToken);
+ recv_getAllGatewayResourceProfiles(_return);
}
-void AiravataClient::send_getAllGatewayComputeResources(const ::apache::airavata::model::security::AuthzToken& authzToken)
+void AiravataClient::send_getAllGatewayResourceProfiles(const ::apache::airavata::model::security::AuthzToken& authzToken)
{
int32_t cseqid = 0;
- oprot_->writeMessageBegin("getAllGatewayComputeResources", ::apache::thrift::protocol::T_CALL, cseqid);
+ oprot_->writeMessageBegin("getAllGatewayResourceProfiles", ::apache::thrift::protocol::T_CALL, cseqid);
- Airavata_getAllGatewayComputeResources_pargs args;
+ Airavata_getAllGatewayResourceProfiles_pargs args;
args.authzToken = &authzToken;
args.write(oprot_);
@@ -46449,7 +46449,7 @@ void AiravataClient::send_getAllGatewayComputeResources(const ::apache::airavat
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_getAllGatewayComputeResources(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> & _return)
+void AiravataClient::recv_getAllGatewayResourceProfiles(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> & _return)
{
int32_t rseqid = 0;
@@ -46469,12 +46469,12 @@ void AiravataClient::recv_getAllGatewayComputeResources(std::vector< ::apache::a
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- if (fname.compare("getAllGatewayComputeResources") != 0) {
+ if (fname.compare("getAllGatewayResourceProfiles") != 0) {
iprot_->skip(::apache::thrift::protocol::T_STRUCT);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- Airavata_getAllGatewayComputeResources_presult result;
+ Airavata_getAllGatewayResourceProfiles_presult result;
result.success = &_return;
result.read(iprot_);
iprot_->readMessageEnd();
@@ -46496,7 +46496,7 @@ void AiravataClient::recv_getAllGatewayComputeResources(std::vector< ::apache::a
if (result.__isset.ae) {
throw result.ae;
}
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAllGatewayComputeResources failed: unknown result");
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAllGatewayResourceProfiles failed: unknown result");
}
bool AiravataClient::updateGatewayComputeResourcePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId, const ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& computeResourcePreference)
@@ -54634,30 +54634,30 @@ void AiravataProcessor::process_getAllGatewayDataStoragePreferences(int32_t seqi
}
}
-void AiravataProcessor::process_getAllGatewayComputeResources(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+void AiravataProcessor::process_getAllGatewayResourceProfiles(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
{
void* ctx = NULL;
if (this->eventHandler_.get() != NULL) {
- ctx = this->eventHandler_->getContext("Airavata.getAllGatewayComputeResources", callContext);
+ ctx = this->eventHandler_->getContext("Airavata.getAllGatewayResourceProfiles", callContext);
}
- ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "Airavata.getAllGatewayComputeResources");
+ ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "Airavata.getAllGatewayResourceProfiles");
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->preRead(ctx, "Airavata.getAllGatewayComputeResources");
+ this->eventHandler_->preRead(ctx, "Airavata.getAllGatewayResourceProfiles");
}
- Airavata_getAllGatewayComputeResources_args args;
+ Airavata_getAllGatewayResourceProfiles_args args;
args.read(iprot);
iprot->readMessageEnd();
uint32_t bytes = iprot->getTransport()->readEnd();
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->postRead(ctx, "Airavata.getAllGatewayComputeResources", bytes);
+ this->eventHandler_->postRead(ctx, "Airavata.getAllGatewayResourceProfiles", bytes);
}
- Airavata_getAllGatewayComputeResources_result result;
+ Airavata_getAllGatewayResourceProfiles_result result;
try {
- iface_->getAllGatewayComputeResources(result.success, args.authzToken);
+ iface_->getAllGatewayResourceProfiles(result.success, args.authzToken);
result.__isset.success = true;
} catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
result.ire = ire;
@@ -54673,11 +54673,11 @@ void AiravataProcessor::process_getAllGatewayComputeResources(int32_t seqid, ::a
result.__isset.ae = true;
} catch (const std::exception& e) {
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->handlerError(ctx, "Airavata.getAllGatewayComputeResources");
+ this->eventHandler_->handlerError(ctx, "Airavata.getAllGatewayResourceProfiles");
}
::apache::thrift::TApplicationException x(e.what());
- oprot->writeMessageBegin("getAllGatewayComputeResources", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+ oprot->writeMessageBegin("getAllGatewayResourceProfiles", ::apache::thrift::protocol::T_EXCEPTION, seqid);
x.write(oprot);
oprot->writeMessageEnd();
oprot->getTransport()->writeEnd();
@@ -54686,17 +54686,17 @@ void AiravataProcessor::process_getAllGatewayComputeResources(int32_t seqid, ::a
}
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->preWrite(ctx, "Airavata.getAllGatewayComputeResources");
+ this->eventHandler_->preWrite(ctx, "Airavata.getAllGatewayResourceProfiles");
}
- oprot->writeMessageBegin("getAllGatewayComputeResources", ::apache::thrift::protocol::T_REPLY, seqid);
+ oprot->writeMessageBegin("getAllGatewayResourceProfiles", ::apache::thrift::protocol::T_REPLY, seqid);
result.write(oprot);
oprot->writeMessageEnd();
bytes = oprot->getTransport()->writeEnd();
oprot->getTransport()->flush();
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->postWrite(ctx, "Airavata.getAllGatewayComputeResources", bytes);
+ this->eventHandler_->postWrite(ctx, "Airavata.getAllGatewayResourceProfiles", bytes);
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/c5585979/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
index 652e83b..0425236 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
@@ -1656,7 +1656,7 @@ class AiravataIf {
*
* @param authzToken
*/
- virtual void getAllGatewayComputeResources(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken) = 0;
+ virtual void getAllGatewayResourceProfiles(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken) = 0;
/**
* Update a Compute Resource Preference to a registered gateway profile.
@@ -2103,7 +2103,7 @@ class AiravataNull : virtual public AiravataIf {
void getAllGatewayDataStoragePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayID */) {
return;
}
- void getAllGatewayComputeResources(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */) {
+ void getAllGatewayResourceProfiles(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */) {
return;
}
bool updateGatewayComputeResourcePreference(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayID */, const std::string& /* computeResourceId */, const ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& /* computeResourcePreference */) {
@@ -19619,84 +19619,84 @@ class Airavata_getAllGatewayDataStoragePreferences_presult {
};
-class Airavata_getAllGatewayComputeResources_args {
+class Airavata_getAllGatewayResourceProfiles_args {
public:
static const char* ascii_fingerprint; // = "75A7E945AEBB96C8FA8998CBCEB31C27";
static const uint8_t binary_fingerprint[16]; // = {0x75,0xA7,0xE9,0x45,0xAE,0xBB,0x96,0xC8,0xFA,0x89,0x98,0xCB,0xCE,0xB3,0x1C,0x27};
- Airavata_getAllGatewayComputeResources_args(const Airavata_getAllGatewayComputeResources_args&);
- Airavata_getAllGatewayComputeResources_args& operator=(const Airavata_getAllGatewayComputeResources_args&);
- Airavata_getAllGatewayComputeResources_args() {
+ Airavata_getAllGatewayResourceProfiles_args(const Airavata_getAllGatewayResourceProfiles_args&);
+ Airavata_getAllGatewayResourceProfiles_args& operator=(const Airavata_getAllGatewayResourceProfiles_args&);
+ Airavata_getAllGatewayResourceProfiles_args() {
}
- virtual ~Airavata_getAllGatewayComputeResources_args() throw();
+ virtual ~Airavata_getAllGatewayResourceProfiles_args() throw();
::apache::airavata::model::security::AuthzToken authzToken;
void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
- bool operator == (const Airavata_getAllGatewayComputeResources_args & rhs) const
+ bool operator == (const Airavata_getAllGatewayResourceProfiles_args & rhs) const
{
if (!(authzToken == rhs.authzToken))
return false;
return true;
}
- bool operator != (const Airavata_getAllGatewayComputeResources_args &rhs) const {
+ bool operator != (const Airavata_getAllGatewayResourceProfiles_args &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_getAllGatewayComputeResources_args & ) const;
+ bool operator < (const Airavata_getAllGatewayResourceProfiles_args & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllGatewayComputeResources_args& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllGatewayResourceProfiles_args& obj);
};
-class Airavata_getAllGatewayComputeResources_pargs {
+class Airavata_getAllGatewayResourceProfiles_pargs {
public:
static const char* ascii_fingerprint; // = "75A7E945AEBB96C8FA8998CBCEB31C27";
static const uint8_t binary_fingerprint[16]; // = {0x75,0xA7,0xE9,0x45,0xAE,0xBB,0x96,0xC8,0xFA,0x89,0x98,0xCB,0xCE,0xB3,0x1C,0x27};
- virtual ~Airavata_getAllGatewayComputeResources_pargs() throw();
+ virtual ~Airavata_getAllGatewayResourceProfiles_pargs() throw();
const ::apache::airavata::model::security::AuthzToken* authzToken;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllGatewayComputeResources_pargs& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllGatewayResourceProfiles_pargs& obj);
};
-typedef struct _Airavata_getAllGatewayComputeResources_result__isset {
- _Airavata_getAllGatewayComputeResources_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_getAllGatewayResourceProfiles_result__isset {
+ _Airavata_getAllGatewayResourceProfiles_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
bool success :1;
bool ire :1;
bool ace :1;
bool ase :1;
bool ae :1;
-} _Airavata_getAllGatewayComputeResources_result__isset;
+} _Airavata_getAllGatewayResourceProfiles_result__isset;
-class Airavata_getAllGatewayComputeResources_result {
+class Airavata_getAllGatewayResourceProfiles_result {
public:
static const char* ascii_fingerprint; // = "E4C23A3951BDEE94F5F54BB19B021761";
static const uint8_t binary_fingerprint[16]; // = {0xE4,0xC2,0x3A,0x39,0x51,0xBD,0xEE,0x94,0xF5,0xF5,0x4B,0xB1,0x9B,0x02,0x17,0x61};
- Airavata_getAllGatewayComputeResources_result(const Airavata_getAllGatewayComputeResources_result&);
- Airavata_getAllGatewayComputeResources_result& operator=(const Airavata_getAllGatewayComputeResources_result&);
- Airavata_getAllGatewayComputeResources_result() {
+ Airavata_getAllGatewayResourceProfiles_result(const Airavata_getAllGatewayResourceProfiles_result&);
+ Airavata_getAllGatewayResourceProfiles_result& operator=(const Airavata_getAllGatewayResourceProfiles_result&);
+ Airavata_getAllGatewayResourceProfiles_result() {
}
- virtual ~Airavata_getAllGatewayComputeResources_result() throw();
+ virtual ~Airavata_getAllGatewayResourceProfiles_result() throw();
std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
::apache::airavata::api::error::AuthorizationException ae;
- _Airavata_getAllGatewayComputeResources_result__isset __isset;
+ _Airavata_getAllGatewayResourceProfiles_result__isset __isset;
void __set_success(const std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> & val);
@@ -19708,7 +19708,7 @@ class Airavata_getAllGatewayComputeResources_result {
void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
- bool operator == (const Airavata_getAllGatewayComputeResources_result & rhs) const
+ bool operator == (const Airavata_getAllGatewayResourceProfiles_result & rhs) const
{
if (!(success == rhs.success))
return false;
@@ -19722,46 +19722,46 @@ class Airavata_getAllGatewayComputeResources_result {
return false;
return true;
}
- bool operator != (const Airavata_getAllGatewayComputeResources_result &rhs) const {
+ bool operator != (const Airavata_getAllGatewayResourceProfiles_result &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_getAllGatewayComputeResources_result & ) const;
+ bool operator < (const Airavata_getAllGatewayResourceProfiles_result & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllGatewayComputeResources_result& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllGatewayResourceProfiles_result& obj);
};
-typedef struct _Airavata_getAllGatewayComputeResources_presult__isset {
- _Airavata_getAllGatewayComputeResources_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_getAllGatewayResourceProfiles_presult__isset {
+ _Airavata_getAllGatewayResourceProfiles_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
bool success :1;
bool ire :1;
bool ace :1;
bool ase :1;
bool ae :1;
-} _Airavata_getAllGatewayComputeResources_presult__isset;
+} _Airavata_getAllGatewayResourceProfiles_presult__isset;
-class Airavata_getAllGatewayComputeResources_presult {
+class Airavata_getAllGatewayResourceProfiles_presult {
public:
static const char* ascii_fingerprint; // = "E4C23A3951BDEE94F5F54BB19B021761";
static const uint8_t binary_fingerprint[16]; // = {0xE4,0xC2,0x3A,0x39,0x51,0xBD,0xEE,0x94,0xF5,0xF5,0x4B,0xB1,0x9B,0x02,0x17,0x61};
- virtual ~Airavata_getAllGatewayComputeResources_presult() throw();
+ virtual ~Airavata_getAllGatewayResourceProfiles_presult() throw();
std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> * success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
::apache::airavata::api::error::AuthorizationException ae;
- _Airavata_getAllGatewayComputeResources_presult__isset __isset;
+ _Airavata_getAllGatewayResourceProfiles_presult__isset __isset;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllGatewayComputeResources_presult& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllGatewayResourceProfiles_presult& obj);
};
@@ -21826,9 +21826,9 @@ class AiravataClient : virtual public AiravataIf {
void getAllGatewayDataStoragePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID);
void send_getAllGatewayDataStoragePreferences(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID);
void recv_getAllGatewayDataStoragePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference> & _return);
- void getAllGatewayComputeResources(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken);
- void send_getAllGatewayComputeResources(const ::apache::airavata::model::security::AuthzToken& authzToken);
- void recv_getAllGatewayComputeResources(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> & _return);
+ void getAllGatewayResourceProfiles(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken);
+ void send_getAllGatewayResourceProfiles(const ::apache::airavata::model::security::AuthzToken& authzToken);
+ void recv_getAllGatewayResourceProfiles(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> & _return);
bool updateGatewayComputeResourcePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId, const ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& computeResourcePreference);
void send_updateGatewayComputeResourcePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId, const ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& computeResourcePreference);
bool recv_updateGatewayComputeResourcePreference();
@@ -21988,7 +21988,7 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
void process_getGatewayDataStoragePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getAllGatewayComputeResourcePreferences(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getAllGatewayDataStoragePreferences(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
- void process_getAllGatewayComputeResources(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+ void process_getAllGatewayResourceProfiles(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_updateGatewayComputeResourcePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_updateGatewayDataStoragePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_deleteGatewayComputeResourcePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
@@ -22114,7 +22114,7 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
processMap_["getGatewayDataStoragePreference"] = &AiravataProcessor::process_getGatewayDataStoragePreference;
processMap_["getAllGatewayComputeResourcePreferences"] = &AiravataProcessor::process_getAllGatewayComputeResourcePreferences;
processMap_["getAllGatewayDataStoragePreferences"] = &AiravataProcessor::process_getAllGatewayDataStoragePreferences;
- processMap_["getAllGatewayComputeResources"] = &AiravataProcessor::process_getAllGatewayComputeResources;
+ processMap_["getAllGatewayResourceProfiles"] = &AiravataProcessor::process_getAllGatewayResourceProfiles;
processMap_["updateGatewayComputeResourcePreference"] = &AiravataProcessor::process_updateGatewayComputeResourcePreference;
processMap_["updateGatewayDataStoragePreference"] = &AiravataProcessor::process_updateGatewayDataStoragePreference;
processMap_["deleteGatewayComputeResourcePreference"] = &AiravataProcessor::process_deleteGatewayComputeResourcePreference;
@@ -23224,13 +23224,13 @@ class AiravataMultiface : virtual public AiravataIf {
return;
}
- void getAllGatewayComputeResources(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken) {
+ void getAllGatewayResourceProfiles(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
- ifaces_[i]->getAllGatewayComputeResources(_return, authzToken);
+ ifaces_[i]->getAllGatewayResourceProfiles(_return, authzToken);
}
- ifaces_[i]->getAllGatewayComputeResources(_return, authzToken);
+ ifaces_[i]->getAllGatewayResourceProfiles(_return, authzToken);
return;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/c5585979/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
index 3d0b299..42c1968 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
@@ -2024,9 +2024,9 @@ class AiravataHandler : virtual public AiravataIf {
*
* @param authzToken
*/
- void getAllGatewayComputeResources(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken) {
+ void getAllGatewayResourceProfiles(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken) {
// Your implementation goes here
- printf("getAllGatewayComputeResources\n");
+ printf("getAllGatewayResourceProfiles\n");
}
/**
http://git-wip-us.apache.org/repos/asf/airavata/blob/c5585979/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 77ad7cd..d0cde56 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
@@ -2458,7 +2458,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function getAllGatewayComputeResources(\Airavata\Model\Security\AuthzToken $authzToken);
+ public function getAllGatewayResourceProfiles(\Airavata\Model\Security\AuthzToken $authzToken);
/**
* Update a Compute Resource Preference to a registered gateway profile.
*
@@ -9814,34 +9814,34 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getAllGatewayDataStoragePreferences failed: unknown result");
}
- public function getAllGatewayComputeResources(\Airavata\Model\Security\AuthzToken $authzToken)
+ public function getAllGatewayResourceProfiles(\Airavata\Model\Security\AuthzToken $authzToken)
{
- $this->send_getAllGatewayComputeResources($authzToken);
- return $this->recv_getAllGatewayComputeResources();
+ $this->send_getAllGatewayResourceProfiles($authzToken);
+ return $this->recv_getAllGatewayResourceProfiles();
}
- public function send_getAllGatewayComputeResources(\Airavata\Model\Security\AuthzToken $authzToken)
+ public function send_getAllGatewayResourceProfiles(\Airavata\Model\Security\AuthzToken $authzToken)
{
- $args = new \Airavata\API\Airavata_getAllGatewayComputeResources_args();
+ $args = new \Airavata\API\Airavata_getAllGatewayResourceProfiles_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_, 'getAllGatewayComputeResources', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'getAllGatewayResourceProfiles', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('getAllGatewayComputeResources', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('getAllGatewayResourceProfiles', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_getAllGatewayComputeResources()
+ public function recv_getAllGatewayResourceProfiles()
{
$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_getAllGatewayComputeResources_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getAllGatewayResourceProfiles_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -9855,7 +9855,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_getAllGatewayComputeResources_result();
+ $result = new \Airavata\API\Airavata_getAllGatewayResourceProfiles_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -9874,7 +9874,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("getAllGatewayComputeResources failed: unknown result");
+ throw new \Exception("getAllGatewayResourceProfiles failed: unknown result");
}
public function updateGatewayComputeResourcePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $computeResourceId, \Airavata\Model\AppCatalog\GatewayProfile\ComputeResourcePreference $computeResourcePreference)
@@ -44904,7 +44904,7 @@ class Airavata_getAllGatewayDataStoragePreferences_result {
}
-class Airavata_getAllGatewayComputeResources_args {
+class Airavata_getAllGatewayResourceProfiles_args {
static $_TSPEC;
/**
@@ -44930,7 +44930,7 @@ class Airavata_getAllGatewayComputeResources_args {
}
public function getName() {
- return 'Airavata_getAllGatewayComputeResources_args';
+ return 'Airavata_getAllGatewayResourceProfiles_args';
}
public function read($input)
@@ -44968,7 +44968,7 @@ class Airavata_getAllGatewayComputeResources_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAllGatewayComputeResources_args');
+ $xfer += $output->writeStructBegin('Airavata_getAllGatewayResourceProfiles_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -44984,7 +44984,7 @@ class Airavata_getAllGatewayComputeResources_args {
}
-class Airavata_getAllGatewayComputeResources_result {
+class Airavata_getAllGatewayResourceProfiles_result {
static $_TSPEC;
/**
@@ -45062,7 +45062,7 @@ class Airavata_getAllGatewayComputeResources_result {
}
public function getName() {
- return 'Airavata_getAllGatewayComputeResources_result';
+ return 'Airavata_getAllGatewayResourceProfiles_result';
}
public function read($input)
@@ -45142,7 +45142,7 @@ class Airavata_getAllGatewayComputeResources_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAllGatewayComputeResources_result');
+ $xfer += $output->writeStructBegin('Airavata_getAllGatewayResourceProfiles_result');
if ($this->success !== null) {
if (!is_array($this->success)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
http://git-wip-us.apache.org/repos/asf/airavata/blob/c5585979/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
index 2b1b742..78ac230 100755
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
@@ -135,7 +135,7 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
print(' DataStoragePreference getGatewayDataStoragePreference(AuthzToken authzToken, string gatewayID, string dataMoveId)')
print(' getAllGatewayComputeResourcePreferences(AuthzToken authzToken, string gatewayID)')
print(' getAllGatewayDataStoragePreferences(AuthzToken authzToken, string gatewayID)')
- print(' getAllGatewayComputeResources(AuthzToken authzToken)')
+ print(' getAllGatewayResourceProfiles(AuthzToken authzToken)')
print(' bool updateGatewayComputeResourcePreference(AuthzToken authzToken, string gatewayID, string computeResourceId, ComputeResourcePreference computeResourcePreference)')
print(' bool updateGatewayDataStoragePreference(AuthzToken authzToken, string gatewayID, string dataMoveId, DataStoragePreference dataStoragePreference)')
print(' bool deleteGatewayComputeResourcePreference(AuthzToken authzToken, string gatewayID, string computeResourceId)')
@@ -869,11 +869,11 @@ elif cmd == 'getAllGatewayDataStoragePreferences':
sys.exit(1)
pp.pprint(client.getAllGatewayDataStoragePreferences(eval(args[0]),args[1],))
-elif cmd == 'getAllGatewayComputeResources':
+elif cmd == 'getAllGatewayResourceProfiles':
if len(args) != 1:
- print('getAllGatewayComputeResources requires 1 args')
+ print('getAllGatewayResourceProfiles requires 1 args')
sys.exit(1)
- pp.pprint(client.getAllGatewayComputeResources(eval(args[0]),))
+ pp.pprint(client.getAllGatewayResourceProfiles(eval(args[0]),))
elif cmd == 'updateGatewayComputeResourcePreference':
if len(args) != 4:
http://git-wip-us.apache.org/repos/asf/airavata/blob/c5585979/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
index 45e39d5..decf323 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
@@ -2014,7 +2014,7 @@ class Iface:
"""
pass
- def getAllGatewayComputeResources(self, authzToken):
+ def getAllGatewayResourceProfiles(self, authzToken):
"""
Fetch all gateway profiles registered
@@ -7910,7 +7910,7 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllGatewayDataStoragePreferences failed: unknown result");
- def getAllGatewayComputeResources(self, authzToken):
+ def getAllGatewayResourceProfiles(self, authzToken):
"""
Fetch all gateway profiles registered
@@ -7918,18 +7918,18 @@ class Client(Iface):
Parameters:
- authzToken
"""
- self.send_getAllGatewayComputeResources(authzToken)
- return self.recv_getAllGatewayComputeResources()
+ self.send_getAllGatewayResourceProfiles(authzToken)
+ return self.recv_getAllGatewayResourceProfiles()
- def send_getAllGatewayComputeResources(self, authzToken):
- self._oprot.writeMessageBegin('getAllGatewayComputeResources', TMessageType.CALL, self._seqid)
- args = getAllGatewayComputeResources_args()
+ def send_getAllGatewayResourceProfiles(self, authzToken):
+ self._oprot.writeMessageBegin('getAllGatewayResourceProfiles', TMessageType.CALL, self._seqid)
+ args = getAllGatewayResourceProfiles_args()
args.authzToken = authzToken
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_getAllGatewayComputeResources(self):
+ def recv_getAllGatewayResourceProfiles(self):
iprot = self._iprot
(fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
@@ -7937,7 +7937,7 @@ class Client(Iface):
x.read(iprot)
iprot.readMessageEnd()
raise x
- result = getAllGatewayComputeResources_result()
+ result = getAllGatewayResourceProfiles_result()
result.read(iprot)
iprot.readMessageEnd()
if result.success is not None:
@@ -7950,7 +7950,7 @@ class Client(Iface):
raise result.ase
if result.ae is not None:
raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllGatewayComputeResources failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllGatewayResourceProfiles failed: unknown result");
def updateGatewayComputeResourcePreference(self, authzToken, gatewayID, computeResourceId, computeResourcePreference):
"""
@@ -8558,7 +8558,7 @@ class Processor(Iface, TProcessor):
self._processMap["getGatewayDataStoragePreference"] = Processor.process_getGatewayDataStoragePreference
self._processMap["getAllGatewayComputeResourcePreferences"] = Processor.process_getAllGatewayComputeResourcePreferences
self._processMap["getAllGatewayDataStoragePreferences"] = Processor.process_getAllGatewayDataStoragePreferences
- self._processMap["getAllGatewayComputeResources"] = Processor.process_getAllGatewayComputeResources
+ self._processMap["getAllGatewayResourceProfiles"] = Processor.process_getAllGatewayResourceProfiles
self._processMap["updateGatewayComputeResourcePreference"] = Processor.process_updateGatewayComputeResourcePreference
self._processMap["updateGatewayDataStoragePreference"] = Processor.process_updateGatewayDataStoragePreference
self._processMap["deleteGatewayComputeResourcePreference"] = Processor.process_deleteGatewayComputeResourcePreference
@@ -10818,13 +10818,13 @@ class Processor(Iface, TProcessor):
oprot.writeMessageEnd()
oprot.trans.flush()
- def process_getAllGatewayComputeResources(self, seqid, iprot, oprot):
- args = getAllGatewayComputeResources_args()
+ def process_getAllGatewayResourceProfiles(self, seqid, iprot, oprot):
+ args = getAllGatewayResourceProfiles_args()
args.read(iprot)
iprot.readMessageEnd()
- result = getAllGatewayComputeResources_result()
+ result = getAllGatewayResourceProfiles_result()
try:
- result.success = self._handler.getAllGatewayComputeResources(args.authzToken)
+ result.success = self._handler.getAllGatewayResourceProfiles(args.authzToken)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -10833,7 +10833,7 @@ class Processor(Iface, TProcessor):
result.ase = ase
except apache.airavata.api.error.ttypes.AuthorizationException, ae:
result.ae = ae
- oprot.writeMessageBegin("getAllGatewayComputeResources", TMessageType.REPLY, seqid)
+ oprot.writeMessageBegin("getAllGatewayResourceProfiles", TMessageType.REPLY, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -35401,7 +35401,7 @@ class getAllGatewayDataStoragePreferences_result:
def __ne__(self, other):
return not (self == other)
-class getAllGatewayComputeResources_args:
+class getAllGatewayResourceProfiles_args:
"""
Attributes:
- authzToken
@@ -35439,7 +35439,7 @@ class getAllGatewayComputeResources_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getAllGatewayComputeResources_args')
+ oprot.writeStructBegin('getAllGatewayResourceProfiles_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -35469,7 +35469,7 @@ class getAllGatewayComputeResources_args:
def __ne__(self, other):
return not (self == other)
-class getAllGatewayComputeResources_result:
+class getAllGatewayResourceProfiles_result:
"""
Attributes:
- success
@@ -35547,7 +35547,7 @@ class getAllGatewayComputeResources_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getAllGatewayComputeResources_result')
+ oprot.writeStructBegin('getAllGatewayResourceProfiles_result')
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
http://git-wip-us.apache.org/repos/asf/airavata/blob/c5585979/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java
index f0085ed..a72ebff 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java
@@ -46,6 +46,7 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
if (!gatewayProfile.getGatewayID().equals("")){
profileResource.setGatewayID(gatewayProfile.getGatewayID());
}
+ profileResource.setCredentialStoreToken(gatewayProfile.getCredentialStoreToken());
// profileResource.setGatewayID(gatewayProfile.getGatewayID());
profileResource.save();
List<ComputeResourcePreference> computeResourcePreferences = gatewayProfile.getComputeResourcePreferences();
@@ -99,6 +100,7 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
try {
GatewayProfileResource profileResource = new GatewayProfileResource();
GatewayProfileResource existingGP = (GatewayProfileResource)profileResource.get(gatewayId);
+ existingGP.setCredentialStoreToken(updatedProfile.getCredentialStoreToken());
existingGP.save();
List<ComputeResourcePreference> computeResourcePreferences = updatedProfile.getComputeResourcePreferences();
@@ -122,6 +124,7 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
resource.setBatchQueue(preference.getPreferredBatchQueue());
resource.setProjectNumber(preference.getAllocationProjectNumber());
resource.setScratchLocation(preference.getScratchLocation());
+ resource.setResourceCSToken(preference.getResourceSpecificCredentialStoreToken());
resource.save();
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/c5585979/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GatewayProfile.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GatewayProfile.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GatewayProfile.java
index d369e5d..70d508e 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GatewayProfile.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GatewayProfile.java
@@ -40,6 +40,9 @@ public class GatewayProfile implements Serializable {
@Column(name = "UPDATE_TIME")
private Timestamp updateTime;
+ @Column(name = "CS_TOKEN")
+ private String credentialStoreToken;
+
public Timestamp getCreationTime() {
return creationTime;
}
@@ -65,4 +68,11 @@ public class GatewayProfile implements Serializable {
this.gatewayID = gatewayID;
}
+ public String getCredentialStoreToken() {
+ return credentialStoreToken;
+ }
+
+ public void setCredentialStoreToken(String credentialStoreToken) {
+ this.credentialStoreToken = credentialStoreToken;
+ }
}