You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2018/09/24 19:24:12 UTC
[airavata-django-portal] branch master updated (f8d5c01 -> 77ab5c2)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.
from f8d5c01 AIRAVATA-2876 Display validation errors when saving app module
new 6626662 AIRAVATA-2840 Regenerated Thrift stubs
new 51260a0 AIRAVATA-2840 Upgrading DRF
new 77ab5c2 AIRAVATA-2840 WIP: display list of SSH credentials
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
airavata/api/Airavata-remote | 69 +-
airavata/api/Airavata.py | 3107 +++++++-------------
airavata/model/credential/store/ttypes.py | 29 +-
airavata/model/group/ttypes.py | 9 +-
airavata/model/sharing/ttypes.py | 24 +-
airavata/model/workflow/ttypes.py | 1378 +++++++--
.../dashboards/CredentialStoreDashboard.vue | 187 +-
.../static/django_airavata_admin/src/router.js | 2 +-
django_airavata/apps/admin/urls.py | 5 +-
django_airavata/apps/admin/views.py | 2 +-
django_airavata/apps/api/serializers.py | 7 +
.../js/models/CredentialSummary.js | 38 +-
.../django_airavata_api/js/service_config.js | 263 +-
django_airavata/apps/api/urls.py | 63 +-
django_airavata/apps/api/views.py | 215 +-
requirements.txt | 2 +-
16 files changed, 2541 insertions(+), 2859 deletions(-)
[airavata-django-portal] 02/03: AIRAVATA-2840 Upgrading DRF
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 51260a0383d7c3eff61009f100a07683fd7c45b2
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Mon Sep 24 15:20:03 2018 -0400
AIRAVATA-2840 Upgrading DRF
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 79aeacf..bb61566 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ Django==1.11.3
requests==2.13.0
requests-oauthlib==0.7.0
thrift==0.10.0
-djangorestframework==3.6.2
+djangorestframework==3.8.2
wagtail==2.0
wagtailfontawesome>=1.1.3,<1.2
[airavata-django-portal] 01/03: AIRAVATA-2840 Regenerated Thrift
stubs
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 662666241c285c75a177e5096cf1ea30b774a73a
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Mon Sep 24 13:00:52 2018 -0400
AIRAVATA-2840 Regenerated Thrift stubs
---
airavata/api/Airavata-remote | 69 +-
airavata/api/Airavata.py | 3107 ++++++++++-------------------
airavata/model/credential/store/ttypes.py | 29 +-
airavata/model/group/ttypes.py | 9 +-
airavata/model/sharing/ttypes.py | 24 +-
airavata/model/workflow/ttypes.py | 1378 ++++++++++---
6 files changed, 2197 insertions(+), 2419 deletions(-)
diff --git a/airavata/api/Airavata-remote b/airavata/api/Airavata-remote
index d0013e0..83fe696 100755
--- a/airavata/api/Airavata-remote
+++ b/airavata/api/Airavata-remote
@@ -38,13 +38,10 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
print(' bool deleteNotification(AuthzToken authzToken, string gatewayId, string notificationId)')
print(' Notification getNotification(AuthzToken authzToken, string gatewayId, string notificationId)')
print(' getAllNotifications(AuthzToken authzToken, string gatewayId)')
- print(' string generateAndRegisterSSHKeys(AuthzToken authzToken, string gatewayId, string userName, string description, CredentialOwnerType credentialOwnerType)')
- print(' string registerPwdCredential(AuthzToken authzToken, string gatewayId, string portalUserName, string loginUserName, string password, string description)')
- print(' string getSSHPubKey(AuthzToken authzToken, string airavataCredStoreToken, string gatewayId)')
- print(' getAllGatewaySSHPubKeys(AuthzToken authzToken, string gatewayId)')
- print(' getAllCredentialSummaryForGateway(AuthzToken authzToken, SummaryType type, string gatewayId)')
- print(' getAllCredentialSummaryForUsersInGateway(AuthzToken authzToken, SummaryType type, string gatewayId, string userId)')
- print(' getAllGatewayPWDCredentials(AuthzToken authzToken, string gatewayId)')
+ print(' string generateAndRegisterSSHKeys(AuthzToken authzToken, string description)')
+ print(' string registerPwdCredential(AuthzToken authzToken, string loginUserName, string password, string description)')
+ print(' CredentialSummary getCredentialSummary(AuthzToken authzToken, SummaryType type, string tokenId)')
+ print(' getAllCredentialSummaries(AuthzToken authzToken, SummaryType type)')
print(' bool deleteSSHPubKey(AuthzToken authzToken, string airavataCredStoreToken, string gatewayId)')
print(' bool deletePWDCredential(AuthzToken authzToken, string airavataCredStoreToken, string gatewayId)')
print(' string createProject(AuthzToken authzToken, string gatewayId, Project project)')
@@ -181,11 +178,11 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
print(' bool deleteUserStoragePreference(AuthzToken authzToken, string userId, string gatewayID, string userStorageId)')
print(' getAllWorkflows(AuthzToken authzToken, string gatewayId)')
print(' getLatestQueueStatuses(AuthzToken authzToken)')
- print(' WorkflowModel getWorkflow(AuthzToken authzToken, string workflowTemplateId)')
- print(' void deleteWorkflow(AuthzToken authzToken, string workflowTemplateId)')
- print(' string registerWorkflow(AuthzToken authzToken, string gatewayId, WorkflowModel workflow)')
- print(' void updateWorkflow(AuthzToken authzToken, string workflowTemplateId, WorkflowModel workflow)')
- print(' string getWorkflowTemplateId(AuthzToken authzToken, string workflowName)')
+ print(' AiravataWorkflow getWorkflow(AuthzToken authzToken, string workflowId)')
+ print(' void deleteWorkflow(AuthzToken authzToken, string workflowId)')
+ print(' string registerWorkflow(AuthzToken authzToken, string gatewayId, AiravataWorkflow workflow)')
+ print(' void updateWorkflow(AuthzToken authzToken, string workflowId, AiravataWorkflow workflow)')
+ print(' string getWorkflowId(AuthzToken authzToken, string workflowName)')
print(' bool isWorkflowExistWithName(AuthzToken authzToken, string workflowName)')
print(' string registerDataProduct(AuthzToken authzToken, DataProductModel dataProductModel)')
print(' DataProductModel getDataProduct(AuthzToken authzToken, string dataProductUri)')
@@ -378,46 +375,28 @@ elif cmd == 'getAllNotifications':
pp.pprint(client.getAllNotifications(eval(args[0]), args[1],))
elif cmd == 'generateAndRegisterSSHKeys':
- if len(args) != 5:
- print('generateAndRegisterSSHKeys requires 5 args')
+ if len(args) != 2:
+ print('generateAndRegisterSSHKeys requires 2 args')
sys.exit(1)
- pp.pprint(client.generateAndRegisterSSHKeys(eval(args[0]), args[1], args[2], args[3], eval(args[4]),))
+ pp.pprint(client.generateAndRegisterSSHKeys(eval(args[0]), args[1],))
elif cmd == 'registerPwdCredential':
- if len(args) != 6:
- print('registerPwdCredential requires 6 args')
- sys.exit(1)
- pp.pprint(client.registerPwdCredential(eval(args[0]), args[1], args[2], args[3], args[4], args[5],))
-
-elif cmd == 'getSSHPubKey':
- if len(args) != 3:
- print('getSSHPubKey requires 3 args')
- sys.exit(1)
- pp.pprint(client.getSSHPubKey(eval(args[0]), args[1], args[2],))
-
-elif cmd == 'getAllGatewaySSHPubKeys':
- if len(args) != 2:
- print('getAllGatewaySSHPubKeys requires 2 args')
+ if len(args) != 4:
+ print('registerPwdCredential requires 4 args')
sys.exit(1)
- pp.pprint(client.getAllGatewaySSHPubKeys(eval(args[0]), args[1],))
+ pp.pprint(client.registerPwdCredential(eval(args[0]), args[1], args[2], args[3],))
-elif cmd == 'getAllCredentialSummaryForGateway':
+elif cmd == 'getCredentialSummary':
if len(args) != 3:
- print('getAllCredentialSummaryForGateway requires 3 args')
- sys.exit(1)
- pp.pprint(client.getAllCredentialSummaryForGateway(eval(args[0]), eval(args[1]), args[2],))
-
-elif cmd == 'getAllCredentialSummaryForUsersInGateway':
- if len(args) != 4:
- print('getAllCredentialSummaryForUsersInGateway requires 4 args')
+ print('getCredentialSummary requires 3 args')
sys.exit(1)
- pp.pprint(client.getAllCredentialSummaryForUsersInGateway(eval(args[0]), eval(args[1]), args[2], args[3],))
+ pp.pprint(client.getCredentialSummary(eval(args[0]), eval(args[1]), args[2],))
-elif cmd == 'getAllGatewayPWDCredentials':
+elif cmd == 'getAllCredentialSummaries':
if len(args) != 2:
- print('getAllGatewayPWDCredentials requires 2 args')
+ print('getAllCredentialSummaries requires 2 args')
sys.exit(1)
- pp.pprint(client.getAllGatewayPWDCredentials(eval(args[0]), args[1],))
+ pp.pprint(client.getAllCredentialSummaries(eval(args[0]), eval(args[1]),))
elif cmd == 'deleteSSHPubKey':
if len(args) != 3:
@@ -1259,11 +1238,11 @@ elif cmd == 'updateWorkflow':
sys.exit(1)
pp.pprint(client.updateWorkflow(eval(args[0]), args[1], eval(args[2]),))
-elif cmd == 'getWorkflowTemplateId':
+elif cmd == 'getWorkflowId':
if len(args) != 2:
- print('getWorkflowTemplateId requires 2 args')
+ print('getWorkflowId requires 2 args')
sys.exit(1)
- pp.pprint(client.getWorkflowTemplateId(eval(args[0]), args[1],))
+ pp.pprint(client.getWorkflowId(eval(args[0]), args[1],))
elif cmd == 'isWorkflowExistWithName':
if len(args) != 2:
diff --git a/airavata/api/Airavata.py b/airavata/api/Airavata.py
index 28c624a..3923df7 100644
--- a/airavata/api/Airavata.py
+++ b/airavata/api/Airavata.py
@@ -214,23 +214,13 @@ class Iface(object):
"""
pass
- def generateAndRegisterSSHKeys(self, authzToken, gatewayId, userName, description, credentialOwnerType):
+ def generateAndRegisterSSHKeys(self, authzToken, description):
"""
Generate and Register SSH Key Pair with Airavata Credential Store.
- @param gatewayId
- The identifier for the requested Gateway.
-
- @param userName
- The User for which the credential should be registered. For community accounts, this user is the name of the
- community user name. For computational resources, this user name need not be the same user name on resoruces.
-
@param description
The description field for a credential type, all type of credential can have a description.
- @param credentialOwnerType
- The type of owner of this credential. Two possible values: GATEWAY (default) and USER
-
@return airavataCredStoreToken
An SSH Key pair is generated and stored in the credential store and associated with users or community account
belonging to a Gateway.
@@ -239,24 +229,14 @@ class Iface(object):
Parameters:
- authzToken
- - gatewayId
- - userName
- description
- - credentialOwnerType
"""
pass
- def registerPwdCredential(self, authzToken, gatewayId, portalUserName, loginUserName, password, description):
+ def registerPwdCredential(self, authzToken, loginUserName, password, description):
"""
Generate and Register Username PWD Pair with Airavata Credential Store.
- @param gatewayId
- The identifier for the requested Gateway.
-
- @param portalUserName
- The User for which the credential should be registered. For community accounts, this user is the name of the
- community user name. For computational resources, this user name need not be the same user name on resoruces.
-
@param loginUserName
@param password
@@ -269,115 +249,26 @@ class Iface(object):
Parameters:
- authzToken
- - gatewayId
- - portalUserName
- loginUserName
- password
- description
"""
pass
- def getSSHPubKey(self, authzToken, airavataCredStoreToken, gatewayId):
- """
- Get a Public Key by Providing the Token
-
- @param CredStoreToken
- Credential Store Token which you want to find the Public Key for.
-
- @param gatewayId
- This is the unique identifier of your gateway where the token and public key was generated from.
-
- @return publicKey
-
-
-
- Parameters:
- - authzToken
- - airavataCredStoreToken
- - gatewayId
- """
- pass
-
- def getAllGatewaySSHPubKeys(self, authzToken, gatewayId):
- """
-
- Get all Public Keys of the Gateway
-
- @param CredStoreToken
- Credential Store Token which you want to find the Public Key for.
-
- @param gatewayId
- This is the unique identifier of your gateway where the token and public key was generated from.
-
- @return publicKey
-
-
-
- Parameters:
- - authzToken
- - gatewayId
- """
- pass
-
- def getAllCredentialSummaryForGateway(self, authzToken, type, gatewayId):
+ def getCredentialSummary(self, authzToken, type, tokenId):
"""
-
- Get all Credential summaries for the Gateway
-
- @param CredStoreToken
- Credential Store Token which you want to find the Public Key for.
-
- @param credential_store_data_models.SummaryType
- Summary type : SSH,PASSWD or CERT
-
- @param gatewayId
- This is the unique identifier of your gateway where the token and public key was generated from.
-
- @return List of Credential Summary Objects
-
-
-
Parameters:
- authzToken
- type
- - gatewayId
+ - tokenId
"""
pass
- def getAllCredentialSummaryForUsersInGateway(self, authzToken, type, gatewayId, userId):
+ def getAllCredentialSummaries(self, authzToken, type):
"""
-
- Get all Credential summaries for user in a Gateway
-
- @param CredStoreToken
- Credential Store Token which you want to find the Public Key for.
-
- @param credential_store_data_models.SummaryType
- Summary type : SSH,PASSWD or CERT
-
- @param gatewayId
- This is the unique identifier of your gateway where the token and public key was generated from.
-
- @param userId
- This is the unique identifier of user whose public keys are to be fetched.
-
- @return CredentialSummary
-
-
-
Parameters:
- authzToken
- type
- - gatewayId
- - userId
- """
- pass
-
- def getAllGatewayPWDCredentials(self, authzToken, gatewayId):
- """
- Parameters:
- - authzToken
- - gatewayId
"""
pass
@@ -3394,7 +3285,7 @@ class Iface(object):
"""
pass
- def getWorkflow(self, authzToken, workflowTemplateId):
+ def getWorkflow(self, authzToken, workflowId):
"""
API Methods Related for Work-Flow Submission Features.
@@ -3402,15 +3293,15 @@ class Iface(object):
Parameters:
- authzToken
- - workflowTemplateId
+ - workflowId
"""
pass
- def deleteWorkflow(self, authzToken, workflowTemplateId):
+ def deleteWorkflow(self, authzToken, workflowId):
"""
Parameters:
- authzToken
- - workflowTemplateId
+ - workflowId
"""
pass
@@ -3423,16 +3314,16 @@ class Iface(object):
"""
pass
- def updateWorkflow(self, authzToken, workflowTemplateId, workflow):
+ def updateWorkflow(self, authzToken, workflowId, workflow):
"""
Parameters:
- authzToken
- - workflowTemplateId
+ - workflowId
- workflow
"""
pass
- def getWorkflowTemplateId(self, authzToken, workflowName):
+ def getWorkflowId(self, authzToken, workflowName):
"""
Parameters:
- authzToken
@@ -4350,23 +4241,13 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllNotifications failed: unknown result")
- def generateAndRegisterSSHKeys(self, authzToken, gatewayId, userName, description, credentialOwnerType):
+ def generateAndRegisterSSHKeys(self, authzToken, description):
"""
Generate and Register SSH Key Pair with Airavata Credential Store.
- @param gatewayId
- The identifier for the requested Gateway.
-
- @param userName
- The User for which the credential should be registered. For community accounts, this user is the name of the
- community user name. For computational resources, this user name need not be the same user name on resoruces.
-
@param description
The description field for a credential type, all type of credential can have a description.
- @param credentialOwnerType
- The type of owner of this credential. Two possible values: GATEWAY (default) and USER
-
@return airavataCredStoreToken
An SSH Key pair is generated and stored in the credential store and associated with users or community account
belonging to a Gateway.
@@ -4375,22 +4256,16 @@ class Client(Iface):
Parameters:
- authzToken
- - gatewayId
- - userName
- description
- - credentialOwnerType
"""
- self.send_generateAndRegisterSSHKeys(authzToken, gatewayId, userName, description, credentialOwnerType)
+ self.send_generateAndRegisterSSHKeys(authzToken, description)
return self.recv_generateAndRegisterSSHKeys()
- def send_generateAndRegisterSSHKeys(self, authzToken, gatewayId, userName, description, credentialOwnerType):
+ def send_generateAndRegisterSSHKeys(self, authzToken, description):
self._oprot.writeMessageBegin('generateAndRegisterSSHKeys', TMessageType.CALL, self._seqid)
args = generateAndRegisterSSHKeys_args()
args.authzToken = authzToken
- args.gatewayId = gatewayId
- args.userName = userName
args.description = description
- args.credentialOwnerType = credentialOwnerType
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
@@ -4416,17 +4291,10 @@ class Client(Iface):
raise result.ase
raise TApplicationException(TApplicationException.MISSING_RESULT, "generateAndRegisterSSHKeys failed: unknown result")
- def registerPwdCredential(self, authzToken, gatewayId, portalUserName, loginUserName, password, description):
+ def registerPwdCredential(self, authzToken, loginUserName, password, description):
"""
Generate and Register Username PWD Pair with Airavata Credential Store.
- @param gatewayId
- The identifier for the requested Gateway.
-
- @param portalUserName
- The User for which the credential should be registered. For community accounts, this user is the name of the
- community user name. For computational resources, this user name need not be the same user name on resoruces.
-
@param loginUserName
@param password
@@ -4439,21 +4307,17 @@ class Client(Iface):
Parameters:
- authzToken
- - gatewayId
- - portalUserName
- loginUserName
- password
- description
"""
- self.send_registerPwdCredential(authzToken, gatewayId, portalUserName, loginUserName, password, description)
+ self.send_registerPwdCredential(authzToken, loginUserName, password, description)
return self.recv_registerPwdCredential()
- def send_registerPwdCredential(self, authzToken, gatewayId, portalUserName, loginUserName, password, description):
+ def send_registerPwdCredential(self, authzToken, loginUserName, password, description):
self._oprot.writeMessageBegin('registerPwdCredential', TMessageType.CALL, self._seqid)
args = registerPwdCredential_args()
args.authzToken = authzToken
- args.gatewayId = gatewayId
- args.portalUserName = portalUserName
args.loginUserName = loginUserName
args.password = password
args.description = description
@@ -4482,148 +4346,27 @@ class Client(Iface):
raise result.ase
raise TApplicationException(TApplicationException.MISSING_RESULT, "registerPwdCredential failed: unknown result")
- def getSSHPubKey(self, authzToken, airavataCredStoreToken, gatewayId):
- """
- Get a Public Key by Providing the Token
-
- @param CredStoreToken
- Credential Store Token which you want to find the Public Key for.
-
- @param gatewayId
- This is the unique identifier of your gateway where the token and public key was generated from.
-
- @return publicKey
-
-
-
- Parameters:
- - authzToken
- - airavataCredStoreToken
- - gatewayId
- """
- self.send_getSSHPubKey(authzToken, airavataCredStoreToken, gatewayId)
- return self.recv_getSSHPubKey()
-
- def send_getSSHPubKey(self, authzToken, airavataCredStoreToken, gatewayId):
- self._oprot.writeMessageBegin('getSSHPubKey', TMessageType.CALL, self._seqid)
- args = getSSHPubKey_args()
- args.authzToken = authzToken
- args.airavataCredStoreToken = airavataCredStoreToken
- args.gatewayId = gatewayId
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_getSSHPubKey(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = getSSHPubKey_result()
- result.read(iprot)
- iprot.readMessageEnd()
- if result.success is not None:
- return result.success
- if result.ire is not None:
- raise result.ire
- if result.ace is not None:
- raise result.ace
- if result.ase is not None:
- raise result.ase
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getSSHPubKey failed: unknown result")
-
- def getAllGatewaySSHPubKeys(self, authzToken, gatewayId):
+ def getCredentialSummary(self, authzToken, type, tokenId):
"""
-
- Get all Public Keys of the Gateway
-
- @param CredStoreToken
- Credential Store Token which you want to find the Public Key for.
-
- @param gatewayId
- This is the unique identifier of your gateway where the token and public key was generated from.
-
- @return publicKey
-
-
-
- Parameters:
- - authzToken
- - gatewayId
- """
- self.send_getAllGatewaySSHPubKeys(authzToken, gatewayId)
- return self.recv_getAllGatewaySSHPubKeys()
-
- def send_getAllGatewaySSHPubKeys(self, authzToken, gatewayId):
- self._oprot.writeMessageBegin('getAllGatewaySSHPubKeys', TMessageType.CALL, self._seqid)
- args = getAllGatewaySSHPubKeys_args()
- args.authzToken = authzToken
- args.gatewayId = gatewayId
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_getAllGatewaySSHPubKeys(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = getAllGatewaySSHPubKeys_result()
- result.read(iprot)
- iprot.readMessageEnd()
- if result.success is not None:
- return result.success
- if result.ire is not None:
- raise result.ire
- if result.ace is not None:
- raise result.ace
- if result.ase is not None:
- raise result.ase
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllGatewaySSHPubKeys failed: unknown result")
-
- def getAllCredentialSummaryForGateway(self, authzToken, type, gatewayId):
- """
-
- Get all Credential summaries for the Gateway
-
- @param CredStoreToken
- Credential Store Token which you want to find the Public Key for.
-
- @param credential_store_data_models.SummaryType
- Summary type : SSH,PASSWD or CERT
-
- @param gatewayId
- This is the unique identifier of your gateway where the token and public key was generated from.
-
- @return List of Credential Summary Objects
-
-
-
Parameters:
- authzToken
- type
- - gatewayId
+ - tokenId
"""
- self.send_getAllCredentialSummaryForGateway(authzToken, type, gatewayId)
- return self.recv_getAllCredentialSummaryForGateway()
+ self.send_getCredentialSummary(authzToken, type, tokenId)
+ return self.recv_getCredentialSummary()
- def send_getAllCredentialSummaryForGateway(self, authzToken, type, gatewayId):
- self._oprot.writeMessageBegin('getAllCredentialSummaryForGateway', TMessageType.CALL, self._seqid)
- args = getAllCredentialSummaryForGateway_args()
+ def send_getCredentialSummary(self, authzToken, type, tokenId):
+ self._oprot.writeMessageBegin('getCredentialSummary', TMessageType.CALL, self._seqid)
+ args = getCredentialSummary_args()
args.authzToken = authzToken
args.type = type
- args.gatewayId = gatewayId
+ args.tokenId = tokenId
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_getAllCredentialSummaryForGateway(self):
+ def recv_getCredentialSummary(self):
iprot = self._iprot
(fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
@@ -4631,7 +4374,7 @@ class Client(Iface):
x.read(iprot)
iprot.readMessageEnd()
raise x
- result = getAllCredentialSummaryForGateway_result()
+ result = getCredentialSummary_result()
result.read(iprot)
iprot.readMessageEnd()
if result.success is not None:
@@ -4642,50 +4385,29 @@ class Client(Iface):
raise result.ace
if result.ase is not None:
raise result.ase
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllCredentialSummaryForGateway failed: unknown result")
+ if result.ae is not None:
+ raise result.ae
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getCredentialSummary failed: unknown result")
- def getAllCredentialSummaryForUsersInGateway(self, authzToken, type, gatewayId, userId):
+ def getAllCredentialSummaries(self, authzToken, type):
"""
-
- Get all Credential summaries for user in a Gateway
-
- @param CredStoreToken
- Credential Store Token which you want to find the Public Key for.
-
- @param credential_store_data_models.SummaryType
- Summary type : SSH,PASSWD or CERT
-
- @param gatewayId
- This is the unique identifier of your gateway where the token and public key was generated from.
-
- @param userId
- This is the unique identifier of user whose public keys are to be fetched.
-
- @return CredentialSummary
-
-
-
Parameters:
- authzToken
- type
- - gatewayId
- - userId
"""
- self.send_getAllCredentialSummaryForUsersInGateway(authzToken, type, gatewayId, userId)
- return self.recv_getAllCredentialSummaryForUsersInGateway()
+ self.send_getAllCredentialSummaries(authzToken, type)
+ return self.recv_getAllCredentialSummaries()
- def send_getAllCredentialSummaryForUsersInGateway(self, authzToken, type, gatewayId, userId):
- self._oprot.writeMessageBegin('getAllCredentialSummaryForUsersInGateway', TMessageType.CALL, self._seqid)
- args = getAllCredentialSummaryForUsersInGateway_args()
+ def send_getAllCredentialSummaries(self, authzToken, type):
+ self._oprot.writeMessageBegin('getAllCredentialSummaries', TMessageType.CALL, self._seqid)
+ args = getAllCredentialSummaries_args()
args.authzToken = authzToken
args.type = type
- args.gatewayId = gatewayId
- args.userId = userId
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_getAllCredentialSummaryForUsersInGateway(self):
+ def recv_getAllCredentialSummaries(self):
iprot = self._iprot
(fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
@@ -4693,7 +4415,7 @@ class Client(Iface):
x.read(iprot)
iprot.readMessageEnd()
raise x
- result = getAllCredentialSummaryForUsersInGateway_result()
+ result = getAllCredentialSummaries_result()
result.read(iprot)
iprot.readMessageEnd()
if result.success is not None:
@@ -4704,46 +4426,7 @@ class Client(Iface):
raise result.ace
if result.ase is not None:
raise result.ase
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllCredentialSummaryForUsersInGateway failed: unknown result")
-
- def getAllGatewayPWDCredentials(self, authzToken, gatewayId):
- """
- Parameters:
- - authzToken
- - gatewayId
- """
- self.send_getAllGatewayPWDCredentials(authzToken, gatewayId)
- return self.recv_getAllGatewayPWDCredentials()
-
- def send_getAllGatewayPWDCredentials(self, authzToken, gatewayId):
- self._oprot.writeMessageBegin('getAllGatewayPWDCredentials', TMessageType.CALL, self._seqid)
- args = getAllGatewayPWDCredentials_args()
- args.authzToken = authzToken
- args.gatewayId = gatewayId
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_getAllGatewayPWDCredentials(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = getAllGatewayPWDCredentials_result()
- result.read(iprot)
- iprot.readMessageEnd()
- if result.success is not None:
- return result.success
- if result.ire is not None:
- raise result.ire
- if result.ace is not None:
- raise result.ace
- if result.ase is not None:
- raise result.ase
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllGatewayPWDCredentials failed: unknown result")
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllCredentialSummaries failed: unknown result")
def deleteSSHPubKey(self, authzToken, airavataCredStoreToken, gatewayId):
"""
@@ -4795,6 +4478,8 @@ class Client(Iface):
raise result.ace
if result.ase is not None:
raise result.ase
+ if result.ae is not None:
+ raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "deleteSSHPubKey failed: unknown result")
def deletePWDCredential(self, authzToken, airavataCredStoreToken, gatewayId):
@@ -4836,6 +4521,8 @@ class Client(Iface):
raise result.ace
if result.ase is not None:
raise result.ase
+ if result.ae is not None:
+ raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "deletePWDCredential failed: unknown result")
def createProject(self, authzToken, gatewayId, project):
@@ -12379,7 +12066,7 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "getLatestQueueStatuses failed: unknown result")
- def getWorkflow(self, authzToken, workflowTemplateId):
+ def getWorkflow(self, authzToken, workflowId):
"""
API Methods Related for Work-Flow Submission Features.
@@ -12387,16 +12074,16 @@ class Client(Iface):
Parameters:
- authzToken
- - workflowTemplateId
+ - workflowId
"""
- self.send_getWorkflow(authzToken, workflowTemplateId)
+ self.send_getWorkflow(authzToken, workflowId)
return self.recv_getWorkflow()
- def send_getWorkflow(self, authzToken, workflowTemplateId):
+ def send_getWorkflow(self, authzToken, workflowId):
self._oprot.writeMessageBegin('getWorkflow', TMessageType.CALL, self._seqid)
args = getWorkflow_args()
args.authzToken = authzToken
- args.workflowTemplateId = workflowTemplateId
+ args.workflowId = workflowId
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
@@ -12424,20 +12111,20 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "getWorkflow failed: unknown result")
- def deleteWorkflow(self, authzToken, workflowTemplateId):
+ def deleteWorkflow(self, authzToken, workflowId):
"""
Parameters:
- authzToken
- - workflowTemplateId
+ - workflowId
"""
- self.send_deleteWorkflow(authzToken, workflowTemplateId)
+ self.send_deleteWorkflow(authzToken, workflowId)
self.recv_deleteWorkflow()
- def send_deleteWorkflow(self, authzToken, workflowTemplateId):
+ def send_deleteWorkflow(self, authzToken, workflowId):
self._oprot.writeMessageBegin('deleteWorkflow', TMessageType.CALL, self._seqid)
args = deleteWorkflow_args()
args.authzToken = authzToken
- args.workflowTemplateId = workflowTemplateId
+ args.workflowId = workflowId
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
@@ -12506,21 +12193,21 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "registerWorkflow failed: unknown result")
- def updateWorkflow(self, authzToken, workflowTemplateId, workflow):
+ def updateWorkflow(self, authzToken, workflowId, workflow):
"""
Parameters:
- authzToken
- - workflowTemplateId
+ - workflowId
- workflow
"""
- self.send_updateWorkflow(authzToken, workflowTemplateId, workflow)
+ self.send_updateWorkflow(authzToken, workflowId, workflow)
self.recv_updateWorkflow()
- def send_updateWorkflow(self, authzToken, workflowTemplateId, workflow):
+ def send_updateWorkflow(self, authzToken, workflowId, workflow):
self._oprot.writeMessageBegin('updateWorkflow', TMessageType.CALL, self._seqid)
args = updateWorkflow_args()
args.authzToken = authzToken
- args.workflowTemplateId = workflowTemplateId
+ args.workflowId = workflowId
args.workflow = workflow
args.write(self._oprot)
self._oprot.writeMessageEnd()
@@ -12547,25 +12234,25 @@ class Client(Iface):
raise result.ae
return
- def getWorkflowTemplateId(self, authzToken, workflowName):
+ def getWorkflowId(self, authzToken, workflowName):
"""
Parameters:
- authzToken
- workflowName
"""
- self.send_getWorkflowTemplateId(authzToken, workflowName)
- return self.recv_getWorkflowTemplateId()
+ self.send_getWorkflowId(authzToken, workflowName)
+ return self.recv_getWorkflowId()
- def send_getWorkflowTemplateId(self, authzToken, workflowName):
- self._oprot.writeMessageBegin('getWorkflowTemplateId', TMessageType.CALL, self._seqid)
- args = getWorkflowTemplateId_args()
+ def send_getWorkflowId(self, authzToken, workflowName):
+ self._oprot.writeMessageBegin('getWorkflowId', TMessageType.CALL, self._seqid)
+ args = getWorkflowId_args()
args.authzToken = authzToken
args.workflowName = workflowName
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_getWorkflowTemplateId(self):
+ def recv_getWorkflowId(self):
iprot = self._iprot
(fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
@@ -12573,7 +12260,7 @@ class Client(Iface):
x.read(iprot)
iprot.readMessageEnd()
raise x
- result = getWorkflowTemplateId_result()
+ result = getWorkflowId_result()
result.read(iprot)
iprot.readMessageEnd()
if result.success is not None:
@@ -12586,7 +12273,7 @@ class Client(Iface):
raise result.ase
if result.ae is not None:
raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getWorkflowTemplateId failed: unknown result")
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getWorkflowId failed: unknown result")
def isWorkflowExistWithName(self, authzToken, workflowName):
"""
@@ -13779,11 +13466,8 @@ class Processor(Iface, TProcessor):
self._processMap["getAllNotifications"] = Processor.process_getAllNotifications
self._processMap["generateAndRegisterSSHKeys"] = Processor.process_generateAndRegisterSSHKeys
self._processMap["registerPwdCredential"] = Processor.process_registerPwdCredential
- self._processMap["getSSHPubKey"] = Processor.process_getSSHPubKey
- self._processMap["getAllGatewaySSHPubKeys"] = Processor.process_getAllGatewaySSHPubKeys
- self._processMap["getAllCredentialSummaryForGateway"] = Processor.process_getAllCredentialSummaryForGateway
- self._processMap["getAllCredentialSummaryForUsersInGateway"] = Processor.process_getAllCredentialSummaryForUsersInGateway
- self._processMap["getAllGatewayPWDCredentials"] = Processor.process_getAllGatewayPWDCredentials
+ self._processMap["getCredentialSummary"] = Processor.process_getCredentialSummary
+ self._processMap["getAllCredentialSummaries"] = Processor.process_getAllCredentialSummaries
self._processMap["deleteSSHPubKey"] = Processor.process_deleteSSHPubKey
self._processMap["deletePWDCredential"] = Processor.process_deletePWDCredential
self._processMap["createProject"] = Processor.process_createProject
@@ -13924,7 +13608,7 @@ class Processor(Iface, TProcessor):
self._processMap["deleteWorkflow"] = Processor.process_deleteWorkflow
self._processMap["registerWorkflow"] = Processor.process_registerWorkflow
self._processMap["updateWorkflow"] = Processor.process_updateWorkflow
- self._processMap["getWorkflowTemplateId"] = Processor.process_getWorkflowTemplateId
+ self._processMap["getWorkflowId"] = Processor.process_getWorkflowId
self._processMap["isWorkflowExistWithName"] = Processor.process_isWorkflowExistWithName
self._processMap["registerDataProduct"] = Processor.process_registerDataProduct
self._processMap["getDataProduct"] = Processor.process_getDataProduct
@@ -14409,7 +14093,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = generateAndRegisterSSHKeys_result()
try:
- result.success = self._handler.generateAndRegisterSSHKeys(args.authzToken, args.gatewayId, args.userName, args.description, args.credentialOwnerType)
+ result.success = self._handler.generateAndRegisterSSHKeys(args.authzToken, args.description)
msg_type = TMessageType.REPLY
except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
raise
@@ -14437,7 +14121,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = registerPwdCredential_result()
try:
- result.success = self._handler.registerPwdCredential(args.authzToken, args.gatewayId, args.portalUserName, args.loginUserName, args.password, args.description)
+ result.success = self._handler.registerPwdCredential(args.authzToken, args.loginUserName, args.password, args.description)
msg_type = TMessageType.REPLY
except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
raise
@@ -14459,13 +14143,13 @@ class Processor(Iface, TProcessor):
oprot.writeMessageEnd()
oprot.trans.flush()
- def process_getSSHPubKey(self, seqid, iprot, oprot):
- args = getSSHPubKey_args()
+ def process_getCredentialSummary(self, seqid, iprot, oprot):
+ args = getCredentialSummary_args()
args.read(iprot)
iprot.readMessageEnd()
- result = getSSHPubKey_result()
+ result = getCredentialSummary_result()
try:
- result.success = self._handler.getSSHPubKey(args.authzToken, args.airavataCredStoreToken, args.gatewayId)
+ result.success = self._handler.getCredentialSummary(args.authzToken, args.type, args.tokenId)
msg_type = TMessageType.REPLY
except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
raise
@@ -14478,78 +14162,25 @@ class Processor(Iface, TProcessor):
except airavata.api.error.ttypes.AiravataSystemException as ase:
msg_type = TMessageType.REPLY
result.ase = ase
- except Exception as ex:
- msg_type = TMessageType.EXCEPTION
- logging.exception(ex)
- result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
- oprot.writeMessageBegin("getSSHPubKey", msg_type, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_getAllGatewaySSHPubKeys(self, seqid, iprot, oprot):
- args = getAllGatewaySSHPubKeys_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = getAllGatewaySSHPubKeys_result()
- try:
- result.success = self._handler.getAllGatewaySSHPubKeys(args.authzToken, args.gatewayId)
- msg_type = TMessageType.REPLY
- except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
- raise
- except airavata.api.error.ttypes.InvalidRequestException as ire:
- msg_type = TMessageType.REPLY
- result.ire = ire
- except airavata.api.error.ttypes.AiravataClientException as ace:
- msg_type = TMessageType.REPLY
- result.ace = ace
- except airavata.api.error.ttypes.AiravataSystemException as ase:
- msg_type = TMessageType.REPLY
- result.ase = ase
- except Exception as ex:
- msg_type = TMessageType.EXCEPTION
- logging.exception(ex)
- result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
- oprot.writeMessageBegin("getAllGatewaySSHPubKeys", msg_type, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_getAllCredentialSummaryForGateway(self, seqid, iprot, oprot):
- args = getAllCredentialSummaryForGateway_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = getAllCredentialSummaryForGateway_result()
- try:
- result.success = self._handler.getAllCredentialSummaryForGateway(args.authzToken, args.type, args.gatewayId)
- msg_type = TMessageType.REPLY
- except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
- raise
- except airavata.api.error.ttypes.InvalidRequestException as ire:
- msg_type = TMessageType.REPLY
- result.ire = ire
- except airavata.api.error.ttypes.AiravataClientException as ace:
- msg_type = TMessageType.REPLY
- result.ace = ace
- except airavata.api.error.ttypes.AiravataSystemException as ase:
+ except airavata.api.error.ttypes.AuthorizationException as ae:
msg_type = TMessageType.REPLY
- result.ase = ase
+ result.ae = ae
except Exception as ex:
msg_type = TMessageType.EXCEPTION
logging.exception(ex)
result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
- oprot.writeMessageBegin("getAllCredentialSummaryForGateway", msg_type, seqid)
+ oprot.writeMessageBegin("getCredentialSummary", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
- def process_getAllCredentialSummaryForUsersInGateway(self, seqid, iprot, oprot):
- args = getAllCredentialSummaryForUsersInGateway_args()
+ def process_getAllCredentialSummaries(self, seqid, iprot, oprot):
+ args = getAllCredentialSummaries_args()
args.read(iprot)
iprot.readMessageEnd()
- result = getAllCredentialSummaryForUsersInGateway_result()
+ result = getAllCredentialSummaries_result()
try:
- result.success = self._handler.getAllCredentialSummaryForUsersInGateway(args.authzToken, args.type, args.gatewayId, args.userId)
+ result.success = self._handler.getAllCredentialSummaries(args.authzToken, args.type)
msg_type = TMessageType.REPLY
except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
raise
@@ -14566,35 +14197,7 @@ class Processor(Iface, TProcessor):
msg_type = TMessageType.EXCEPTION
logging.exception(ex)
result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
- oprot.writeMessageBegin("getAllCredentialSummaryForUsersInGateway", msg_type, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_getAllGatewayPWDCredentials(self, seqid, iprot, oprot):
- args = getAllGatewayPWDCredentials_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = getAllGatewayPWDCredentials_result()
- try:
- result.success = self._handler.getAllGatewayPWDCredentials(args.authzToken, args.gatewayId)
- msg_type = TMessageType.REPLY
- except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
- raise
- except airavata.api.error.ttypes.InvalidRequestException as ire:
- msg_type = TMessageType.REPLY
- result.ire = ire
- except airavata.api.error.ttypes.AiravataClientException as ace:
- msg_type = TMessageType.REPLY
- result.ace = ace
- except airavata.api.error.ttypes.AiravataSystemException as ase:
- msg_type = TMessageType.REPLY
- result.ase = ase
- except Exception as ex:
- msg_type = TMessageType.EXCEPTION
- logging.exception(ex)
- result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
- oprot.writeMessageBegin("getAllGatewayPWDCredentials", msg_type, seqid)
+ oprot.writeMessageBegin("getAllCredentialSummaries", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -14618,6 +14221,9 @@ class Processor(Iface, TProcessor):
except airavata.api.error.ttypes.AiravataSystemException as ase:
msg_type = TMessageType.REPLY
result.ase = ase
+ except airavata.api.error.ttypes.AuthorizationException as ae:
+ msg_type = TMessageType.REPLY
+ result.ae = ae
except Exception as ex:
msg_type = TMessageType.EXCEPTION
logging.exception(ex)
@@ -14646,6 +14252,9 @@ class Processor(Iface, TProcessor):
except airavata.api.error.ttypes.AiravataSystemException as ase:
msg_type = TMessageType.REPLY
result.ase = ase
+ except airavata.api.error.ttypes.AuthorizationException as ae:
+ msg_type = TMessageType.REPLY
+ result.ae = ae
except Exception as ex:
msg_type = TMessageType.EXCEPTION
logging.exception(ex)
@@ -18857,7 +18466,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = getWorkflow_result()
try:
- result.success = self._handler.getWorkflow(args.authzToken, args.workflowTemplateId)
+ result.success = self._handler.getWorkflow(args.authzToken, args.workflowId)
msg_type = TMessageType.REPLY
except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
raise
@@ -18888,7 +18497,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = deleteWorkflow_result()
try:
- self._handler.deleteWorkflow(args.authzToken, args.workflowTemplateId)
+ self._handler.deleteWorkflow(args.authzToken, args.workflowId)
msg_type = TMessageType.REPLY
except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
raise
@@ -18950,7 +18559,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = updateWorkflow_result()
try:
- self._handler.updateWorkflow(args.authzToken, args.workflowTemplateId, args.workflow)
+ self._handler.updateWorkflow(args.authzToken, args.workflowId, args.workflow)
msg_type = TMessageType.REPLY
except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
raise
@@ -18975,13 +18584,13 @@ class Processor(Iface, TProcessor):
oprot.writeMessageEnd()
oprot.trans.flush()
- def process_getWorkflowTemplateId(self, seqid, iprot, oprot):
- args = getWorkflowTemplateId_args()
+ def process_getWorkflowId(self, seqid, iprot, oprot):
+ args = getWorkflowId_args()
args.read(iprot)
iprot.readMessageEnd()
- result = getWorkflowTemplateId_result()
+ result = getWorkflowId_result()
try:
- result.success = self._handler.getWorkflowTemplateId(args.authzToken, args.workflowName)
+ result.success = self._handler.getWorkflowId(args.authzToken, args.workflowName)
msg_type = TMessageType.REPLY
except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
raise
@@ -19001,7 +18610,7 @@ class Processor(Iface, TProcessor):
msg_type = TMessageType.EXCEPTION
logging.exception(ex)
result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
- oprot.writeMessageBegin("getWorkflowTemplateId", msg_type, seqid)
+ oprot.writeMessageBegin("getWorkflowId", msg_type, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -20488,595 +20097,7 @@ class getAllUsersInGateway_args(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getAllUsersInGateway_args')
- if self.authzToken is not None:
- oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
- self.authzToken.write(oprot)
- oprot.writeFieldEnd()
- if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
- oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- if self.authzToken is None:
- raise TProtocolException(message='Required field authzToken is unset!')
- if self.gatewayId is None:
- raise TProtocolException(message='Required field gatewayId is unset!')
- return
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.items()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
-
-class getAllUsersInGateway_result(object):
- """
- Attributes:
- - success
- - ire
- - ace
- - ase
- - ae
- """
-
- thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRING, 'UTF8', False), None, ), # 0
- (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
- (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
- (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
- )
-
- def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
- self.success = success
- self.ire = ire
- self.ace = ace
- self.ase = ase
- self.ae = ae
-
- def read(self, iprot):
- if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
- iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 0:
- if ftype == TType.LIST:
- self.success = []
- (_etype3, _size0) = iprot.readListBegin()
- for _i4 in range(_size0):
- _elem5 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- self.success.append(_elem5)
- iprot.readListEnd()
- else:
- iprot.skip(ftype)
- elif fid == 1:
- if ftype == TType.STRUCT:
- self.ire = airavata.api.error.ttypes.InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.ace = airavata.api.error.ttypes.AiravataClientException()
- self.ace.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.ase = airavata.api.error.ttypes.AiravataSystemException()
- self.ase.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.STRUCT:
- self.ae = airavata.api.error.ttypes.AuthorizationException()
- self.ae.read(iprot)
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot._fast_encode is not None and self.thrift_spec is not None:
- oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
- return
- oprot.writeStructBegin('getAllUsersInGateway_result')
- if self.success is not None:
- oprot.writeFieldBegin('success', TType.LIST, 0)
- oprot.writeListBegin(TType.STRING, len(self.success))
- for iter6 in self.success:
- oprot.writeString(iter6.encode('utf-8') if sys.version_info[0] == 2 else iter6)
- oprot.writeListEnd()
- oprot.writeFieldEnd()
- if self.ire is not None:
- oprot.writeFieldBegin('ire', TType.STRUCT, 1)
- self.ire.write(oprot)
- oprot.writeFieldEnd()
- if self.ace is not None:
- oprot.writeFieldBegin('ace', TType.STRUCT, 2)
- self.ace.write(oprot)
- oprot.writeFieldEnd()
- if self.ase is not None:
- oprot.writeFieldBegin('ase', TType.STRUCT, 3)
- self.ase.write(oprot)
- oprot.writeFieldEnd()
- if self.ae is not None:
- oprot.writeFieldBegin('ae', TType.STRUCT, 4)
- self.ae.write(oprot)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- return
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.items()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
-
-class updateGateway_args(object):
- """
- Attributes:
- - authzToken
- - gatewayId
- - updatedGateway
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'gatewayId', 'UTF8', None, ), # 2
- (3, TType.STRUCT, 'updatedGateway', (airavata.model.workspace.ttypes.Gateway, airavata.model.workspace.ttypes.Gateway.thrift_spec), None, ), # 3
- )
-
- def __init__(self, authzToken=None, gatewayId=None, updatedGateway=None,):
- self.authzToken = authzToken
- self.gatewayId = gatewayId
- self.updatedGateway = updatedGateway
-
- def read(self, iprot):
- if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
- iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 1:
- if ftype == TType.STRUCT:
- self.authzToken = airavata.model.security.ttypes.AuthzToken()
- self.authzToken.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRING:
- self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.updatedGateway = airavata.model.workspace.ttypes.Gateway()
- self.updatedGateway.read(iprot)
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot._fast_encode is not None and self.thrift_spec is not None:
- oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
- return
- oprot.writeStructBegin('updateGateway_args')
- if self.authzToken is not None:
- oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
- self.authzToken.write(oprot)
- oprot.writeFieldEnd()
- if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
- oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
- oprot.writeFieldEnd()
- if self.updatedGateway is not None:
- oprot.writeFieldBegin('updatedGateway', TType.STRUCT, 3)
- self.updatedGateway.write(oprot)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- if self.authzToken is None:
- raise TProtocolException(message='Required field authzToken is unset!')
- if self.gatewayId is None:
- raise TProtocolException(message='Required field gatewayId is unset!')
- if self.updatedGateway is None:
- raise TProtocolException(message='Required field updatedGateway is unset!')
- return
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.items()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
-
-class updateGateway_result(object):
- """
- Attributes:
- - success
- - ire
- - ace
- - ase
- - ae
- """
-
- thrift_spec = (
- (0, TType.BOOL, 'success', None, None, ), # 0
- (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
- (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
- (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
- )
-
- def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
- self.success = success
- self.ire = ire
- self.ace = ace
- self.ase = ase
- self.ae = ae
-
- def read(self, iprot):
- if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
- iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 0:
- if ftype == TType.BOOL:
- self.success = iprot.readBool()
- else:
- iprot.skip(ftype)
- elif fid == 1:
- if ftype == TType.STRUCT:
- self.ire = airavata.api.error.ttypes.InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.ace = airavata.api.error.ttypes.AiravataClientException()
- self.ace.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.ase = airavata.api.error.ttypes.AiravataSystemException()
- self.ase.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.STRUCT:
- self.ae = airavata.api.error.ttypes.AuthorizationException()
- self.ae.read(iprot)
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot._fast_encode is not None and self.thrift_spec is not None:
- oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
- return
- oprot.writeStructBegin('updateGateway_result')
- if self.success is not None:
- oprot.writeFieldBegin('success', TType.BOOL, 0)
- oprot.writeBool(self.success)
- oprot.writeFieldEnd()
- if self.ire is not None:
- oprot.writeFieldBegin('ire', TType.STRUCT, 1)
- self.ire.write(oprot)
- oprot.writeFieldEnd()
- if self.ace is not None:
- oprot.writeFieldBegin('ace', TType.STRUCT, 2)
- self.ace.write(oprot)
- oprot.writeFieldEnd()
- if self.ase is not None:
- oprot.writeFieldBegin('ase', TType.STRUCT, 3)
- self.ase.write(oprot)
- oprot.writeFieldEnd()
- if self.ae is not None:
- oprot.writeFieldBegin('ae', TType.STRUCT, 4)
- self.ae.write(oprot)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- return
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.items()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
-
-class getGateway_args(object):
- """
- Attributes:
- - authzToken
- - gatewayId
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'gatewayId', 'UTF8', None, ), # 2
- )
-
- def __init__(self, authzToken=None, gatewayId=None,):
- self.authzToken = authzToken
- self.gatewayId = gatewayId
-
- def read(self, iprot):
- if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
- iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 1:
- if ftype == TType.STRUCT:
- self.authzToken = airavata.model.security.ttypes.AuthzToken()
- self.authzToken.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRING:
- self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot._fast_encode is not None and self.thrift_spec is not None:
- oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
- return
- oprot.writeStructBegin('getGateway_args')
- if self.authzToken is not None:
- oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
- self.authzToken.write(oprot)
- oprot.writeFieldEnd()
- if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
- oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- if self.authzToken is None:
- raise TProtocolException(message='Required field authzToken is unset!')
- if self.gatewayId is None:
- raise TProtocolException(message='Required field gatewayId is unset!')
- return
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.items()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
-
-class getGateway_result(object):
- """
- Attributes:
- - success
- - ire
- - ace
- - ase
- - ae
- """
-
- thrift_spec = (
- (0, TType.STRUCT, 'success', (airavata.model.workspace.ttypes.Gateway, airavata.model.workspace.ttypes.Gateway.thrift_spec), None, ), # 0
- (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
- (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
- (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
- )
-
- def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
- self.success = success
- self.ire = ire
- self.ace = ace
- self.ase = ase
- self.ae = ae
-
- def read(self, iprot):
- if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
- iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 0:
- if ftype == TType.STRUCT:
- self.success = airavata.model.workspace.ttypes.Gateway()
- self.success.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 1:
- if ftype == TType.STRUCT:
- self.ire = airavata.api.error.ttypes.InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.ace = airavata.api.error.ttypes.AiravataClientException()
- self.ace.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.ase = airavata.api.error.ttypes.AiravataSystemException()
- self.ase.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.STRUCT:
- self.ae = airavata.api.error.ttypes.AuthorizationException()
- self.ae.read(iprot)
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot._fast_encode is not None and self.thrift_spec is not None:
- oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
- return
- oprot.writeStructBegin('getGateway_result')
- if self.success is not None:
- oprot.writeFieldBegin('success', TType.STRUCT, 0)
- self.success.write(oprot)
- oprot.writeFieldEnd()
- if self.ire is not None:
- oprot.writeFieldBegin('ire', TType.STRUCT, 1)
- self.ire.write(oprot)
- oprot.writeFieldEnd()
- if self.ace is not None:
- oprot.writeFieldBegin('ace', TType.STRUCT, 2)
- self.ace.write(oprot)
- oprot.writeFieldEnd()
- if self.ase is not None:
- oprot.writeFieldBegin('ase', TType.STRUCT, 3)
- self.ase.write(oprot)
- oprot.writeFieldEnd()
- if self.ae is not None:
- oprot.writeFieldBegin('ae', TType.STRUCT, 4)
- self.ae.write(oprot)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- return
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.items()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
-
-class deleteGateway_args(object):
- """
- Attributes:
- - authzToken
- - gatewayId
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'gatewayId', 'UTF8', None, ), # 2
- )
-
- def __init__(self, authzToken=None, gatewayId=None,):
- self.authzToken = authzToken
- self.gatewayId = gatewayId
-
- def read(self, iprot):
- if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
- iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 1:
- if ftype == TType.STRUCT:
- self.authzToken = airavata.model.security.ttypes.AuthzToken()
- self.authzToken.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRING:
- self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot._fast_encode is not None and self.thrift_spec is not None:
- oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
- return
- oprot.writeStructBegin('deleteGateway_args')
+ oprot.writeStructBegin('getAllUsersInGateway_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -21107,181 +20128,7 @@ class deleteGateway_args(object):
return not (self == other)
-class deleteGateway_result(object):
- """
- Attributes:
- - success
- - ire
- - ace
- - ase
- - ae
- """
-
- thrift_spec = (
- (0, TType.BOOL, 'success', None, None, ), # 0
- (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
- (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
- (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
- )
-
- def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
- self.success = success
- self.ire = ire
- self.ace = ace
- self.ase = ase
- self.ae = ae
-
- def read(self, iprot):
- if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
- iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 0:
- if ftype == TType.BOOL:
- self.success = iprot.readBool()
- else:
- iprot.skip(ftype)
- elif fid == 1:
- if ftype == TType.STRUCT:
- self.ire = airavata.api.error.ttypes.InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.ace = airavata.api.error.ttypes.AiravataClientException()
- self.ace.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.ase = airavata.api.error.ttypes.AiravataSystemException()
- self.ase.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.STRUCT:
- self.ae = airavata.api.error.ttypes.AuthorizationException()
- self.ae.read(iprot)
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot._fast_encode is not None and self.thrift_spec is not None:
- oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
- return
- oprot.writeStructBegin('deleteGateway_result')
- if self.success is not None:
- oprot.writeFieldBegin('success', TType.BOOL, 0)
- oprot.writeBool(self.success)
- oprot.writeFieldEnd()
- if self.ire is not None:
- oprot.writeFieldBegin('ire', TType.STRUCT, 1)
- self.ire.write(oprot)
- oprot.writeFieldEnd()
- if self.ace is not None:
- oprot.writeFieldBegin('ace', TType.STRUCT, 2)
- self.ace.write(oprot)
- oprot.writeFieldEnd()
- if self.ase is not None:
- oprot.writeFieldBegin('ase', TType.STRUCT, 3)
- self.ase.write(oprot)
- oprot.writeFieldEnd()
- if self.ae is not None:
- oprot.writeFieldBegin('ae', TType.STRUCT, 4)
- self.ae.write(oprot)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- return
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.items()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
-
-class getAllGateways_args(object):
- """
- Attributes:
- - authzToken
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- )
-
- def __init__(self, authzToken=None,):
- self.authzToken = authzToken
-
- def read(self, iprot):
- if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
- iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 1:
- if ftype == TType.STRUCT:
- self.authzToken = airavata.model.security.ttypes.AuthzToken()
- self.authzToken.read(iprot)
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot._fast_encode is not None and self.thrift_spec is not None:
- oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
- return
- oprot.writeStructBegin('getAllGateways_args')
- if self.authzToken is not None:
- oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
- self.authzToken.write(oprot)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- if self.authzToken is None:
- raise TProtocolException(message='Required field authzToken is unset!')
- return
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.items()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
-
-class getAllGateways_result(object):
+class getAllUsersInGateway_result(object):
"""
Attributes:
- success
@@ -21292,7 +20139,7 @@ class getAllGateways_result(object):
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.workspace.ttypes.Gateway, airavata.model.workspace.ttypes.Gateway.thrift_spec), False), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRING, 'UTF8', False), None, ), # 0
(1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -21318,11 +20165,10 @@ class getAllGateways_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype10, _size7) = iprot.readListBegin()
- for _i11 in range(_size7):
- _elem12 = airavata.model.workspace.ttypes.Gateway()
- _elem12.read(iprot)
- self.success.append(_elem12)
+ (_etype3, _size0) = iprot.readListBegin()
+ for _i4 in range(_size0):
+ _elem5 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.success.append(_elem5)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -21359,12 +20205,12 @@ class getAllGateways_result(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getAllGateways_result')
+ oprot.writeStructBegin('getAllUsersInGateway_result')
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
- oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter13 in self.success:
- iter13.write(oprot)
+ oprot.writeListBegin(TType.STRING, len(self.success))
+ for iter6 in self.success:
+ oprot.writeString(iter6.encode('utf-8') if sys.version_info[0] == 2 else iter6)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -21401,22 +20247,25 @@ class getAllGateways_result(object):
return not (self == other)
-class isGatewayExist_args(object):
+class updateGateway_args(object):
"""
Attributes:
- authzToken
- gatewayId
+ - updatedGateway
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
(2, TType.STRING, 'gatewayId', 'UTF8', None, ), # 2
+ (3, TType.STRUCT, 'updatedGateway', (airavata.model.workspace.ttypes.Gateway, airavata.model.workspace.ttypes.Gateway.thrift_spec), None, ), # 3
)
- def __init__(self, authzToken=None, gatewayId=None,):
+ def __init__(self, authzToken=None, gatewayId=None, updatedGateway=None,):
self.authzToken = authzToken
self.gatewayId = gatewayId
+ self.updatedGateway = updatedGateway
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -21438,6 +20287,12 @@ class isGatewayExist_args(object):
self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
+ elif fid == 3:
+ if ftype == TType.STRUCT:
+ self.updatedGateway = airavata.model.workspace.ttypes.Gateway()
+ self.updatedGateway.read(iprot)
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -21447,7 +20302,7 @@ class isGatewayExist_args(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('isGatewayExist_args')
+ oprot.writeStructBegin('updateGateway_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -21456,6 +20311,10 @@ class isGatewayExist_args(object):
oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
oprot.writeFieldEnd()
+ if self.updatedGateway is not None:
+ oprot.writeFieldBegin('updatedGateway', TType.STRUCT, 3)
+ self.updatedGateway.write(oprot)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -21464,6 +20323,8 @@ class isGatewayExist_args(object):
raise TProtocolException(message='Required field authzToken is unset!')
if self.gatewayId is None:
raise TProtocolException(message='Required field gatewayId is unset!')
+ if self.updatedGateway is None:
+ raise TProtocolException(message='Required field updatedGateway is unset!')
return
def __repr__(self):
@@ -21478,7 +20339,7 @@ class isGatewayExist_args(object):
return not (self == other)
-class isGatewayExist_result(object):
+class updateGateway_result(object):
"""
Attributes:
- success
@@ -21550,7 +20411,7 @@ class isGatewayExist_result(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('isGatewayExist_result')
+ oprot.writeStructBegin('updateGateway_result')
if self.success is not None:
oprot.writeFieldBegin('success', TType.BOOL, 0)
oprot.writeBool(self.success)
@@ -21589,22 +20450,22 @@ class isGatewayExist_result(object):
return not (self == other)
-class createNotification_args(object):
+class getGateway_args(object):
"""
Attributes:
- authzToken
- - notification
+ - gatewayId
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'notification', (airavata.model.workspace.ttypes.Notification, airavata.model.workspace.ttypes.Notification.thrift_spec), None, ), # 2
+ (2, TType.STRING, 'gatewayId', 'UTF8', None, ), # 2
)
- def __init__(self, authzToken=None, notification=None,):
+ def __init__(self, authzToken=None, gatewayId=None,):
self.authzToken = authzToken
- self.notification = notification
+ self.gatewayId = gatewayId
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -21622,9 +20483,8 @@ class createNotification_args(object):
else:
iprot.skip(ftype)
elif fid == 2:
- if ftype == TType.STRUCT:
- self.notification = airavata.model.workspace.ttypes.Notification()
- self.notification.read(iprot)
+ if ftype == TType.STRING:
+ self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
else:
@@ -21636,14 +20496,14 @@ class createNotification_args(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('createNotification_args')
+ oprot.writeStructBegin('getGateway_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.notification is not None:
- oprot.writeFieldBegin('notification', TType.STRUCT, 2)
- self.notification.write(oprot)
+ if self.gatewayId is not None:
+ oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
+ oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -21651,8 +20511,8 @@ class createNotification_args(object):
def validate(self):
if self.authzToken is None:
raise TProtocolException(message='Required field authzToken is unset!')
- if self.notification is None:
- raise TProtocolException(message='Required field notification is unset!')
+ if self.gatewayId is None:
+ raise TProtocolException(message='Required field gatewayId is unset!')
return
def __repr__(self):
@@ -21667,7 +20527,7 @@ class createNotification_args(object):
return not (self == other)
-class createNotification_result(object):
+class getGateway_result(object):
"""
Attributes:
- success
@@ -21678,7 +20538,7 @@ class createNotification_result(object):
"""
thrift_spec = (
- (0, TType.STRING, 'success', 'UTF8', None, ), # 0
+ (0, TType.STRUCT, 'success', (airavata.model.workspace.ttypes.Gateway, airavata.model.workspace.ttypes.Gateway.thrift_spec), None, ), # 0
(1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -21702,8 +20562,9 @@ class createNotification_result(object):
if ftype == TType.STOP:
break
if fid == 0:
- if ftype == TType.STRING:
- self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ if ftype == TType.STRUCT:
+ self.success = airavata.model.workspace.ttypes.Gateway()
+ self.success.read(iprot)
else:
iprot.skip(ftype)
elif fid == 1:
@@ -21739,10 +20600,10 @@ class createNotification_result(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('createNotification_result')
+ oprot.writeStructBegin('getGateway_result')
if self.success is not None:
- oprot.writeFieldBegin('success', TType.STRING, 0)
- oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
+ oprot.writeFieldBegin('success', TType.STRUCT, 0)
+ self.success.write(oprot)
oprot.writeFieldEnd()
if self.ire is not None:
oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -21778,22 +20639,22 @@ class createNotification_result(object):
return not (self == other)
-class updateNotification_args(object):
+class deleteGateway_args(object):
"""
Attributes:
- authzToken
- - notification
+ - gatewayId
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'notification', (airavata.model.workspace.ttypes.Notification, airavata.model.workspace.ttypes.Notification.thrift_spec), None, ), # 2
+ (2, TType.STRING, 'gatewayId', 'UTF8', None, ), # 2
)
- def __init__(self, authzToken=None, notification=None,):
+ def __init__(self, authzToken=None, gatewayId=None,):
self.authzToken = authzToken
- self.notification = notification
+ self.gatewayId = gatewayId
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -21811,9 +20672,8 @@ class updateNotification_args(object):
else:
iprot.skip(ftype)
elif fid == 2:
- if ftype == TType.STRUCT:
- self.notification = airavata.model.workspace.ttypes.Notification()
- self.notification.read(iprot)
+ if ftype == TType.STRING:
+ self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
else:
@@ -21825,14 +20685,14 @@ class updateNotification_args(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('updateNotification_args')
+ oprot.writeStructBegin('deleteGateway_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.notification is not None:
- oprot.writeFieldBegin('notification', TType.STRUCT, 2)
- self.notification.write(oprot)
+ if self.gatewayId is not None:
+ oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
+ oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -21840,8 +20700,8 @@ class updateNotification_args(object):
def validate(self):
if self.authzToken is None:
raise TProtocolException(message='Required field authzToken is unset!')
- if self.notification is None:
- raise TProtocolException(message='Required field notification is unset!')
+ if self.gatewayId is None:
+ raise TProtocolException(message='Required field gatewayId is unset!')
return
def __repr__(self):
@@ -21856,7 +20716,7 @@ class updateNotification_args(object):
return not (self == other)
-class updateNotification_result(object):
+class deleteGateway_result(object):
"""
Attributes:
- success
@@ -21928,7 +20788,7 @@ class updateNotification_result(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('updateNotification_result')
+ oprot.writeStructBegin('deleteGateway_result')
if self.success is not None:
oprot.writeFieldBegin('success', TType.BOOL, 0)
oprot.writeBool(self.success)
@@ -21967,25 +20827,19 @@ class updateNotification_result(object):
return not (self == other)
-class deleteNotification_args(object):
+class getAllGateways_args(object):
"""
Attributes:
- authzToken
- - gatewayId
- - notificationId
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'gatewayId', 'UTF8', None, ), # 2
- (3, TType.STRING, 'notificationId', 'UTF8', None, ), # 3
)
- def __init__(self, authzToken=None, gatewayId=None, notificationId=None,):
+ def __init__(self, authzToken=None,):
self.authzToken = authzToken
- self.gatewayId = gatewayId
- self.notificationId = notificationId
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -22002,16 +20856,6 @@ class deleteNotification_args(object):
self.authzToken.read(iprot)
else:
iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRING:
- self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRING:
- self.notificationId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- else:
- iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -22021,29 +20865,17 @@ class deleteNotification_args(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('deleteNotification_args')
+ oprot.writeStructBegin('getAllGateways_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
- oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
- oprot.writeFieldEnd()
- if self.notificationId is not None:
- oprot.writeFieldBegin('notificationId', TType.STRING, 3)
- oprot.writeString(self.notificationId.encode('utf-8') if sys.version_info[0] == 2 else self.notificationId)
- oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
def validate(self):
if self.authzToken is None:
raise TProtocolException(message='Required field authzToken is unset!')
- if self.gatewayId is None:
- raise TProtocolException(message='Required field gatewayId is unset!')
- if self.notificationId is None:
- raise TProtocolException(message='Required field notificationId is unset!')
return
def __repr__(self):
@@ -22058,7 +20890,7 @@ class deleteNotification_args(object):
return not (self == other)
-class deleteNotification_result(object):
+class getAllGateways_result(object):
"""
Attributes:
- success
@@ -22069,7 +20901,7 @@ class deleteNotification_result(object):
"""
thrift_spec = (
- (0, TType.BOOL, 'success', None, None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.workspace.ttypes.Gateway, airavata.model.workspace.ttypes.Gateway.thrift_spec), False), None, ), # 0
(1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -22093,8 +20925,14 @@ class deleteNotification_result(object):
if ftype == TType.STOP:
break
if fid == 0:
- if ftype == TType.BOOL:
- self.success = iprot.readBool()
+ if ftype == TType.LIST:
+ self.success = []
+ (_etype10, _size7) = iprot.readListBegin()
+ for _i11 in range(_size7):
+ _elem12 = airavata.model.workspace.ttypes.Gateway()
+ _elem12.read(iprot)
+ self.success.append(_elem12)
+ iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 1:
@@ -22130,10 +20968,13 @@ class deleteNotification_result(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('deleteNotification_result')
+ oprot.writeStructBegin('getAllGateways_result')
if self.success is not None:
- oprot.writeFieldBegin('success', TType.BOOL, 0)
- oprot.writeBool(self.success)
+ oprot.writeFieldBegin('success', TType.LIST, 0)
+ oprot.writeListBegin(TType.STRUCT, len(self.success))
+ for iter13 in self.success:
+ iter13.write(oprot)
+ oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -22169,25 +21010,22 @@ class deleteNotification_result(object):
return not (self == other)
-class getNotification_args(object):
+class isGatewayExist_args(object):
"""
Attributes:
- authzToken
- gatewayId
- - notificationId
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
(2, TType.STRING, 'gatewayId', 'UTF8', None, ), # 2
- (3, TType.STRING, 'notificationId', 'UTF8', None, ), # 3
)
- def __init__(self, authzToken=None, gatewayId=None, notificationId=None,):
+ def __init__(self, authzToken=None, gatewayId=None,):
self.authzToken = authzToken
self.gatewayId = gatewayId
- self.notificationId = notificationId
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -22209,11 +21047,6 @@ class getNotification_args(object):
self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRING:
- self.notificationId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- else:
- iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -22223,7 +21056,7 @@ class getNotification_args(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getNotification_args')
+ oprot.writeStructBegin('isGatewayExist_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -22232,10 +21065,6 @@ class getNotification_args(object):
oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
oprot.writeFieldEnd()
- if self.notificationId is not None:
- oprot.writeFieldBegin('notificationId', TType.STRING, 3)
- oprot.writeString(self.notificationId.encode('utf-8') if sys.version_info[0] == 2 else self.notificationId)
- oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -22244,8 +21073,6 @@ class getNotification_args(object):
raise TProtocolException(message='Required field authzToken is unset!')
if self.gatewayId is None:
raise TProtocolException(message='Required field gatewayId is unset!')
- if self.notificationId is None:
- raise TProtocolException(message='Required field notificationId is unset!')
return
def __repr__(self):
@@ -22260,7 +21087,7 @@ class getNotification_args(object):
return not (self == other)
-class getNotification_result(object):
+class isGatewayExist_result(object):
"""
Attributes:
- success
@@ -22271,7 +21098,7 @@ class getNotification_result(object):
"""
thrift_spec = (
- (0, TType.STRUCT, 'success', (airavata.model.workspace.ttypes.Notification, airavata.model.workspace.ttypes.Notification.thrift_spec), None, ), # 0
+ (0, TType.BOOL, 'success', None, None, ), # 0
(1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -22295,9 +21122,8 @@ class getNotification_result(object):
if ftype == TType.STOP:
break
if fid == 0:
- if ftype == TType.STRUCT:
- self.success = airavata.model.workspace.ttypes.Notification()
- self.success.read(iprot)
+ if ftype == TType.BOOL:
+ self.success = iprot.readBool()
else:
iprot.skip(ftype)
elif fid == 1:
@@ -22333,10 +21159,10 @@ class getNotification_result(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getNotification_result')
+ oprot.writeStructBegin('isGatewayExist_result')
if self.success is not None:
- oprot.writeFieldBegin('success', TType.STRUCT, 0)
- self.success.write(oprot)
+ oprot.writeFieldBegin('success', TType.BOOL, 0)
+ oprot.writeBool(self.success)
oprot.writeFieldEnd()
if self.ire is not None:
oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -22372,22 +21198,22 @@ class getNotification_result(object):
return not (self == other)
-class getAllNotifications_args(object):
+class createNotification_args(object):
"""
Attributes:
- authzToken
- - gatewayId
+ - notification
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'gatewayId', 'UTF8', None, ), # 2
+ (2, TType.STRUCT, 'notification', (airavata.model.workspace.ttypes.Notification, airavata.model.workspace.ttypes.Notification.thrift_spec), None, ), # 2
)
- def __init__(self, authzToken=None, gatewayId=None,):
+ def __init__(self, authzToken=None, notification=None,):
self.authzToken = authzToken
- self.gatewayId = gatewayId
+ self.notification = notification
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -22405,8 +21231,9 @@ class getAllNotifications_args(object):
else:
iprot.skip(ftype)
elif fid == 2:
- if ftype == TType.STRING:
- self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ if ftype == TType.STRUCT:
+ self.notification = airavata.model.workspace.ttypes.Notification()
+ self.notification.read(iprot)
else:
iprot.skip(ftype)
else:
@@ -22418,14 +21245,14 @@ class getAllNotifications_args(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getAllNotifications_args')
+ oprot.writeStructBegin('createNotification_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
- oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
+ if self.notification is not None:
+ oprot.writeFieldBegin('notification', TType.STRUCT, 2)
+ self.notification.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -22433,8 +21260,8 @@ class getAllNotifications_args(object):
def validate(self):
if self.authzToken is None:
raise TProtocolException(message='Required field authzToken is unset!')
- if self.gatewayId is None:
- raise TProtocolException(message='Required field gatewayId is unset!')
+ if self.notification is None:
+ raise TProtocolException(message='Required field notification is unset!')
return
def __repr__(self):
@@ -22449,7 +21276,7 @@ class getAllNotifications_args(object):
return not (self == other)
-class getAllNotifications_result(object):
+class createNotification_result(object):
"""
Attributes:
- success
@@ -22460,7 +21287,7 @@ class getAllNotifications_result(object):
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.workspace.ttypes.Notification, airavata.model.workspace.ttypes.Notification.thrift_spec), False), None, ), # 0
+ (0, TType.STRING, 'success', 'UTF8', None, ), # 0
(1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -22484,14 +21311,8 @@ class getAllNotifications_result(object):
if ftype == TType.STOP:
break
if fid == 0:
- if ftype == TType.LIST:
- self.success = []
- (_etype17, _size14) = iprot.readListBegin()
- for _i18 in range(_size14):
- _elem19 = airavata.model.workspace.ttypes.Notification()
- _elem19.read(iprot)
- self.success.append(_elem19)
- iprot.readListEnd()
+ if ftype == TType.STRING:
+ self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
elif fid == 1:
@@ -22527,13 +21348,10 @@ class getAllNotifications_result(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getAllNotifications_result')
+ oprot.writeStructBegin('createNotification_result')
if self.success is not None:
- oprot.writeFieldBegin('success', TType.LIST, 0)
- oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter20 in self.success:
- iter20.write(oprot)
- oprot.writeListEnd()
+ oprot.writeFieldBegin('success', TType.STRING, 0)
+ oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
oprot.writeFieldEnd()
if self.ire is not None:
oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -22569,31 +21387,22 @@ class getAllNotifications_result(object):
return not (self == other)
-class generateAndRegisterSSHKeys_args(object):
+class updateNotification_args(object):
"""
Attributes:
- authzToken
- - gatewayId
- - userName
- - description
- - credentialOwnerType
+ - notification
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'gatewayId', 'UTF8', None, ), # 2
- (3, TType.STRING, 'userName', 'UTF8', None, ), # 3
- (4, TType.STRING, 'description', 'UTF8', None, ), # 4
- (5, TType.I32, 'credentialOwnerType', None, None, ), # 5
+ (2, TType.STRUCT, 'notification', (airavata.model.workspace.ttypes.Notification, airavata.model.workspace.ttypes.Notification.thrift_spec), None, ), # 2
)
- def __init__(self, authzToken=None, gatewayId=None, userName=None, description=None, credentialOwnerType=None,):
+ def __init__(self, authzToken=None, notification=None,):
self.authzToken = authzToken
- self.gatewayId = gatewayId
- self.userName = userName
- self.description = description
- self.credentialOwnerType = credentialOwnerType
+ self.notification = notification
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -22611,23 +21420,9 @@ class generateAndRegisterSSHKeys_args(object):
else:
iprot.skip(ftype)
elif fid == 2:
- if ftype == TType.STRING:
- self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRING:
- self.userName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.STRING:
- self.description = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 5:
- if ftype == TType.I32:
- self.credentialOwnerType = iprot.readI32()
+ if ftype == TType.STRUCT:
+ self.notification = airavata.model.workspace.ttypes.Notification()
+ self.notification.read(iprot)
else:
iprot.skip(ftype)
else:
@@ -22639,26 +21434,14 @@ class generateAndRegisterSSHKeys_args(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('generateAndRegisterSSHKeys_args')
+ oprot.writeStructBegin('updateNotification_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
- oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
- oprot.writeFieldEnd()
- if self.userName is not None:
- oprot.writeFieldBegin('userName', TType.STRING, 3)
- oprot.writeString(self.userName.encode('utf-8') if sys.version_info[0] == 2 else self.userName)
- oprot.writeFieldEnd()
- if self.description is not None:
- oprot.writeFieldBegin('description', TType.STRING, 4)
- oprot.writeString(self.description.encode('utf-8') if sys.version_info[0] == 2 else self.description)
- oprot.writeFieldEnd()
- if self.credentialOwnerType is not None:
- oprot.writeFieldBegin('credentialOwnerType', TType.I32, 5)
- oprot.writeI32(self.credentialOwnerType)
+ if self.notification is not None:
+ oprot.writeFieldBegin('notification', TType.STRUCT, 2)
+ self.notification.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -22666,10 +21449,8 @@ class generateAndRegisterSSHKeys_args(object):
def validate(self):
if self.authzToken is None:
raise TProtocolException(message='Required field authzToken is unset!')
- if self.gatewayId is None:
- raise TProtocolException(message='Required field gatewayId is unset!')
- if self.userName is None:
- raise TProtocolException(message='Required field userName is unset!')
+ if self.notification is None:
+ raise TProtocolException(message='Required field notification is unset!')
return
def __repr__(self):
@@ -22684,27 +21465,30 @@ class generateAndRegisterSSHKeys_args(object):
return not (self == other)
-class generateAndRegisterSSHKeys_result(object):
+class updateNotification_result(object):
"""
Attributes:
- success
- ire
- ace
- ase
+ - ae
"""
thrift_spec = (
- (0, TType.STRING, 'success', 'UTF8', None, ), # 0
+ (0, TType.BOOL, 'success', None, None, ), # 0
(1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
+ (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
)
- def __init__(self, success=None, ire=None, ace=None, ase=None,):
+ def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
self.success = success
self.ire = ire
self.ace = ace
self.ase = ase
+ self.ae = ae
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -22716,8 +21500,8 @@ class generateAndRegisterSSHKeys_result(object):
if ftype == TType.STOP:
break
if fid == 0:
- if ftype == TType.STRING:
- self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ if ftype == TType.BOOL:
+ self.success = iprot.readBool()
else:
iprot.skip(ftype)
elif fid == 1:
@@ -22738,6 +21522,12 @@ class generateAndRegisterSSHKeys_result(object):
self.ase.read(iprot)
else:
iprot.skip(ftype)
+ elif fid == 4:
+ if ftype == TType.STRUCT:
+ self.ae = airavata.api.error.ttypes.AuthorizationException()
+ self.ae.read(iprot)
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -22747,10 +21537,10 @@ class generateAndRegisterSSHKeys_result(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('generateAndRegisterSSHKeys_result')
+ oprot.writeStructBegin('updateNotification_result')
if self.success is not None:
- oprot.writeFieldBegin('success', TType.STRING, 0)
- oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
+ oprot.writeFieldBegin('success', TType.BOOL, 0)
+ oprot.writeBool(self.success)
oprot.writeFieldEnd()
if self.ire is not None:
oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -22764,6 +21554,10 @@ class generateAndRegisterSSHKeys_result(object):
oprot.writeFieldBegin('ase', TType.STRUCT, 3)
self.ase.write(oprot)
oprot.writeFieldEnd()
+ if self.ae is not None:
+ oprot.writeFieldBegin('ae', TType.STRUCT, 4)
+ self.ae.write(oprot)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -22782,34 +21576,25 @@ class generateAndRegisterSSHKeys_result(object):
return not (self == other)
-class registerPwdCredential_args(object):
+class deleteNotification_args(object):
"""
Attributes:
- authzToken
- gatewayId
- - portalUserName
- - loginUserName
- - password
- - description
+ - notificationId
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
(2, TType.STRING, 'gatewayId', 'UTF8', None, ), # 2
- (3, TType.STRING, 'portalUserName', 'UTF8', None, ), # 3
- (4, TType.STRING, 'loginUserName', 'UTF8', None, ), # 4
- (5, TType.STRING, 'password', 'UTF8', None, ), # 5
- (6, TType.STRING, 'description', 'UTF8', None, ), # 6
+ (3, TType.STRING, 'notificationId', 'UTF8', None, ), # 3
)
- def __init__(self, authzToken=None, gatewayId=None, portalUserName=None, loginUserName=None, password=None, description=None,):
+ def __init__(self, authzToken=None, gatewayId=None, notificationId=None,):
self.authzToken = authzToken
self.gatewayId = gatewayId
- self.portalUserName = portalUserName
- self.loginUserName = loginUserName
- self.password = password
- self.description = description
+ self.notificationId = notificationId
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -22833,22 +21618,7 @@ class registerPwdCredential_args(object):
iprot.skip(ftype)
elif fid == 3:
if ftype == TType.STRING:
- self.portalUserName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.STRING:
- self.loginUserName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 5:
- if ftype == TType.STRING:
- self.password = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 6:
- if ftype == TType.STRING:
- self.description = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.notificationId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
else:
@@ -22860,7 +21630,7 @@ class registerPwdCredential_args(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('registerPwdCredential_args')
+ oprot.writeStructBegin('deleteNotification_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -22869,21 +21639,9 @@ class registerPwdCredential_args(object):
oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
oprot.writeFieldEnd()
- if self.portalUserName is not None:
- oprot.writeFieldBegin('portalUserName', TType.STRING, 3)
- oprot.writeString(self.portalUserName.encode('utf-8') if sys.version_info[0] == 2 else self.portalUserName)
- oprot.writeFieldEnd()
- if self.loginUserName is not None:
- oprot.writeFieldBegin('loginUserName', TType.STRING, 4)
- oprot.writeString(self.loginUserName.encode('utf-8') if sys.version_info[0] == 2 else self.loginUserName)
- oprot.writeFieldEnd()
- if self.password is not None:
- oprot.writeFieldBegin('password', TType.STRING, 5)
- oprot.writeString(self.password.encode('utf-8') if sys.version_info[0] == 2 else self.password)
- oprot.writeFieldEnd()
- if self.description is not None:
- oprot.writeFieldBegin('description', TType.STRING, 6)
- oprot.writeString(self.description.encode('utf-8') if sys.version_info[0] == 2 else self.description)
+ if self.notificationId is not None:
+ oprot.writeFieldBegin('notificationId', TType.STRING, 3)
+ oprot.writeString(self.notificationId.encode('utf-8') if sys.version_info[0] == 2 else self.notificationId)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -22893,14 +21651,8 @@ class registerPwdCredential_args(object):
raise TProtocolException(message='Required field authzToken is unset!')
if self.gatewayId is None:
raise TProtocolException(message='Required field gatewayId is unset!')
- if self.portalUserName is None:
- raise TProtocolException(message='Required field portalUserName is unset!')
- if self.loginUserName is None:
- raise TProtocolException(message='Required field loginUserName is unset!')
- if self.password is None:
- raise TProtocolException(message='Required field password is unset!')
- if self.description is None:
- raise TProtocolException(message='Required field description is unset!')
+ if self.notificationId is None:
+ raise TProtocolException(message='Required field notificationId is unset!')
return
def __repr__(self):
@@ -22915,27 +21667,30 @@ class registerPwdCredential_args(object):
return not (self == other)
-class registerPwdCredential_result(object):
+class deleteNotification_result(object):
"""
Attributes:
- success
- ire
- ace
- ase
+ - ae
"""
thrift_spec = (
- (0, TType.STRING, 'success', 'UTF8', None, ), # 0
+ (0, TType.BOOL, 'success', None, None, ), # 0
(1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
+ (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
)
- def __init__(self, success=None, ire=None, ace=None, ase=None,):
+ def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
self.success = success
self.ire = ire
self.ace = ace
self.ase = ase
+ self.ae = ae
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -22947,8 +21702,8 @@ class registerPwdCredential_result(object):
if ftype == TType.STOP:
break
if fid == 0:
- if ftype == TType.STRING:
- self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ if ftype == TType.BOOL:
+ self.success = iprot.readBool()
else:
iprot.skip(ftype)
elif fid == 1:
@@ -22969,6 +21724,12 @@ class registerPwdCredential_result(object):
self.ase.read(iprot)
else:
iprot.skip(ftype)
+ elif fid == 4:
+ if ftype == TType.STRUCT:
+ self.ae = airavata.api.error.ttypes.AuthorizationException()
+ self.ae.read(iprot)
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -22978,10 +21739,10 @@ class registerPwdCredential_result(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('registerPwdCredential_result')
+ oprot.writeStructBegin('deleteNotification_result')
if self.success is not None:
- oprot.writeFieldBegin('success', TType.STRING, 0)
- oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
+ oprot.writeFieldBegin('success', TType.BOOL, 0)
+ oprot.writeBool(self.success)
oprot.writeFieldEnd()
if self.ire is not None:
oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -22995,6 +21756,10 @@ class registerPwdCredential_result(object):
oprot.writeFieldBegin('ase', TType.STRUCT, 3)
self.ase.write(oprot)
oprot.writeFieldEnd()
+ if self.ae is not None:
+ oprot.writeFieldBegin('ae', TType.STRUCT, 4)
+ self.ae.write(oprot)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -23013,25 +21778,25 @@ class registerPwdCredential_result(object):
return not (self == other)
-class getSSHPubKey_args(object):
+class getNotification_args(object):
"""
Attributes:
- authzToken
- - airavataCredStoreToken
- gatewayId
+ - notificationId
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'airavataCredStoreToken', 'UTF8', None, ), # 2
- (3, TType.STRING, 'gatewayId', 'UTF8', None, ), # 3
+ (2, TType.STRING, 'gatewayId', 'UTF8', None, ), # 2
+ (3, TType.STRING, 'notificationId', 'UTF8', None, ), # 3
)
- def __init__(self, authzToken=None, airavataCredStoreToken=None, gatewayId=None,):
+ def __init__(self, authzToken=None, gatewayId=None, notificationId=None,):
self.authzToken = authzToken
- self.airavataCredStoreToken = airavataCredStoreToken
self.gatewayId = gatewayId
+ self.notificationId = notificationId
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -23050,12 +21815,12 @@ class getSSHPubKey_args(object):
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.airavataCredStoreToken = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
elif fid == 3:
if ftype == TType.STRING:
- self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.notificationId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
else:
@@ -23067,29 +21832,29 @@ class getSSHPubKey_args(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getSSHPubKey_args')
+ oprot.writeStructBegin('getNotification_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.airavataCredStoreToken is not None:
- oprot.writeFieldBegin('airavataCredStoreToken', TType.STRING, 2)
- oprot.writeString(self.airavataCredStoreToken.encode('utf-8') if sys.version_info[0] == 2 else self.airavataCredStoreToken)
- oprot.writeFieldEnd()
if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 3)
+ oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
oprot.writeFieldEnd()
+ if self.notificationId is not None:
+ oprot.writeFieldBegin('notificationId', TType.STRING, 3)
+ oprot.writeString(self.notificationId.encode('utf-8') if sys.version_info[0] == 2 else self.notificationId)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
def validate(self):
if self.authzToken is None:
raise TProtocolException(message='Required field authzToken is unset!')
- if self.airavataCredStoreToken is None:
- raise TProtocolException(message='Required field airavataCredStoreToken is unset!')
if self.gatewayId is None:
raise TProtocolException(message='Required field gatewayId is unset!')
+ if self.notificationId is None:
+ raise TProtocolException(message='Required field notificationId is unset!')
return
def __repr__(self):
@@ -23104,27 +21869,30 @@ class getSSHPubKey_args(object):
return not (self == other)
-class getSSHPubKey_result(object):
+class getNotification_result(object):
"""
Attributes:
- success
- ire
- ace
- ase
+ - ae
"""
thrift_spec = (
- (0, TType.STRING, 'success', 'UTF8', None, ), # 0
+ (0, TType.STRUCT, 'success', (airavata.model.workspace.ttypes.Notification, airavata.model.workspace.ttypes.Notification.thrift_spec), None, ), # 0
(1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
+ (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
)
- def __init__(self, success=None, ire=None, ace=None, ase=None,):
+ def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
self.success = success
self.ire = ire
self.ace = ace
self.ase = ase
+ self.ae = ae
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -23136,8 +21904,9 @@ class getSSHPubKey_result(object):
if ftype == TType.STOP:
break
if fid == 0:
- if ftype == TType.STRING:
- self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ if ftype == TType.STRUCT:
+ self.success = airavata.model.workspace.ttypes.Notification()
+ self.success.read(iprot)
else:
iprot.skip(ftype)
elif fid == 1:
@@ -23158,6 +21927,12 @@ class getSSHPubKey_result(object):
self.ase.read(iprot)
else:
iprot.skip(ftype)
+ elif fid == 4:
+ if ftype == TType.STRUCT:
+ self.ae = airavata.api.error.ttypes.AuthorizationException()
+ self.ae.read(iprot)
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -23167,10 +21942,10 @@ class getSSHPubKey_result(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getSSHPubKey_result')
+ oprot.writeStructBegin('getNotification_result')
if self.success is not None:
- oprot.writeFieldBegin('success', TType.STRING, 0)
- oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
+ oprot.writeFieldBegin('success', TType.STRUCT, 0)
+ self.success.write(oprot)
oprot.writeFieldEnd()
if self.ire is not None:
oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -23184,6 +21959,10 @@ class getSSHPubKey_result(object):
oprot.writeFieldBegin('ase', TType.STRUCT, 3)
self.ase.write(oprot)
oprot.writeFieldEnd()
+ if self.ae is not None:
+ oprot.writeFieldBegin('ae', TType.STRUCT, 4)
+ self.ae.write(oprot)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -23202,7 +21981,7 @@ class getSSHPubKey_result(object):
return not (self == other)
-class getAllGatewaySSHPubKeys_args(object):
+class getAllNotifications_args(object):
"""
Attributes:
- authzToken
@@ -23248,7 +22027,7 @@ class getAllGatewaySSHPubKeys_args(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getAllGatewaySSHPubKeys_args')
+ oprot.writeStructBegin('getAllNotifications_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -23279,27 +22058,30 @@ class getAllGatewaySSHPubKeys_args(object):
return not (self == other)
-class getAllGatewaySSHPubKeys_result(object):
+class getAllNotifications_result(object):
"""
Attributes:
- success
- ire
- ace
- ase
+ - ae
"""
thrift_spec = (
- (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.workspace.ttypes.Notification, airavata.model.workspace.ttypes.Notification.thrift_spec), False), None, ), # 0
(1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
+ (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
)
- def __init__(self, success=None, ire=None, ace=None, ase=None,):
+ def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
self.success = success
self.ire = ire
self.ace = ace
self.ase = ase
+ self.ae = ae
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -23311,14 +22093,14 @@ class getAllGatewaySSHPubKeys_result(object):
if ftype == TType.STOP:
break
if fid == 0:
- if ftype == TType.MAP:
- self.success = {}
- (_ktype22, _vtype23, _size21) = iprot.readMapBegin()
- for _i25 in range(_size21):
- _key26 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- _val27 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- self.success[_key26] = _val27
- iprot.readMapEnd()
+ if ftype == TType.LIST:
+ self.success = []
+ (_etype17, _size14) = iprot.readListBegin()
+ for _i18 in range(_size14):
+ _elem19 = airavata.model.workspace.ttypes.Notification()
+ _elem19.read(iprot)
+ self.success.append(_elem19)
+ iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 1:
@@ -23339,6 +22121,12 @@ class getAllGatewaySSHPubKeys_result(object):
self.ase.read(iprot)
else:
iprot.skip(ftype)
+ elif fid == 4:
+ if ftype == TType.STRUCT:
+ self.ae = airavata.api.error.ttypes.AuthorizationException()
+ self.ae.read(iprot)
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -23348,14 +22136,13 @@ class getAllGatewaySSHPubKeys_result(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getAllGatewaySSHPubKeys_result')
+ oprot.writeStructBegin('getAllNotifications_result')
if self.success is not None:
- oprot.writeFieldBegin('success', TType.MAP, 0)
- oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
- for kiter28, viter29 in self.success.items():
- oprot.writeString(kiter28.encode('utf-8') if sys.version_info[0] == 2 else kiter28)
- oprot.writeString(viter29.encode('utf-8') if sys.version_info[0] == 2 else viter29)
- oprot.writeMapEnd()
+ oprot.writeFieldBegin('success', TType.LIST, 0)
+ oprot.writeListBegin(TType.STRUCT, len(self.success))
+ for iter20 in self.success:
+ iter20.write(oprot)
+ oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -23369,6 +22156,10 @@ class getAllGatewaySSHPubKeys_result(object):
oprot.writeFieldBegin('ase', TType.STRUCT, 3)
self.ase.write(oprot)
oprot.writeFieldEnd()
+ if self.ae is not None:
+ oprot.writeFieldBegin('ae', TType.STRUCT, 4)
+ self.ae.write(oprot)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -23387,25 +22178,24 @@ class getAllGatewaySSHPubKeys_result(object):
return not (self == other)
-class getAllCredentialSummaryForGateway_args(object):
+class generateAndRegisterSSHKeys_args(object):
"""
Attributes:
- authzToken
- - type
- - gatewayId
+ - description
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.I32, 'type', None, None, ), # 2
- (3, TType.STRING, 'gatewayId', 'UTF8', None, ), # 3
+ None, # 2
+ None, # 3
+ (4, TType.STRING, 'description', 'UTF8', None, ), # 4
)
- def __init__(self, authzToken=None, type=None, gatewayId=None,):
+ def __init__(self, authzToken=None, description=None,):
self.authzToken = authzToken
- self.type = type
- self.gatewayId = gatewayId
+ self.description = description
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -23422,14 +22212,9 @@ class getAllCredentialSummaryForGateway_args(object):
self.authzToken.read(iprot)
else:
iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.I32:
- self.type = iprot.readI32()
- else:
- iprot.skip(ftype)
- elif fid == 3:
+ elif fid == 4:
if ftype == TType.STRING:
- self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.description = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
else:
@@ -23441,18 +22226,14 @@ class getAllCredentialSummaryForGateway_args(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getAllCredentialSummaryForGateway_args')
+ oprot.writeStructBegin('generateAndRegisterSSHKeys_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.type is not None:
- oprot.writeFieldBegin('type', TType.I32, 2)
- oprot.writeI32(self.type)
- oprot.writeFieldEnd()
- if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 3)
- oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
+ if self.description is not None:
+ oprot.writeFieldBegin('description', TType.STRING, 4)
+ oprot.writeString(self.description.encode('utf-8') if sys.version_info[0] == 2 else self.description)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -23460,10 +22241,6 @@ class getAllCredentialSummaryForGateway_args(object):
def validate(self):
if self.authzToken is None:
raise TProtocolException(message='Required field authzToken is unset!')
- if self.type is None:
- raise TProtocolException(message='Required field type is unset!')
- if self.gatewayId is None:
- raise TProtocolException(message='Required field gatewayId is unset!')
return
def __repr__(self):
@@ -23478,7 +22255,7 @@ class getAllCredentialSummaryForGateway_args(object):
return not (self == other)
-class getAllCredentialSummaryForGateway_result(object):
+class generateAndRegisterSSHKeys_result(object):
"""
Attributes:
- success
@@ -23488,7 +22265,7 @@ class getAllCredentialSummaryForGateway_result(object):
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.credential.store.ttypes.CredentialSummary, airavata.model.credential.store.ttypes.CredentialSummary.thrift_spec), False), None, ), # 0
+ (0, TType.STRING, 'success', 'UTF8', None, ), # 0
(1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -23510,14 +22287,8 @@ class getAllCredentialSummaryForGateway_result(object):
if ftype == TType.STOP:
break
if fid == 0:
- if ftype == TType.LIST:
- self.success = []
- (_etype33, _size30) = iprot.readListBegin()
- for _i34 in range(_size30):
- _elem35 = airavata.model.credential.store.ttypes.CredentialSummary()
- _elem35.read(iprot)
- self.success.append(_elem35)
- iprot.readListEnd()
+ if ftype == TType.STRING:
+ self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
elif fid == 1:
@@ -23547,13 +22318,10 @@ class getAllCredentialSummaryForGateway_result(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getAllCredentialSummaryForGateway_result')
+ oprot.writeStructBegin('generateAndRegisterSSHKeys_result')
if self.success is not None:
- oprot.writeFieldBegin('success', TType.LIST, 0)
- oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter36 in self.success:
- iter36.write(oprot)
- oprot.writeListEnd()
+ oprot.writeFieldBegin('success', TType.STRING, 0)
+ oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
oprot.writeFieldEnd()
if self.ire is not None:
oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -23585,28 +22353,30 @@ class getAllCredentialSummaryForGateway_result(object):
return not (self == other)
-class getAllCredentialSummaryForUsersInGateway_args(object):
+class registerPwdCredential_args(object):
"""
Attributes:
- authzToken
- - type
- - gatewayId
- - userId
+ - loginUserName
+ - password
+ - description
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.I32, 'type', None, None, ), # 2
- (3, TType.STRING, 'gatewayId', 'UTF8', None, ), # 3
- (4, TType.STRING, 'userId', 'UTF8', None, ), # 4
+ None, # 2
+ None, # 3
+ (4, TType.STRING, 'loginUserName', 'UTF8', None, ), # 4
+ (5, TType.STRING, 'password', 'UTF8', None, ), # 5
+ (6, TType.STRING, 'description', 'UTF8', None, ), # 6
)
- def __init__(self, authzToken=None, type=None, gatewayId=None, userId=None,):
+ def __init__(self, authzToken=None, loginUserName=None, password=None, description=None,):
self.authzToken = authzToken
- self.type = type
- self.gatewayId = gatewayId
- self.userId = userId
+ self.loginUserName = loginUserName
+ self.password = password
+ self.description = description
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -23623,19 +22393,19 @@ class getAllCredentialSummaryForUsersInGateway_args(object):
self.authzToken.read(iprot)
else:
iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.I32:
- self.type = iprot.readI32()
+ elif fid == 4:
+ if ftype == TType.STRING:
+ self.loginUserName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 3:
+ elif fid == 5:
if ftype == TType.STRING:
- self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.password = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 4:
+ elif fid == 6:
if ftype == TType.STRING:
- self.userId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.description = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
else:
@@ -23647,22 +22417,22 @@ class getAllCredentialSummaryForUsersInGateway_args(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getAllCredentialSummaryForUsersInGateway_args')
+ oprot.writeStructBegin('registerPwdCredential_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.type is not None:
- oprot.writeFieldBegin('type', TType.I32, 2)
- oprot.writeI32(self.type)
+ if self.loginUserName is not None:
+ oprot.writeFieldBegin('loginUserName', TType.STRING, 4)
+ oprot.writeString(self.loginUserName.encode('utf-8') if sys.version_info[0] == 2 else self.loginUserName)
oprot.writeFieldEnd()
- if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 3)
- oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
+ if self.password is not None:
+ oprot.writeFieldBegin('password', TType.STRING, 5)
+ oprot.writeString(self.password.encode('utf-8') if sys.version_info[0] == 2 else self.password)
oprot.writeFieldEnd()
- if self.userId is not None:
- oprot.writeFieldBegin('userId', TType.STRING, 4)
- oprot.writeString(self.userId.encode('utf-8') if sys.version_info[0] == 2 else self.userId)
+ if self.description is not None:
+ oprot.writeFieldBegin('description', TType.STRING, 6)
+ oprot.writeString(self.description.encode('utf-8') if sys.version_info[0] == 2 else self.description)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -23670,12 +22440,12 @@ class getAllCredentialSummaryForUsersInGateway_args(object):
def validate(self):
if self.authzToken is None:
raise TProtocolException(message='Required field authzToken is unset!')
- if self.type is None:
- raise TProtocolException(message='Required field type is unset!')
- if self.gatewayId is None:
- raise TProtocolException(message='Required field gatewayId is unset!')
- if self.userId is None:
- raise TProtocolException(message='Required field userId is unset!')
+ if self.loginUserName is None:
+ raise TProtocolException(message='Required field loginUserName is unset!')
+ if self.password is None:
+ raise TProtocolException(message='Required field password is unset!')
+ if self.description is None:
+ raise TProtocolException(message='Required field description is unset!')
return
def __repr__(self):
@@ -23690,7 +22460,7 @@ class getAllCredentialSummaryForUsersInGateway_args(object):
return not (self == other)
-class getAllCredentialSummaryForUsersInGateway_result(object):
+class registerPwdCredential_result(object):
"""
Attributes:
- success
@@ -23700,7 +22470,7 @@ class getAllCredentialSummaryForUsersInGateway_result(object):
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.credential.store.ttypes.CredentialSummary, airavata.model.credential.store.ttypes.CredentialSummary.thrift_spec), False), None, ), # 0
+ (0, TType.STRING, 'success', 'UTF8', None, ), # 0
(1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -23722,14 +22492,8 @@ class getAllCredentialSummaryForUsersInGateway_result(object):
if ftype == TType.STOP:
break
if fid == 0:
- if ftype == TType.LIST:
- self.success = []
- (_etype40, _size37) = iprot.readListBegin()
- for _i41 in range(_size37):
- _elem42 = airavata.model.credential.store.ttypes.CredentialSummary()
- _elem42.read(iprot)
- self.success.append(_elem42)
- iprot.readListEnd()
+ if ftype == TType.STRING:
+ self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
elif fid == 1:
@@ -23759,13 +22523,10 @@ class getAllCredentialSummaryForUsersInGateway_result(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getAllCredentialSummaryForUsersInGateway_result')
+ oprot.writeStructBegin('registerPwdCredential_result')
if self.success is not None:
- oprot.writeFieldBegin('success', TType.LIST, 0)
- oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter43 in self.success:
- iter43.write(oprot)
- oprot.writeListEnd()
+ oprot.writeFieldBegin('success', TType.STRING, 0)
+ oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
oprot.writeFieldEnd()
if self.ire is not None:
oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -23797,22 +22558,25 @@ class getAllCredentialSummaryForUsersInGateway_result(object):
return not (self == other)
-class getAllGatewayPWDCredentials_args(object):
+class getCredentialSummary_args(object):
"""
Attributes:
- authzToken
- - gatewayId
+ - type
+ - tokenId
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'gatewayId', 'UTF8', None, ), # 2
+ (2, TType.I32, 'type', None, None, ), # 2
+ (3, TType.STRING, 'tokenId', 'UTF8', None, ), # 3
)
- def __init__(self, authzToken=None, gatewayId=None,):
+ def __init__(self, authzToken=None, type=None, tokenId=None,):
self.authzToken = authzToken
- self.gatewayId = gatewayId
+ self.type = type
+ self.tokenId = tokenId
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -23830,8 +22594,13 @@ class getAllGatewayPWDCredentials_args(object):
else:
iprot.skip(ftype)
elif fid == 2:
+ if ftype == TType.I32:
+ self.type = iprot.readI32()
+ else:
+ iprot.skip(ftype)
+ elif fid == 3:
if ftype == TType.STRING:
- self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.tokenId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
else:
@@ -23843,14 +22612,18 @@ class getAllGatewayPWDCredentials_args(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getAllGatewayPWDCredentials_args')
+ oprot.writeStructBegin('getCredentialSummary_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
- oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
+ if self.type is not None:
+ oprot.writeFieldBegin('type', TType.I32, 2)
+ oprot.writeI32(self.type)
+ oprot.writeFieldEnd()
+ if self.tokenId is not None:
+ oprot.writeFieldBegin('tokenId', TType.STRING, 3)
+ oprot.writeString(self.tokenId.encode('utf-8') if sys.version_info[0] == 2 else self.tokenId)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -23858,8 +22631,10 @@ class getAllGatewayPWDCredentials_args(object):
def validate(self):
if self.authzToken is None:
raise TProtocolException(message='Required field authzToken is unset!')
- if self.gatewayId is None:
- raise TProtocolException(message='Required field gatewayId is unset!')
+ if self.type is None:
+ raise TProtocolException(message='Required field type is unset!')
+ if self.tokenId is None:
+ raise TProtocolException(message='Required field tokenId is unset!')
return
def __repr__(self):
@@ -23874,17 +22649,206 @@ class getAllGatewayPWDCredentials_args(object):
return not (self == other)
-class getAllGatewayPWDCredentials_result(object):
+class getCredentialSummary_result(object):
"""
Attributes:
- success
- ire
- ace
- ase
+ - ae
"""
thrift_spec = (
- (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ), # 0
+ (0, TType.STRUCT, 'success', (airavata.model.credential.store.ttypes.CredentialSummary, airavata.model.credential.store.ttypes.CredentialSummary.thrift_spec), None, ), # 0
+ (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
+ (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
+ (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
+ (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
+ )
+
+ def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
+ self.success = success
+ self.ire = ire
+ self.ace = ace
+ self.ase = ase
+ self.ae = ae
+
+ def read(self, iprot):
+ if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+ iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 0:
+ if ftype == TType.STRUCT:
+ self.success = airavata.model.credential.store.ttypes.CredentialSummary()
+ self.success.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 1:
+ if ftype == TType.STRUCT:
+ self.ire = airavata.api.error.ttypes.InvalidRequestException()
+ self.ire.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.STRUCT:
+ self.ace = airavata.api.error.ttypes.AiravataClientException()
+ self.ace.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 3:
+ if ftype == TType.STRUCT:
+ self.ase = airavata.api.error.ttypes.AiravataSystemException()
+ self.ase.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 4:
+ if ftype == TType.STRUCT:
+ self.ae = airavata.api.error.ttypes.AuthorizationException()
+ self.ae.read(iprot)
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot._fast_encode is not None and self.thrift_spec is not None:
+ oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('getCredentialSummary_result')
+ if self.success is not None:
+ oprot.writeFieldBegin('success', TType.STRUCT, 0)
+ self.success.write(oprot)
+ oprot.writeFieldEnd()
+ if self.ire is not None:
+ oprot.writeFieldBegin('ire', TType.STRUCT, 1)
+ self.ire.write(oprot)
+ oprot.writeFieldEnd()
+ if self.ace is not None:
+ oprot.writeFieldBegin('ace', TType.STRUCT, 2)
+ self.ace.write(oprot)
+ oprot.writeFieldEnd()
+ if self.ase is not None:
+ oprot.writeFieldBegin('ase', TType.STRUCT, 3)
+ self.ase.write(oprot)
+ oprot.writeFieldEnd()
+ if self.ae is not None:
+ oprot.writeFieldBegin('ae', TType.STRUCT, 4)
+ self.ae.write(oprot)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ return
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.items()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+
+class getAllCredentialSummaries_args(object):
+ """
+ Attributes:
+ - authzToken
+ - type
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
+ (2, TType.I32, 'type', None, None, ), # 2
+ )
+
+ def __init__(self, authzToken=None, type=None,):
+ self.authzToken = authzToken
+ self.type = type
+
+ def read(self, iprot):
+ if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+ iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 1:
+ if ftype == TType.STRUCT:
+ self.authzToken = airavata.model.security.ttypes.AuthzToken()
+ self.authzToken.read(iprot)
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.I32:
+ self.type = iprot.readI32()
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot._fast_encode is not None and self.thrift_spec is not None:
+ oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('getAllCredentialSummaries_args')
+ if self.authzToken is not None:
+ oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
+ self.authzToken.write(oprot)
+ oprot.writeFieldEnd()
+ if self.type is not None:
+ oprot.writeFieldBegin('type', TType.I32, 2)
+ oprot.writeI32(self.type)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ if self.authzToken is None:
+ raise TProtocolException(message='Required field authzToken is unset!')
+ if self.type is None:
+ raise TProtocolException(message='Required field type is unset!')
+ return
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.items()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+
+class getAllCredentialSummaries_result(object):
+ """
+ Attributes:
+ - success
+ - ire
+ - ace
+ - ase
+ """
+
+ thrift_spec = (
+ (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.credential.store.ttypes.CredentialSummary, airavata.model.credential.store.ttypes.CredentialSummary.thrift_spec), False), None, ), # 0
(1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -23906,14 +22870,14 @@ class getAllGatewayPWDCredentials_result(object):
if ftype == TType.STOP:
break
if fid == 0:
- if ftype == TType.MAP:
- self.success = {}
- (_ktype45, _vtype46, _size44) = iprot.readMapBegin()
- for _i48 in range(_size44):
- _key49 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- _val50 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- self.success[_key49] = _val50
- iprot.readMapEnd()
+ if ftype == TType.LIST:
+ self.success = []
+ (_etype24, _size21) = iprot.readListBegin()
+ for _i25 in range(_size21):
+ _elem26 = airavata.model.credential.store.ttypes.CredentialSummary()
+ _elem26.read(iprot)
+ self.success.append(_elem26)
+ iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 1:
@@ -23943,14 +22907,13 @@ class getAllGatewayPWDCredentials_result(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getAllGatewayPWDCredentials_result')
+ oprot.writeStructBegin('getAllCredentialSummaries_result')
if self.success is not None:
- oprot.writeFieldBegin('success', TType.MAP, 0)
- oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
- for kiter51, viter52 in self.success.items():
- oprot.writeString(kiter51.encode('utf-8') if sys.version_info[0] == 2 else kiter51)
- oprot.writeString(viter52.encode('utf-8') if sys.version_info[0] == 2 else viter52)
- oprot.writeMapEnd()
+ oprot.writeFieldBegin('success', TType.LIST, 0)
+ oprot.writeListBegin(TType.STRUCT, len(self.success))
+ for iter27 in self.success:
+ iter27.write(oprot)
+ oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -24080,6 +23043,7 @@ class deleteSSHPubKey_result(object):
- ire
- ace
- ase
+ - ae
"""
thrift_spec = (
@@ -24087,13 +23051,15 @@ class deleteSSHPubKey_result(object):
(1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
+ (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
)
- def __init__(self, success=None, ire=None, ace=None, ase=None,):
+ def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
self.success = success
self.ire = ire
self.ace = ace
self.ase = ase
+ self.ae = ae
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -24127,6 +23093,12 @@ class deleteSSHPubKey_result(object):
self.ase.read(iprot)
else:
iprot.skip(ftype)
+ elif fid == 4:
+ if ftype == TType.STRUCT:
+ self.ae = airavata.api.error.ttypes.AuthorizationException()
+ self.ae.read(iprot)
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -24153,6 +23125,10 @@ class deleteSSHPubKey_result(object):
oprot.writeFieldBegin('ase', TType.STRUCT, 3)
self.ase.write(oprot)
oprot.writeFieldEnd()
+ if self.ae is not None:
+ oprot.writeFieldBegin('ae', TType.STRUCT, 4)
+ self.ae.write(oprot)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -24269,6 +23245,7 @@ class deletePWDCredential_result(object):
- ire
- ace
- ase
+ - ae
"""
thrift_spec = (
@@ -24276,13 +23253,15 @@ class deletePWDCredential_result(object):
(1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
+ (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
)
- def __init__(self, success=None, ire=None, ace=None, ase=None,):
+ def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
self.success = success
self.ire = ire
self.ace = ace
self.ase = ase
+ self.ae = ae
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -24316,6 +23295,12 @@ class deletePWDCredential_result(object):
self.ase.read(iprot)
else:
iprot.skip(ftype)
+ elif fid == 4:
+ if ftype == TType.STRUCT:
+ self.ae = airavata.api.error.ttypes.AuthorizationException()
+ self.ae.read(iprot)
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -24342,6 +23327,10 @@ class deletePWDCredential_result(object):
oprot.writeFieldBegin('ase', TType.STRUCT, 3)
self.ase.write(oprot)
oprot.writeFieldEnd()
+ if self.ae is not None:
+ oprot.writeFieldBegin('ae', TType.STRUCT, 4)
+ self.ae.write(oprot)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -25327,11 +24316,11 @@ class getUserProjects_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype56, _size53) = iprot.readListBegin()
- for _i57 in range(_size53):
- _elem58 = airavata.model.workspace.ttypes.Project()
- _elem58.read(iprot)
- self.success.append(_elem58)
+ (_etype31, _size28) = iprot.readListBegin()
+ for _i32 in range(_size28):
+ _elem33 = airavata.model.workspace.ttypes.Project()
+ _elem33.read(iprot)
+ self.success.append(_elem33)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -25372,8 +24361,8 @@ class getUserProjects_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter59 in self.success:
- iter59.write(oprot)
+ for iter34 in self.success:
+ iter34.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -25467,11 +24456,11 @@ class searchProjects_args(object):
elif fid == 4:
if ftype == TType.MAP:
self.filters = {}
- (_ktype61, _vtype62, _size60) = iprot.readMapBegin()
- for _i64 in range(_size60):
- _key65 = iprot.readI32()
- _val66 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- self.filters[_key65] = _val66
+ (_ktype36, _vtype37, _size35) = iprot.readMapBegin()
+ for _i39 in range(_size35):
+ _key40 = iprot.readI32()
+ _val41 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.filters[_key40] = _val41
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -25510,9 +24499,9 @@ class searchProjects_args(object):
if self.filters is not None:
oprot.writeFieldBegin('filters', TType.MAP, 4)
oprot.writeMapBegin(TType.I32, TType.STRING, len(self.filters))
- for kiter67, viter68 in self.filters.items():
- oprot.writeI32(kiter67)
- oprot.writeString(viter68.encode('utf-8') if sys.version_info[0] == 2 else viter68)
+ for kiter42, viter43 in self.filters.items():
+ oprot.writeI32(kiter42)
+ oprot.writeString(viter43.encode('utf-8') if sys.version_info[0] == 2 else viter43)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.limit is not None:
@@ -25588,11 +24577,11 @@ class searchProjects_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype72, _size69) = iprot.readListBegin()
- for _i73 in range(_size69):
- _elem74 = airavata.model.workspace.ttypes.Project()
- _elem74.read(iprot)
- self.success.append(_elem74)
+ (_etype47, _size44) = iprot.readListBegin()
+ for _i48 in range(_size44):
+ _elem49 = airavata.model.workspace.ttypes.Project()
+ _elem49.read(iprot)
+ self.success.append(_elem49)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -25633,8 +24622,8 @@ class searchProjects_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter75 in self.success:
- iter75.write(oprot)
+ for iter50 in self.success:
+ iter50.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -25728,11 +24717,11 @@ class searchExperiments_args(object):
elif fid == 4:
if ftype == TType.MAP:
self.filters = {}
- (_ktype77, _vtype78, _size76) = iprot.readMapBegin()
- for _i80 in range(_size76):
- _key81 = iprot.readI32()
- _val82 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- self.filters[_key81] = _val82
+ (_ktype52, _vtype53, _size51) = iprot.readMapBegin()
+ for _i55 in range(_size51):
+ _key56 = iprot.readI32()
+ _val57 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.filters[_key56] = _val57
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -25771,9 +24760,9 @@ class searchExperiments_args(object):
if self.filters is not None:
oprot.writeFieldBegin('filters', TType.MAP, 4)
oprot.writeMapBegin(TType.I32, TType.STRING, len(self.filters))
- for kiter83, viter84 in self.filters.items():
- oprot.writeI32(kiter83)
- oprot.writeString(viter84.encode('utf-8') if sys.version_info[0] == 2 else viter84)
+ for kiter58, viter59 in self.filters.items():
+ oprot.writeI32(kiter58)
+ oprot.writeString(viter59.encode('utf-8') if sys.version_info[0] == 2 else viter59)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.limit is not None:
@@ -25849,11 +24838,11 @@ class searchExperiments_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype88, _size85) = iprot.readListBegin()
- for _i89 in range(_size85):
- _elem90 = airavata.model.experiment.ttypes.ExperimentSummaryModel()
- _elem90.read(iprot)
- self.success.append(_elem90)
+ (_etype63, _size60) = iprot.readListBegin()
+ for _i64 in range(_size60):
+ _elem65 = airavata.model.experiment.ttypes.ExperimentSummaryModel()
+ _elem65.read(iprot)
+ self.success.append(_elem65)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -25894,8 +24883,8 @@ class searchExperiments_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter91 in self.success:
- iter91.write(oprot)
+ for iter66 in self.success:
+ iter66.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -26330,11 +25319,11 @@ class getExperimentsInProject_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype95, _size92) = iprot.readListBegin()
- for _i96 in range(_size92):
- _elem97 = airavata.model.experiment.ttypes.ExperimentModel()
- _elem97.read(iprot)
- self.success.append(_elem97)
+ (_etype70, _size67) = iprot.readListBegin()
+ for _i71 in range(_size67):
+ _elem72 = airavata.model.experiment.ttypes.ExperimentModel()
+ _elem72.read(iprot)
+ self.success.append(_elem72)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -26381,8 +25370,8 @@ class getExperimentsInProject_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter98 in self.success:
- iter98.write(oprot)
+ for iter73 in self.success:
+ iter73.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -26579,11 +25568,11 @@ class getUserExperiments_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype102, _size99) = iprot.readListBegin()
- for _i103 in range(_size99):
- _elem104 = airavata.model.experiment.ttypes.ExperimentModel()
- _elem104.read(iprot)
- self.success.append(_elem104)
+ (_etype77, _size74) = iprot.readListBegin()
+ for _i78 in range(_size74):
+ _elem79 = airavata.model.experiment.ttypes.ExperimentModel()
+ _elem79.read(iprot)
+ self.success.append(_elem79)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -26624,8 +25613,8 @@ class getUserExperiments_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter105 in self.success:
- iter105.write(oprot)
+ for iter80 in self.success:
+ iter80.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -28894,11 +27883,11 @@ class getExperimentOutputs_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype109, _size106) = iprot.readListBegin()
- for _i110 in range(_size106):
- _elem111 = airavata.model.application.io.ttypes.OutputDataObjectType()
- _elem111.read(iprot)
- self.success.append(_elem111)
+ (_etype84, _size81) = iprot.readListBegin()
+ for _i85 in range(_size81):
+ _elem86 = airavata.model.application.io.ttypes.OutputDataObjectType()
+ _elem86.read(iprot)
+ self.success.append(_elem86)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -28945,8 +27934,8 @@ class getExperimentOutputs_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter112 in self.success:
- iter112.write(oprot)
+ for iter87 in self.success:
+ iter87.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -29104,11 +28093,11 @@ class getIntermediateOutputs_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype116, _size113) = iprot.readListBegin()
- for _i117 in range(_size113):
- _elem118 = airavata.model.application.io.ttypes.OutputDataObjectType()
- _elem118.read(iprot)
- self.success.append(_elem118)
+ (_etype91, _size88) = iprot.readListBegin()
+ for _i92 in range(_size88):
+ _elem93 = airavata.model.application.io.ttypes.OutputDataObjectType()
+ _elem93.read(iprot)
+ self.success.append(_elem93)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -29155,8 +28144,8 @@ class getIntermediateOutputs_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter119 in self.success:
- iter119.write(oprot)
+ for iter94 in self.success:
+ iter94.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -29314,12 +28303,12 @@ class getJobStatuses_result(object):
if fid == 0:
if ftype == TType.MAP:
self.success = {}
- (_ktype121, _vtype122, _size120) = iprot.readMapBegin()
- for _i124 in range(_size120):
- _key125 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- _val126 = airavata.model.status.ttypes.JobStatus()
- _val126.read(iprot)
- self.success[_key125] = _val126
+ (_ktype96, _vtype97, _size95) = iprot.readMapBegin()
+ for _i99 in range(_size95):
+ _key100 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ _val101 = airavata.model.status.ttypes.JobStatus()
+ _val101.read(iprot)
+ self.success[_key100] = _val101
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -29366,9 +28355,9 @@ class getJobStatuses_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.MAP, 0)
oprot.writeMapBegin(TType.STRING, TType.STRUCT, len(self.success))
- for kiter127, viter128 in self.success.items():
- oprot.writeString(kiter127.encode('utf-8') if sys.version_info[0] == 2 else kiter127)
- viter128.write(oprot)
+ for kiter102, viter103 in self.success.items():
+ oprot.writeString(kiter102.encode('utf-8') if sys.version_info[0] == 2 else kiter102)
+ viter103.write(oprot)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -29526,11 +28515,11 @@ class getJobDetails_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype132, _size129) = iprot.readListBegin()
- for _i133 in range(_size129):
- _elem134 = airavata.model.job.ttypes.JobModel()
- _elem134.read(iprot)
- self.success.append(_elem134)
+ (_etype107, _size104) = iprot.readListBegin()
+ for _i108 in range(_size104):
+ _elem109 = airavata.model.job.ttypes.JobModel()
+ _elem109.read(iprot)
+ self.success.append(_elem109)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -29577,8 +28566,8 @@ class getJobDetails_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter135 in self.success:
- iter135.write(oprot)
+ for iter110 in self.success:
+ iter110.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -31000,11 +29989,11 @@ class getAllAppModules_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype139, _size136) = iprot.readListBegin()
- for _i140 in range(_size136):
- _elem141 = airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
- _elem141.read(iprot)
- self.success.append(_elem141)
+ (_etype114, _size111) = iprot.readListBegin()
+ for _i115 in range(_size111):
+ _elem116 = airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
+ _elem116.read(iprot)
+ self.success.append(_elem116)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -31045,8 +30034,8 @@ class getAllAppModules_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter142 in self.success:
- iter142.write(oprot)
+ for iter117 in self.success:
+ iter117.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -31197,11 +30186,11 @@ class getAccessibleAppModules_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype146, _size143) = iprot.readListBegin()
- for _i147 in range(_size143):
- _elem148 = airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
- _elem148.read(iprot)
- self.success.append(_elem148)
+ (_etype121, _size118) = iprot.readListBegin()
+ for _i122 in range(_size118):
+ _elem123 = airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
+ _elem123.read(iprot)
+ self.success.append(_elem123)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -31242,8 +30231,8 @@ class getAccessibleAppModules_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter149 in self.success:
- iter149.write(oprot)
+ for iter124 in self.success:
+ iter124.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -32365,11 +31354,11 @@ class getAllApplicationDeployments_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype153, _size150) = iprot.readListBegin()
- for _i154 in range(_size150):
- _elem155 = airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
- _elem155.read(iprot)
- self.success.append(_elem155)
+ (_etype128, _size125) = iprot.readListBegin()
+ for _i129 in range(_size125):
+ _elem130 = airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
+ _elem130.read(iprot)
+ self.success.append(_elem130)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -32410,8 +31399,8 @@ class getAllApplicationDeployments_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter156 in self.success:
- iter156.write(oprot)
+ for iter131 in self.success:
+ iter131.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -32576,11 +31565,11 @@ class getAccessibleApplicationDeployments_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype160, _size157) = iprot.readListBegin()
- for _i161 in range(_size157):
- _elem162 = airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
- _elem162.read(iprot)
- self.success.append(_elem162)
+ (_etype135, _size132) = iprot.readListBegin()
+ for _i136 in range(_size132):
+ _elem137 = airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
+ _elem137.read(iprot)
+ self.success.append(_elem137)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -32621,8 +31610,8 @@ class getAccessibleApplicationDeployments_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter163 in self.success:
- iter163.write(oprot)
+ for iter138 in self.success:
+ iter138.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -32773,10 +31762,10 @@ class getAppModuleDeployedResources_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype167, _size164) = iprot.readListBegin()
- for _i168 in range(_size164):
- _elem169 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- self.success.append(_elem169)
+ (_etype142, _size139) = iprot.readListBegin()
+ for _i143 in range(_size139):
+ _elem144 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.success.append(_elem144)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -32817,8 +31806,8 @@ class getAppModuleDeployedResources_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRING, len(self.success))
- for iter170 in self.success:
- oprot.writeString(iter170.encode('utf-8') if sys.version_info[0] == 2 else iter170)
+ for iter145 in self.success:
+ oprot.writeString(iter145.encode('utf-8') if sys.version_info[0] == 2 else iter145)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -32983,11 +31972,11 @@ class getApplicationDeploymentsForAppModuleAndGroupResourceProfile_result(object
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype174, _size171) = iprot.readListBegin()
- for _i175 in range(_size171):
- _elem176 = airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
- _elem176.read(iprot)
- self.success.append(_elem176)
+ (_etype149, _size146) = iprot.readListBegin()
+ for _i150 in range(_size146):
+ _elem151 = airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
+ _elem151.read(iprot)
+ self.success.append(_elem151)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -33028,8 +32017,8 @@ class getApplicationDeploymentsForAppModuleAndGroupResourceProfile_result(object
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter177 in self.success:
- iter177.write(oprot)
+ for iter152 in self.success:
+ iter152.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -34173,11 +33162,11 @@ class getAllApplicationInterfaceNames_result(object):
if fid == 0:
if ftype == TType.MAP:
self.success = {}
- (_ktype179, _vtype180, _size178) = iprot.readMapBegin()
- for _i182 in range(_size178):
- _key183 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- _val184 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- self.success[_key183] = _val184
+ (_ktype154, _vtype155, _size153) = iprot.readMapBegin()
+ for _i157 in range(_size153):
+ _key158 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ _val159 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.success[_key158] = _val159
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -34218,9 +33207,9 @@ class getAllApplicationInterfaceNames_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.MAP, 0)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
- for kiter185, viter186 in self.success.items():
- oprot.writeString(kiter185.encode('utf-8') if sys.version_info[0] == 2 else kiter185)
- oprot.writeString(viter186.encode('utf-8') if sys.version_info[0] == 2 else viter186)
+ for kiter160, viter161 in self.success.items():
+ oprot.writeString(kiter160.encode('utf-8') if sys.version_info[0] == 2 else kiter160)
+ oprot.writeString(viter161.encode('utf-8') if sys.version_info[0] == 2 else viter161)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -34371,11 +33360,11 @@ class getAllApplicationInterfaces_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype190, _size187) = iprot.readListBegin()
- for _i191 in range(_size187):
- _elem192 = airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription()
- _elem192.read(iprot)
- self.success.append(_elem192)
+ (_etype165, _size162) = iprot.readListBegin()
+ for _i166 in range(_size162):
+ _elem167 = airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription()
+ _elem167.read(iprot)
+ self.success.append(_elem167)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -34416,8 +33405,8 @@ class getAllApplicationInterfaces_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter193 in self.success:
- iter193.write(oprot)
+ for iter168 in self.success:
+ iter168.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -34568,11 +33557,11 @@ class getApplicationInputs_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype197, _size194) = iprot.readListBegin()
- for _i198 in range(_size194):
- _elem199 = airavata.model.application.io.ttypes.InputDataObjectType()
- _elem199.read(iprot)
- self.success.append(_elem199)
+ (_etype172, _size169) = iprot.readListBegin()
+ for _i173 in range(_size169):
+ _elem174 = airavata.model.application.io.ttypes.InputDataObjectType()
+ _elem174.read(iprot)
+ self.success.append(_elem174)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -34613,8 +33602,8 @@ class getApplicationInputs_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter200 in self.success:
- iter200.write(oprot)
+ for iter175 in self.success:
+ iter175.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -34765,11 +33754,11 @@ class getApplicationOutputs_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype204, _size201) = iprot.readListBegin()
- for _i205 in range(_size201):
- _elem206 = airavata.model.application.io.ttypes.OutputDataObjectType()
- _elem206.read(iprot)
- self.success.append(_elem206)
+ (_etype179, _size176) = iprot.readListBegin()
+ for _i180 in range(_size176):
+ _elem181 = airavata.model.application.io.ttypes.OutputDataObjectType()
+ _elem181.read(iprot)
+ self.success.append(_elem181)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -34810,8 +33799,8 @@ class getApplicationOutputs_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter207 in self.success:
- iter207.write(oprot)
+ for iter182 in self.success:
+ iter182.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -34962,11 +33951,11 @@ class getAvailableAppInterfaceComputeResources_result(object):
if fid == 0:
if ftype == TType.MAP:
self.success = {}
- (_ktype209, _vtype210, _size208) = iprot.readMapBegin()
- for _i212 in range(_size208):
- _key213 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- _val214 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- self.success[_key213] = _val214
+ (_ktype184, _vtype185, _size183) = iprot.readMapBegin()
+ for _i187 in range(_size183):
+ _key188 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ _val189 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.success[_key188] = _val189
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -35007,9 +33996,9 @@ class getAvailableAppInterfaceComputeResources_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.MAP, 0)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
- for kiter215, viter216 in self.success.items():
- oprot.writeString(kiter215.encode('utf-8') if sys.version_info[0] == 2 else kiter215)
- oprot.writeString(viter216.encode('utf-8') if sys.version_info[0] == 2 else viter216)
+ for kiter190, viter191 in self.success.items():
+ oprot.writeString(kiter190.encode('utf-8') if sys.version_info[0] == 2 else kiter190)
+ oprot.writeString(viter191.encode('utf-8') if sys.version_info[0] == 2 else viter191)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -35524,11 +34513,11 @@ class getAllComputeResourceNames_result(object):
if fid == 0:
if ftype == TType.MAP:
self.success = {}
- (_ktype218, _vtype219, _size217) = iprot.readMapBegin()
- for _i221 in range(_size217):
- _key222 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- _val223 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- self.success[_key222] = _val223
+ (_ktype193, _vtype194, _size192) = iprot.readMapBegin()
+ for _i196 in range(_size192):
+ _key197 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ _val198 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.success[_key197] = _val198
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -35569,9 +34558,9 @@ class getAllComputeResourceNames_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.MAP, 0)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
- for kiter224, viter225 in self.success.items():
- oprot.writeString(kiter224.encode('utf-8') if sys.version_info[0] == 2 else kiter224)
- oprot.writeString(viter225.encode('utf-8') if sys.version_info[0] == 2 else viter225)
+ for kiter199, viter200 in self.success.items():
+ oprot.writeString(kiter199.encode('utf-8') if sys.version_info[0] == 2 else kiter199)
+ oprot.writeString(viter200.encode('utf-8') if sys.version_info[0] == 2 else viter200)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -36477,11 +35466,11 @@ class getAllStorageResourceNames_result(object):
if fid == 0:
if ftype == TType.MAP:
self.success = {}
- (_ktype227, _vtype228, _size226) = iprot.readMapBegin()
- for _i230 in range(_size226):
- _key231 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- _val232 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- self.success[_key231] = _val232
+ (_ktype202, _vtype203, _size201) = iprot.readMapBegin()
+ for _i205 in range(_size201):
+ _key206 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ _val207 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.success[_key206] = _val207
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -36522,9 +35511,9 @@ class getAllStorageResourceNames_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.MAP, 0)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
- for kiter233, viter234 in self.success.items():
- oprot.writeString(kiter233.encode('utf-8') if sys.version_info[0] == 2 else kiter233)
- oprot.writeString(viter234.encode('utf-8') if sys.version_info[0] == 2 else viter234)
+ for kiter208, viter209 in self.success.items():
+ oprot.writeString(kiter208.encode('utf-8') if sys.version_info[0] == 2 else kiter208)
+ oprot.writeString(viter209.encode('utf-8') if sys.version_info[0] == 2 else viter209)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -42536,11 +41525,11 @@ class changeJobSubmissionPriorities_args(object):
elif fid == 2:
if ftype == TType.MAP:
self.jobSubmissionPriorityMap = {}
- (_ktype236, _vtype237, _size235) = iprot.readMapBegin()
- for _i239 in range(_size235):
- _key240 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- _val241 = iprot.readI32()
- self.jobSubmissionPriorityMap[_key240] = _val241
+ (_ktype211, _vtype212, _size210) = iprot.readMapBegin()
+ for _i214 in range(_size210):
+ _key215 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ _val216 = iprot.readI32()
+ self.jobSubmissionPriorityMap[_key215] = _val216
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -42561,9 +41550,9 @@ class changeJobSubmissionPriorities_args(object):
if self.jobSubmissionPriorityMap is not None:
oprot.writeFieldBegin('jobSubmissionPriorityMap', TType.MAP, 2)
oprot.writeMapBegin(TType.STRING, TType.I32, len(self.jobSubmissionPriorityMap))
- for kiter242, viter243 in self.jobSubmissionPriorityMap.items():
- oprot.writeString(kiter242.encode('utf-8') if sys.version_info[0] == 2 else kiter242)
- oprot.writeI32(viter243)
+ for kiter217, viter218 in self.jobSubmissionPriorityMap.items():
+ oprot.writeString(kiter217.encode('utf-8') if sys.version_info[0] == 2 else kiter217)
+ oprot.writeI32(viter218)
oprot.writeMapEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -42734,11 +41723,11 @@ class changeDataMovementPriorities_args(object):
elif fid == 2:
if ftype == TType.MAP:
self.dataMovementPriorityMap = {}
- (_ktype245, _vtype246, _size244) = iprot.readMapBegin()
- for _i248 in range(_size244):
- _key249 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- _val250 = iprot.readI32()
- self.dataMovementPriorityMap[_key249] = _val250
+ (_ktype220, _vtype221, _size219) = iprot.readMapBegin()
+ for _i223 in range(_size219):
+ _key224 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ _val225 = iprot.readI32()
+ self.dataMovementPriorityMap[_key224] = _val225
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -42759,9 +41748,9 @@ class changeDataMovementPriorities_args(object):
if self.dataMovementPriorityMap is not None:
oprot.writeFieldBegin('dataMovementPriorityMap', TType.MAP, 2)
oprot.writeMapBegin(TType.STRING, TType.I32, len(self.dataMovementPriorityMap))
- for kiter251, viter252 in self.dataMovementPriorityMap.items():
- oprot.writeString(kiter251.encode('utf-8') if sys.version_info[0] == 2 else kiter251)
- oprot.writeI32(viter252)
+ for kiter226, viter227 in self.dataMovementPriorityMap.items():
+ oprot.writeString(kiter226.encode('utf-8') if sys.version_info[0] == 2 else kiter226)
+ oprot.writeI32(viter227)
oprot.writeMapEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -46009,11 +44998,11 @@ class getAllGatewayComputeResourcePreferences_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype256, _size253) = iprot.readListBegin()
- for _i257 in range(_size253):
- _elem258 = airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference()
- _elem258.read(iprot)
- self.success.append(_elem258)
+ (_etype231, _size228) = iprot.readListBegin()
+ for _i232 in range(_size228):
+ _elem233 = airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference()
+ _elem233.read(iprot)
+ self.success.append(_elem233)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -46054,8 +45043,8 @@ class getAllGatewayComputeResourcePreferences_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter259 in self.success:
- iter259.write(oprot)
+ for iter234 in self.success:
+ iter234.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -46206,11 +45195,11 @@ class getAllGatewayStoragePreferences_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype263, _size260) = iprot.readListBegin()
- for _i264 in range(_size260):
- _elem265 = airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference()
- _elem265.read(iprot)
- self.success.append(_elem265)
+ (_etype238, _size235) = iprot.readListBegin()
+ for _i239 in range(_size235):
+ _elem240 = airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference()
+ _elem240.read(iprot)
+ self.success.append(_elem240)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -46251,8 +45240,8 @@ class getAllGatewayStoragePreferences_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter266 in self.success:
- iter266.write(oprot)
+ for iter241 in self.success:
+ iter241.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -46389,11 +45378,11 @@ class getAllGatewayResourceProfiles_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype270, _size267) = iprot.readListBegin()
- for _i271 in range(_size267):
- _elem272 = airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile()
- _elem272.read(iprot)
- self.success.append(_elem272)
+ (_etype245, _size242) = iprot.readListBegin()
+ for _i246 in range(_size242):
+ _elem247 = airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile()
+ _elem247.read(iprot)
+ self.success.append(_elem247)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -46434,8 +45423,8 @@ class getAllGatewayResourceProfiles_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter273 in self.success:
- iter273.write(oprot)
+ for iter248 in self.success:
+ iter248.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -47410,11 +46399,11 @@ class getSSHAccountProvisioners_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype277, _size274) = iprot.readListBegin()
- for _i278 in range(_size274):
- _elem279 = airavata.model.appcatalog.accountprovisioning.ttypes.SSHAccountProvisioner()
- _elem279.read(iprot)
- self.success.append(_elem279)
+ (_etype252, _size249) = iprot.readListBegin()
+ for _i253 in range(_size249):
+ _elem254 = airavata.model.appcatalog.accountprovisioning.ttypes.SSHAccountProvisioner()
+ _elem254.read(iprot)
+ self.success.append(_elem254)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -47455,8 +46444,8 @@ class getSSHAccountProvisioners_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter280 in self.success:
- iter280.write(oprot)
+ for iter255 in self.success:
+ iter255.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -49949,11 +48938,11 @@ class getAllUserComputeResourcePreferences_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype284, _size281) = iprot.readListBegin()
- for _i285 in range(_size281):
- _elem286 = airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference()
- _elem286.read(iprot)
- self.success.append(_elem286)
+ (_etype259, _size256) = iprot.readListBegin()
+ for _i260 in range(_size256):
+ _elem261 = airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference()
+ _elem261.read(iprot)
+ self.success.append(_elem261)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -49994,8 +48983,8 @@ class getAllUserComputeResourcePreferences_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter287 in self.success:
- iter287.write(oprot)
+ for iter262 in self.success:
+ iter262.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -50160,11 +49149,11 @@ class getAllUserStoragePreferences_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype291, _size288) = iprot.readListBegin()
- for _i292 in range(_size288):
- _elem293 = airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference()
- _elem293.read(iprot)
- self.success.append(_elem293)
+ (_etype266, _size263) = iprot.readListBegin()
+ for _i267 in range(_size263):
+ _elem268 = airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference()
+ _elem268.read(iprot)
+ self.success.append(_elem268)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -50205,8 +49194,8 @@ class getAllUserStoragePreferences_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter294 in self.success:
- iter294.write(oprot)
+ for iter269 in self.success:
+ iter269.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -50343,11 +49332,11 @@ class getAllUserResourceProfiles_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype298, _size295) = iprot.readListBegin()
- for _i299 in range(_size295):
- _elem300 = airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile()
- _elem300.read(iprot)
- self.success.append(_elem300)
+ (_etype273, _size270) = iprot.readListBegin()
+ for _i274 in range(_size270):
+ _elem275 = airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile()
+ _elem275.read(iprot)
+ self.success.append(_elem275)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -50388,8 +49377,8 @@ class getAllUserResourceProfiles_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter301 in self.success:
- iter301.write(oprot)
+ for iter276 in self.success:
+ iter276.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -51434,10 +50423,10 @@ class getAllWorkflows_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype305, _size302) = iprot.readListBegin()
- for _i306 in range(_size302):
- _elem307 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- self.success.append(_elem307)
+ (_etype280, _size277) = iprot.readListBegin()
+ for _i281 in range(_size277):
+ _elem282 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.success.append(_elem282)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -51478,8 +50467,8 @@ class getAllWorkflows_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRING, len(self.success))
- for iter308 in self.success:
- oprot.writeString(iter308.encode('utf-8') if sys.version_info[0] == 2 else iter308)
+ for iter283 in self.success:
+ oprot.writeString(iter283.encode('utf-8') if sys.version_info[0] == 2 else iter283)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -51616,11 +50605,11 @@ class getLatestQueueStatuses_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype312, _size309) = iprot.readListBegin()
- for _i313 in range(_size309):
- _elem314 = airavata.model.status.ttypes.QueueStatusModel()
- _elem314.read(iprot)
- self.success.append(_elem314)
+ (_etype287, _size284) = iprot.readListBegin()
+ for _i288 in range(_size284):
+ _elem289 = airavata.model.status.ttypes.QueueStatusModel()
+ _elem289.read(iprot)
+ self.success.append(_elem289)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -51661,8 +50650,8 @@ class getLatestQueueStatuses_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter315 in self.success:
- iter315.write(oprot)
+ for iter290 in self.success:
+ iter290.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -51703,18 +50692,18 @@ class getWorkflow_args(object):
"""
Attributes:
- authzToken
- - workflowTemplateId
+ - workflowId
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'workflowTemplateId', 'UTF8', None, ), # 2
+ (2, TType.STRING, 'workflowId', 'UTF8', None, ), # 2
)
- def __init__(self, authzToken=None, workflowTemplateId=None,):
+ def __init__(self, authzToken=None, workflowId=None,):
self.authzToken = authzToken
- self.workflowTemplateId = workflowTemplateId
+ self.workflowId = workflowId
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -51733,7 +50722,7 @@ class getWorkflow_args(object):
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.workflowTemplateId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.workflowId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
else:
@@ -51750,9 +50739,9 @@ class getWorkflow_args(object):
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.workflowTemplateId is not None:
- oprot.writeFieldBegin('workflowTemplateId', TType.STRING, 2)
- oprot.writeString(self.workflowTemplateId.encode('utf-8') if sys.version_info[0] == 2 else self.workflowTemplateId)
+ if self.workflowId is not None:
+ oprot.writeFieldBegin('workflowId', TType.STRING, 2)
+ oprot.writeString(self.workflowId.encode('utf-8') if sys.version_info[0] == 2 else self.workflowId)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -51760,8 +50749,8 @@ class getWorkflow_args(object):
def validate(self):
if self.authzToken is None:
raise TProtocolException(message='Required field authzToken is unset!')
- if self.workflowTemplateId is None:
- raise TProtocolException(message='Required field workflowTemplateId is unset!')
+ if self.workflowId is None:
+ raise TProtocolException(message='Required field workflowId is unset!')
return
def __repr__(self):
@@ -51787,7 +50776,7 @@ class getWorkflow_result(object):
"""
thrift_spec = (
- (0, TType.STRUCT, 'success', (airavata.model.workflow.ttypes.WorkflowModel, airavata.model.workflow.ttypes.WorkflowModel.thrift_spec), None, ), # 0
+ (0, TType.STRUCT, 'success', (airavata.model.workflow.ttypes.AiravataWorkflow, airavata.model.workflow.ttypes.AiravataWorkflow.thrift_spec), None, ), # 0
(1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -51812,7 +50801,7 @@ class getWorkflow_result(object):
break
if fid == 0:
if ftype == TType.STRUCT:
- self.success = airavata.model.workflow.ttypes.WorkflowModel()
+ self.success = airavata.model.workflow.ttypes.AiravataWorkflow()
self.success.read(iprot)
else:
iprot.skip(ftype)
@@ -51892,18 +50881,18 @@ class deleteWorkflow_args(object):
"""
Attributes:
- authzToken
- - workflowTemplateId
+ - workflowId
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'workflowTemplateId', 'UTF8', None, ), # 2
+ (2, TType.STRING, 'workflowId', 'UTF8', None, ), # 2
)
- def __init__(self, authzToken=None, workflowTemplateId=None,):
+ def __init__(self, authzToken=None, workflowId=None,):
self.authzToken = authzToken
- self.workflowTemplateId = workflowTemplateId
+ self.workflowId = workflowId
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -51922,7 +50911,7 @@ class deleteWorkflow_args(object):
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.workflowTemplateId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.workflowId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
else:
@@ -51939,9 +50928,9 @@ class deleteWorkflow_args(object):
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.workflowTemplateId is not None:
- oprot.writeFieldBegin('workflowTemplateId', TType.STRING, 2)
- oprot.writeString(self.workflowTemplateId.encode('utf-8') if sys.version_info[0] == 2 else self.workflowTemplateId)
+ if self.workflowId is not None:
+ oprot.writeFieldBegin('workflowId', TType.STRING, 2)
+ oprot.writeString(self.workflowId.encode('utf-8') if sys.version_info[0] == 2 else self.workflowId)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -51949,8 +50938,8 @@ class deleteWorkflow_args(object):
def validate(self):
if self.authzToken is None:
raise TProtocolException(message='Required field authzToken is unset!')
- if self.workflowTemplateId is None:
- raise TProtocolException(message='Required field workflowTemplateId is unset!')
+ if self.workflowId is None:
+ raise TProtocolException(message='Required field workflowId is unset!')
return
def __repr__(self):
@@ -52077,7 +51066,7 @@ class registerWorkflow_args(object):
None, # 0
(1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
(2, TType.STRING, 'gatewayId', 'UTF8', None, ), # 2
- (3, TType.STRUCT, 'workflow', (airavata.model.workflow.ttypes.WorkflowModel, airavata.model.workflow.ttypes.WorkflowModel.thrift_spec), None, ), # 3
+ (3, TType.STRUCT, 'workflow', (airavata.model.workflow.ttypes.AiravataWorkflow, airavata.model.workflow.ttypes.AiravataWorkflow.thrift_spec), None, ), # 3
)
def __init__(self, authzToken=None, gatewayId=None, workflow=None,):
@@ -52107,7 +51096,7 @@ class registerWorkflow_args(object):
iprot.skip(ftype)
elif fid == 3:
if ftype == TType.STRUCT:
- self.workflow = airavata.model.workflow.ttypes.WorkflowModel()
+ self.workflow = airavata.model.workflow.ttypes.AiravataWorkflow()
self.workflow.read(iprot)
else:
iprot.skip(ftype)
@@ -52272,20 +51261,20 @@ class updateWorkflow_args(object):
"""
Attributes:
- authzToken
- - workflowTemplateId
+ - workflowId
- workflow
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'workflowTemplateId', 'UTF8', None, ), # 2
- (3, TType.STRUCT, 'workflow', (airavata.model.workflow.ttypes.WorkflowModel, airavata.model.workflow.ttypes.WorkflowModel.thrift_spec), None, ), # 3
+ (2, TType.STRING, 'workflowId', 'UTF8', None, ), # 2
+ (3, TType.STRUCT, 'workflow', (airavata.model.workflow.ttypes.AiravataWorkflow, airavata.model.workflow.ttypes.AiravataWorkflow.thrift_spec), None, ), # 3
)
- def __init__(self, authzToken=None, workflowTemplateId=None, workflow=None,):
+ def __init__(self, authzToken=None, workflowId=None, workflow=None,):
self.authzToken = authzToken
- self.workflowTemplateId = workflowTemplateId
+ self.workflowId = workflowId
self.workflow = workflow
def read(self, iprot):
@@ -52305,12 +51294,12 @@ class updateWorkflow_args(object):
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.workflowTemplateId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.workflowId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
elif fid == 3:
if ftype == TType.STRUCT:
- self.workflow = airavata.model.workflow.ttypes.WorkflowModel()
+ self.workflow = airavata.model.workflow.ttypes.AiravataWorkflow()
self.workflow.read(iprot)
else:
iprot.skip(ftype)
@@ -52328,9 +51317,9 @@ class updateWorkflow_args(object):
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.workflowTemplateId is not None:
- oprot.writeFieldBegin('workflowTemplateId', TType.STRING, 2)
- oprot.writeString(self.workflowTemplateId.encode('utf-8') if sys.version_info[0] == 2 else self.workflowTemplateId)
+ if self.workflowId is not None:
+ oprot.writeFieldBegin('workflowId', TType.STRING, 2)
+ oprot.writeString(self.workflowId.encode('utf-8') if sys.version_info[0] == 2 else self.workflowId)
oprot.writeFieldEnd()
if self.workflow is not None:
oprot.writeFieldBegin('workflow', TType.STRUCT, 3)
@@ -52342,8 +51331,8 @@ class updateWorkflow_args(object):
def validate(self):
if self.authzToken is None:
raise TProtocolException(message='Required field authzToken is unset!')
- if self.workflowTemplateId is None:
- raise TProtocolException(message='Required field workflowTemplateId is unset!')
+ if self.workflowId is None:
+ raise TProtocolException(message='Required field workflowId is unset!')
if self.workflow is None:
raise TProtocolException(message='Required field workflow is unset!')
return
@@ -52460,7 +51449,7 @@ class updateWorkflow_result(object):
return not (self == other)
-class getWorkflowTemplateId_args(object):
+class getWorkflowId_args(object):
"""
Attributes:
- authzToken
@@ -52506,7 +51495,7 @@ class getWorkflowTemplateId_args(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getWorkflowTemplateId_args')
+ oprot.writeStructBegin('getWorkflowId_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -52537,7 +51526,7 @@ class getWorkflowTemplateId_args(object):
return not (self == other)
-class getWorkflowTemplateId_result(object):
+class getWorkflowId_result(object):
"""
Attributes:
- success
@@ -52609,7 +51598,7 @@ class getWorkflowTemplateId_result(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getWorkflowTemplateId_result')
+ oprot.writeStructBegin('getWorkflowId_result')
if self.success is not None:
oprot.writeFieldBegin('success', TType.STRING, 0)
oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
@@ -53706,11 +52695,11 @@ class getChildDataProducts_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype319, _size316) = iprot.readListBegin()
- for _i320 in range(_size316):
- _elem321 = airavata.model.data.replica.ttypes.DataProductModel()
- _elem321.read(iprot)
- self.success.append(_elem321)
+ (_etype294, _size291) = iprot.readListBegin()
+ for _i295 in range(_size291):
+ _elem296 = airavata.model.data.replica.ttypes.DataProductModel()
+ _elem296.read(iprot)
+ self.success.append(_elem296)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -53751,8 +52740,8 @@ class getChildDataProducts_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter322 in self.success:
- iter322.write(oprot)
+ for iter297 in self.success:
+ iter297.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -53833,11 +52822,11 @@ class shareResourceWithUsers_args(object):
elif fid == 4:
if ftype == TType.MAP:
self.userPermissionList = {}
- (_ktype324, _vtype325, _size323) = iprot.readMapBegin()
- for _i327 in range(_size323):
- _key328 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- _val329 = iprot.readI32()
- self.userPermissionList[_key328] = _val329
+ (_ktype299, _vtype300, _size298) = iprot.readMapBegin()
+ for _i302 in range(_size298):
+ _key303 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ _val304 = iprot.readI32()
+ self.userPermissionList[_key303] = _val304
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -53862,9 +52851,9 @@ class shareResourceWithUsers_args(object):
if self.userPermissionList is not None:
oprot.writeFieldBegin('userPermissionList', TType.MAP, 4)
oprot.writeMapBegin(TType.STRING, TType.I32, len(self.userPermissionList))
- for kiter330, viter331 in self.userPermissionList.items():
- oprot.writeString(kiter330.encode('utf-8') if sys.version_info[0] == 2 else kiter330)
- oprot.writeI32(viter331)
+ for kiter305, viter306 in self.userPermissionList.items():
+ oprot.writeString(kiter305.encode('utf-8') if sys.version_info[0] == 2 else kiter305)
+ oprot.writeI32(viter306)
oprot.writeMapEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -54044,11 +53033,11 @@ class shareResourceWithGroups_args(object):
elif fid == 4:
if ftype == TType.MAP:
self.groupPermissionList = {}
- (_ktype333, _vtype334, _size332) = iprot.readMapBegin()
- for _i336 in range(_size332):
- _key337 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- _val338 = iprot.readI32()
- self.groupPermissionList[_key337] = _val338
+ (_ktype308, _vtype309, _size307) = iprot.readMapBegin()
+ for _i311 in range(_size307):
+ _key312 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ _val313 = iprot.readI32()
+ self.groupPermissionList[_key312] = _val313
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -54073,9 +53062,9 @@ class shareResourceWithGroups_args(object):
if self.groupPermissionList is not None:
oprot.writeFieldBegin('groupPermissionList', TType.MAP, 4)
oprot.writeMapBegin(TType.STRING, TType.I32, len(self.groupPermissionList))
- for kiter339, viter340 in self.groupPermissionList.items():
- oprot.writeString(kiter339.encode('utf-8') if sys.version_info[0] == 2 else kiter339)
- oprot.writeI32(viter340)
+ for kiter314, viter315 in self.groupPermissionList.items():
+ oprot.writeString(kiter314.encode('utf-8') if sys.version_info[0] == 2 else kiter314)
+ oprot.writeI32(viter315)
oprot.writeMapEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -54255,11 +53244,11 @@ class revokeSharingOfResourceFromUsers_args(object):
elif fid == 4:
if ftype == TType.MAP:
self.userPermissionList = {}
- (_ktype342, _vtype343, _size341) = iprot.readMapBegin()
- for _i345 in range(_size341):
- _key346 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- _val347 = iprot.readI32()
- self.userPermissionList[_key346] = _val347
+ (_ktype317, _vtype318, _size316) = iprot.readMapBegin()
+ for _i320 in range(_size316):
+ _key321 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ _val322 = iprot.readI32()
+ self.userPermissionList[_key321] = _val322
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -54284,9 +53273,9 @@ class revokeSharingOfResourceFromUsers_args(object):
if self.userPermissionList is not None:
oprot.writeFieldBegin('userPermissionList', TType.MAP, 4)
oprot.writeMapBegin(TType.STRING, TType.I32, len(self.userPermissionList))
- for kiter348, viter349 in self.userPermissionList.items():
- oprot.writeString(kiter348.encode('utf-8') if sys.version_info[0] == 2 else kiter348)
- oprot.writeI32(viter349)
+ for kiter323, viter324 in self.userPermissionList.items():
+ oprot.writeString(kiter323.encode('utf-8') if sys.version_info[0] == 2 else kiter323)
+ oprot.writeI32(viter324)
oprot.writeMapEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -54466,11 +53455,11 @@ class revokeSharingOfResourceFromGroups_args(object):
elif fid == 4:
if ftype == TType.MAP:
self.groupPermissionList = {}
- (_ktype351, _vtype352, _size350) = iprot.readMapBegin()
- for _i354 in range(_size350):
- _key355 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- _val356 = iprot.readI32()
- self.groupPermissionList[_key355] = _val356
+ (_ktype326, _vtype327, _size325) = iprot.readMapBegin()
+ for _i329 in range(_size325):
+ _key330 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ _val331 = iprot.readI32()
+ self.groupPermissionList[_key330] = _val331
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -54495,9 +53484,9 @@ class revokeSharingOfResourceFromGroups_args(object):
if self.groupPermissionList is not None:
oprot.writeFieldBegin('groupPermissionList', TType.MAP, 4)
oprot.writeMapBegin(TType.STRING, TType.I32, len(self.groupPermissionList))
- for kiter357, viter358 in self.groupPermissionList.items():
- oprot.writeString(kiter357.encode('utf-8') if sys.version_info[0] == 2 else kiter357)
- oprot.writeI32(viter358)
+ for kiter332, viter333 in self.groupPermissionList.items():
+ oprot.writeString(kiter332.encode('utf-8') if sys.version_info[0] == 2 else kiter332)
+ oprot.writeI32(viter333)
oprot.writeMapEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -54762,10 +53751,10 @@ class getAllAccessibleUsers_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype362, _size359) = iprot.readListBegin()
- for _i363 in range(_size359):
- _elem364 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- self.success.append(_elem364)
+ (_etype337, _size334) = iprot.readListBegin()
+ for _i338 in range(_size334):
+ _elem339 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.success.append(_elem339)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -54806,8 +53795,8 @@ class getAllAccessibleUsers_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRING, len(self.success))
- for iter365 in self.success:
- oprot.writeString(iter365.encode('utf-8') if sys.version_info[0] == 2 else iter365)
+ for iter340 in self.success:
+ oprot.writeString(iter340.encode('utf-8') if sys.version_info[0] == 2 else iter340)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -54973,10 +53962,10 @@ class getAllAccessibleGroups_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype369, _size366) = iprot.readListBegin()
- for _i370 in range(_size366):
- _elem371 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- self.success.append(_elem371)
+ (_etype344, _size341) = iprot.readListBegin()
+ for _i345 in range(_size341):
+ _elem346 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.success.append(_elem346)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -55017,8 +54006,8 @@ class getAllAccessibleGroups_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRING, len(self.success))
- for iter372 in self.success:
- oprot.writeString(iter372.encode('utf-8') if sys.version_info[0] == 2 else iter372)
+ for iter347 in self.success:
+ oprot.writeString(iter347.encode('utf-8') if sys.version_info[0] == 2 else iter347)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -56115,11 +55104,11 @@ class getGroupResourceList_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype376, _size373) = iprot.readListBegin()
- for _i377 in range(_size373):
- _elem378 = airavata.model.appcatalog.groupresourceprofile.ttypes.GroupResourceProfile()
- _elem378.read(iprot)
- self.success.append(_elem378)
+ (_etype351, _size348) = iprot.readListBegin()
+ for _i352 in range(_size348):
+ _elem353 = airavata.model.appcatalog.groupresourceprofile.ttypes.GroupResourceProfile()
+ _elem353.read(iprot)
+ self.success.append(_elem353)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -56160,8 +55149,8 @@ class getGroupResourceList_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter379 in self.success:
- iter379.write(oprot)
+ for iter354 in self.success:
+ iter354.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -57471,11 +56460,11 @@ class getGroupComputeResourcePrefList_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype383, _size380) = iprot.readListBegin()
- for _i384 in range(_size380):
- _elem385 = airavata.model.appcatalog.groupresourceprofile.ttypes.GroupComputeResourcePreference()
- _elem385.read(iprot)
- self.success.append(_elem385)
+ (_etype358, _size355) = iprot.readListBegin()
+ for _i359 in range(_size355):
+ _elem360 = airavata.model.appcatalog.groupresourceprofile.ttypes.GroupComputeResourcePreference()
+ _elem360.read(iprot)
+ self.success.append(_elem360)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -57516,8 +56505,8 @@ class getGroupComputeResourcePrefList_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter386 in self.success:
- iter386.write(oprot)
+ for iter361 in self.success:
+ iter361.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -57668,11 +56657,11 @@ class getGroupBatchQueueResourcePolicyList_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype390, _size387) = iprot.readListBegin()
- for _i391 in range(_size387):
- _elem392 = airavata.model.appcatalog.groupresourceprofile.ttypes.BatchQueueResourcePolicy()
- _elem392.read(iprot)
- self.success.append(_elem392)
+ (_etype365, _size362) = iprot.readListBegin()
+ for _i366 in range(_size362):
+ _elem367 = airavata.model.appcatalog.groupresourceprofile.ttypes.BatchQueueResourcePolicy()
+ _elem367.read(iprot)
+ self.success.append(_elem367)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -57713,8 +56702,8 @@ class getGroupBatchQueueResourcePolicyList_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter393 in self.success:
- iter393.write(oprot)
+ for iter368 in self.success:
+ iter368.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -57865,11 +56854,11 @@ class getGroupComputeResourcePolicyList_result(object):
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype397, _size394) = iprot.readListBegin()
- for _i398 in range(_size394):
- _elem399 = airavata.model.appcatalog.groupresourceprofile.ttypes.ComputeResourcePolicy()
- _elem399.read(iprot)
- self.success.append(_elem399)
+ (_etype372, _size369) = iprot.readListBegin()
+ for _i373 in range(_size369):
+ _elem374 = airavata.model.appcatalog.groupresourceprofile.ttypes.ComputeResourcePolicy()
+ _elem374.read(iprot)
+ self.success.append(_elem374)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -57910,8 +56899,8 @@ class getGroupComputeResourcePolicyList_result(object):
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter400 in self.success:
- iter400.write(oprot)
+ for iter375 in self.success:
+ iter375.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
diff --git a/airavata/model/credential/store/ttypes.py b/airavata/model/credential/store/ttypes.py
index 7d6cadf..e4d52ad 100644
--- a/airavata/model/credential/store/ttypes.py
+++ b/airavata/model/credential/store/ttypes.py
@@ -13,21 +13,6 @@ import sys
from thrift.transport import TTransport
-class CredentialOwnerType(object):
- GATEWAY = 0
- USER = 1
-
- _VALUES_TO_NAMES = {
- 0: "GATEWAY",
- 1: "USER",
- }
-
- _NAMES_TO_VALUES = {
- "GATEWAY": 0,
- "USER": 1,
- }
-
-
class SummaryType(object):
"""
Data Types supported in Airavata. The primitive data types
@@ -61,7 +46,6 @@ class SSHCredential(object):
- persistedTime
- token
- description
- - credentialOwnerType
"""
thrift_spec = (
@@ -74,10 +58,9 @@ class SSHCredential(object):
(6, TType.I64, 'persistedTime', None, None, ), # 6
(7, TType.STRING, 'token', 'UTF8', None, ), # 7
(8, TType.STRING, 'description', 'UTF8', None, ), # 8
- (9, TType.I32, 'credentialOwnerType', None, 0, ), # 9
)
- def __init__(self, gatewayId=None, username=None, passphrase=None, publicKey=None, privateKey=None, persistedTime=None, token=None, description=None, credentialOwnerType=thrift_spec[9][4],):
+ def __init__(self, gatewayId=None, username=None, passphrase=None, publicKey=None, privateKey=None, persistedTime=None, token=None, description=None,):
self.gatewayId = gatewayId
self.username = username
self.passphrase = passphrase
@@ -86,7 +69,6 @@ class SSHCredential(object):
self.persistedTime = persistedTime
self.token = token
self.description = description
- self.credentialOwnerType = credentialOwnerType
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -137,11 +119,6 @@ class SSHCredential(object):
self.description = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 9:
- if ftype == TType.I32:
- self.credentialOwnerType = iprot.readI32()
- else:
- iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -184,10 +161,6 @@ class SSHCredential(object):
oprot.writeFieldBegin('description', TType.STRING, 8)
oprot.writeString(self.description.encode('utf-8') if sys.version_info[0] == 2 else self.description)
oprot.writeFieldEnd()
- if self.credentialOwnerType is not None:
- oprot.writeFieldBegin('credentialOwnerType', TType.I32, 9)
- oprot.writeI32(self.credentialOwnerType)
- oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
diff --git a/airavata/model/group/ttypes.py b/airavata/model/group/ttypes.py
index db160ae..f06cb0c 100644
--- a/airavata/model/group/ttypes.py
+++ b/airavata/model/group/ttypes.py
@@ -20,7 +20,8 @@ class ResourceType(object):
DATA = 2
APPLICATION_DEPLOYMENT = 3
GROUP_RESOURCE_PROFILE = 4
- OTHER = 5
+ CREDENTIAL_TOKEN = 5
+ OTHER = 6
_VALUES_TO_NAMES = {
0: "PROJECT",
@@ -28,7 +29,8 @@ class ResourceType(object):
2: "DATA",
3: "APPLICATION_DEPLOYMENT",
4: "GROUP_RESOURCE_PROFILE",
- 5: "OTHER",
+ 5: "CREDENTIAL_TOKEN",
+ 6: "OTHER",
}
_NAMES_TO_VALUES = {
@@ -37,7 +39,8 @@ class ResourceType(object):
"DATA": 2,
"APPLICATION_DEPLOYMENT": 3,
"GROUP_RESOURCE_PROFILE": 4,
- "OTHER": 5,
+ "CREDENTIAL_TOKEN": 5,
+ "OTHER": 6,
}
diff --git a/airavata/model/sharing/ttypes.py b/airavata/model/sharing/ttypes.py
index 4d84e51..1f2f0e9 100644
--- a/airavata/model/sharing/ttypes.py
+++ b/airavata/model/sharing/ttypes.py
@@ -563,6 +563,7 @@ class UserGroup(object):
<li><b>groupCardinality</b> : Group cardinality (SINGLE_USER, MULTI_USER)</li>
<li>createdTime : Will be set by the system</li>
<li>updatedTime : Will be set by the system</li>
+ <li>groupAdmins : Admins for the group</li>
Attributes:
@@ -575,6 +576,7 @@ class UserGroup(object):
- groupCardinality
- createdTime
- updatedTime
+ - groupAdmins
"""
thrift_spec = (
@@ -588,9 +590,10 @@ class UserGroup(object):
(7, TType.I32, 'groupCardinality', None, None, ), # 7
(8, TType.I64, 'createdTime', None, None, ), # 8
(9, TType.I64, 'updatedTime', None, None, ), # 9
+ (10, TType.LIST, 'groupAdmins', (TType.STRUCT, (GroupAdmin, GroupAdmin.thrift_spec), False), None, ), # 10
)
- def __init__(self, groupId=None, domainId=None, name=None, description=None, ownerId=None, groupType=None, groupCardinality=None, createdTime=None, updatedTime=None,):
+ def __init__(self, groupId=None, domainId=None, name=None, description=None, ownerId=None, groupType=None, groupCardinality=None, createdTime=None, updatedTime=None, groupAdmins=None,):
self.groupId = groupId
self.domainId = domainId
self.name = name
@@ -600,6 +603,7 @@ class UserGroup(object):
self.groupCardinality = groupCardinality
self.createdTime = createdTime
self.updatedTime = updatedTime
+ self.groupAdmins = groupAdmins
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -655,6 +659,17 @@ class UserGroup(object):
self.updatedTime = iprot.readI64()
else:
iprot.skip(ftype)
+ elif fid == 10:
+ if ftype == TType.LIST:
+ self.groupAdmins = []
+ (_etype3, _size0) = iprot.readListBegin()
+ for _i4 in range(_size0):
+ _elem5 = GroupAdmin()
+ _elem5.read(iprot)
+ self.groupAdmins.append(_elem5)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -701,6 +716,13 @@ class UserGroup(object):
oprot.writeFieldBegin('updatedTime', TType.I64, 9)
oprot.writeI64(self.updatedTime)
oprot.writeFieldEnd()
+ if self.groupAdmins is not None:
+ oprot.writeFieldBegin('groupAdmins', TType.LIST, 10)
+ oprot.writeListBegin(TType.STRUCT, len(self.groupAdmins))
+ for iter6 in self.groupAdmins:
+ iter6.write(oprot)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
diff --git a/airavata/model/workflow/ttypes.py b/airavata/model/workflow/ttypes.py
index 76d2765..7fe9357 100644
--- a/airavata/model/workflow/ttypes.py
+++ b/airavata/model/workflow/ttypes.py
@@ -9,109 +9,187 @@
from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
from thrift.protocol.TProtocol import TProtocolException
import sys
-import airavata.model.application.io.ttypes
import airavata.model.commons.ttypes
+import airavata.model.application.io.ttypes
from thrift.transport import TTransport
class WorkflowState(object):
CREATED = 0
- STARTED = 1
- EXECUTING = 2
- COMPLETED = 3
- FAILED = 4
- CANCELLING = 5
+ VALIDATED = 1
+ SCHEDULED = 2
+ LAUNCHED = 3
+ EXECUTING = 4
+ PAUSING = 5
+ PAUSED = 6
+ RESTARTING = 7
+ CANCELING = 8
+ CANCELED = 9
+ COMPLETED = 10
+ FAILED = 11
+
+ _VALUES_TO_NAMES = {
+ 0: "CREATED",
+ 1: "VALIDATED",
+ 2: "SCHEDULED",
+ 3: "LAUNCHED",
+ 4: "EXECUTING",
+ 5: "PAUSING",
+ 6: "PAUSED",
+ 7: "RESTARTING",
+ 8: "CANCELING",
+ 9: "CANCELED",
+ 10: "COMPLETED",
+ 11: "FAILED",
+ }
+
+ _NAMES_TO_VALUES = {
+ "CREATED": 0,
+ "VALIDATED": 1,
+ "SCHEDULED": 2,
+ "LAUNCHED": 3,
+ "EXECUTING": 4,
+ "PAUSING": 5,
+ "PAUSED": 6,
+ "RESTARTING": 7,
+ "CANCELING": 8,
+ "CANCELED": 9,
+ "COMPLETED": 10,
+ "FAILED": 11,
+ }
+
+
+class ApplicationState(object):
+ CREATED = 0
+ VALIDATED = 1
+ SCHEDULED = 2
+ LAUNCHED = 3
+ EXECUTING = 4
+ CANCELING = 5
CANCELED = 6
+ COMPLETED = 7
+ FAILED = 8
_VALUES_TO_NAMES = {
0: "CREATED",
- 1: "STARTED",
- 2: "EXECUTING",
- 3: "COMPLETED",
- 4: "FAILED",
- 5: "CANCELLING",
+ 1: "VALIDATED",
+ 2: "SCHEDULED",
+ 3: "LAUNCHED",
+ 4: "EXECUTING",
+ 5: "CANCELING",
6: "CANCELED",
+ 7: "COMPLETED",
+ 8: "FAILED",
}
_NAMES_TO_VALUES = {
"CREATED": 0,
- "STARTED": 1,
- "EXECUTING": 2,
- "COMPLETED": 3,
- "FAILED": 4,
- "CANCELLING": 5,
+ "VALIDATED": 1,
+ "SCHEDULED": 2,
+ "LAUNCHED": 3,
+ "EXECUTING": 4,
+ "CANCELING": 5,
"CANCELED": 6,
+ "COMPLETED": 7,
+ "FAILED": 8,
}
-class ComponentState(object):
+class HandlerType(object):
+ FLOW_STARTER = 0
+ FLOW_TERMINATOR = 1
+ DOWHILE_LOOP = 2
+ FOREACH_LOOP = 3
+
+ _VALUES_TO_NAMES = {
+ 0: "FLOW_STARTER",
+ 1: "FLOW_TERMINATOR",
+ 2: "DOWHILE_LOOP",
+ 3: "FOREACH_LOOP",
+ }
+
+ _NAMES_TO_VALUES = {
+ "FLOW_STARTER": 0,
+ "FLOW_TERMINATOR": 1,
+ "DOWHILE_LOOP": 2,
+ "FOREACH_LOOP": 3,
+ }
+
+
+class HandlerState(object):
CREATED = 0
- WAITING = 1
- READY = 2
- RUNNING = 3
- COMPLETED = 4
- FAILED = 5
+ VALIDATED = 1
+ SCHEDULED = 2
+ LAUNCHED = 3
+ EXECUTING = 4
+ CANCELING = 5
CANCELED = 6
+ COMPLETED = 7
+ FAILED = 8
_VALUES_TO_NAMES = {
0: "CREATED",
- 1: "WAITING",
- 2: "READY",
- 3: "RUNNING",
- 4: "COMPLETED",
- 5: "FAILED",
+ 1: "VALIDATED",
+ 2: "SCHEDULED",
+ 3: "LAUNCHED",
+ 4: "EXECUTING",
+ 5: "CANCELING",
6: "CANCELED",
+ 7: "COMPLETED",
+ 8: "FAILED",
}
_NAMES_TO_VALUES = {
"CREATED": 0,
- "WAITING": 1,
- "READY": 2,
- "RUNNING": 3,
- "COMPLETED": 4,
- "FAILED": 5,
+ "VALIDATED": 1,
+ "SCHEDULED": 2,
+ "LAUNCHED": 3,
+ "EXECUTING": 4,
+ "CANCELING": 5,
"CANCELED": 6,
+ "COMPLETED": 7,
+ "FAILED": 8,
}
-class WorkflowModel(object):
+class ComponentType(object):
+ APPLICATION = 0
+ HANDLER = 1
+
+ _VALUES_TO_NAMES = {
+ 0: "APPLICATION",
+ 1: "HANDLER",
+ }
+
+ _NAMES_TO_VALUES = {
+ "APPLICATION": 0,
+ "HANDLER": 1,
+ }
+
+
+class WorkflowStatus(object):
"""
Attributes:
- - templateId
- - name
- - graph
- - gatewayId
- - createdUser
- - image
- - workflowInputs
- - workflowOutputs
- - creationTime
+ - id
+ - state
+ - description
+ - updatedAt
"""
thrift_spec = (
None, # 0
- (1, TType.STRING, 'templateId', 'UTF8', "DO_NOT_SET_AT_CLIENTS", ), # 1
- (2, TType.STRING, 'name', 'UTF8', None, ), # 2
- (3, TType.STRING, 'graph', 'UTF8', None, ), # 3
- (4, TType.STRING, 'gatewayId', 'UTF8', None, ), # 4
- (5, TType.STRING, 'createdUser', 'UTF8', None, ), # 5
- (6, TType.STRING, 'image', 'BINARY', None, ), # 6
- (7, TType.LIST, 'workflowInputs', (TType.STRUCT, (airavata.model.application.io.ttypes.InputDataObjectType, airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec), False), None, ), # 7
- (8, TType.LIST, 'workflowOutputs', (TType.STRUCT, (airavata.model.application.io.ttypes.OutputDataObjectType, airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec), False), None, ), # 8
- (9, TType.I64, 'creationTime', None, None, ), # 9
+ (1, TType.STRING, 'id', 'UTF8', None, ), # 1
+ (2, TType.I32, 'state', None, None, ), # 2
+ (3, TType.STRING, 'description', 'UTF8', None, ), # 3
+ (4, TType.I64, 'updatedAt', None, None, ), # 4
)
- def __init__(self, templateId=thrift_spec[1][4], name=None, graph=None, gatewayId=None, createdUser=None, image=None, workflowInputs=None, workflowOutputs=None, creationTime=None,):
- self.templateId = templateId
- self.name = name
- self.graph = graph
- self.gatewayId = gatewayId
- self.createdUser = createdUser
- self.image = image
- self.workflowInputs = workflowInputs
- self.workflowOutputs = workflowOutputs
- self.creationTime = creationTime
+ def __init__(self, id=None, state=None, description=None, updatedAt=None,):
+ self.id = id
+ self.state = state
+ self.description = description
+ self.updatedAt = updatedAt
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -124,59 +202,364 @@ class WorkflowModel(object):
break
if fid == 1:
if ftype == TType.STRING:
- self.templateId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.id = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
elif fid == 2:
+ if ftype == TType.I32:
+ self.state = iprot.readI32()
+ else:
+ iprot.skip(ftype)
+ elif fid == 3:
if ftype == TType.STRING:
- self.name = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.description = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 4:
+ if ftype == TType.I64:
+ self.updatedAt = iprot.readI64()
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot._fast_encode is not None and self.thrift_spec is not None:
+ oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('WorkflowStatus')
+ if self.id is not None:
+ oprot.writeFieldBegin('id', TType.STRING, 1)
+ oprot.writeString(self.id.encode('utf-8') if sys.version_info[0] == 2 else self.id)
+ oprot.writeFieldEnd()
+ if self.state is not None:
+ oprot.writeFieldBegin('state', TType.I32, 2)
+ oprot.writeI32(self.state)
+ oprot.writeFieldEnd()
+ if self.description is not None:
+ oprot.writeFieldBegin('description', TType.STRING, 3)
+ oprot.writeString(self.description.encode('utf-8') if sys.version_info[0] == 2 else self.description)
+ oprot.writeFieldEnd()
+ if self.updatedAt is not None:
+ oprot.writeFieldBegin('updatedAt', TType.I64, 4)
+ oprot.writeI64(self.updatedAt)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ if self.state is None:
+ raise TProtocolException(message='Required field state is unset!')
+ return
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.items()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+
+class NotificationEmail(object):
+ """
+ Attributes:
+ - email
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.STRING, 'email', 'UTF8', None, ), # 1
+ )
+
+ def __init__(self, email=None,):
+ self.email = email
+
+ def read(self, iprot):
+ if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+ iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 1:
+ if ftype == TType.STRING:
+ self.email = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot._fast_encode is not None and self.thrift_spec is not None:
+ oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('NotificationEmail')
+ if self.email is not None:
+ oprot.writeFieldBegin('email', TType.STRING, 1)
+ oprot.writeString(self.email.encode('utf-8') if sys.version_info[0] == 2 else self.email)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ if self.email is None:
+ raise TProtocolException(message='Required field email is unset!')
+ return
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.items()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+
+class ApplicationStatus(object):
+ """
+ Attributes:
+ - id
+ - state
+ - description
+ - updatedAt
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.STRING, 'id', 'UTF8', None, ), # 1
+ (2, TType.I32, 'state', None, None, ), # 2
+ (3, TType.STRING, 'description', 'UTF8', None, ), # 3
+ (4, TType.I64, 'updatedAt', None, None, ), # 4
+ )
+
+ def __init__(self, id=None, state=None, description=None, updatedAt=None,):
+ self.id = id
+ self.state = state
+ self.description = description
+ self.updatedAt = updatedAt
+
+ def read(self, iprot):
+ if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+ iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 1:
+ if ftype == TType.STRING:
+ self.id = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.I32:
+ self.state = iprot.readI32()
+ else:
+ iprot.skip(ftype)
+ elif fid == 3:
+ if ftype == TType.STRING:
+ self.description = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 4:
+ if ftype == TType.I64:
+ self.updatedAt = iprot.readI64()
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot._fast_encode is not None and self.thrift_spec is not None:
+ oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('ApplicationStatus')
+ if self.id is not None:
+ oprot.writeFieldBegin('id', TType.STRING, 1)
+ oprot.writeString(self.id.encode('utf-8') if sys.version_info[0] == 2 else self.id)
+ oprot.writeFieldEnd()
+ if self.state is not None:
+ oprot.writeFieldBegin('state', TType.I32, 2)
+ oprot.writeI32(self.state)
+ oprot.writeFieldEnd()
+ if self.description is not None:
+ oprot.writeFieldBegin('description', TType.STRING, 3)
+ oprot.writeString(self.description.encode('utf-8') if sys.version_info[0] == 2 else self.description)
+ oprot.writeFieldEnd()
+ if self.updatedAt is not None:
+ oprot.writeFieldBegin('updatedAt', TType.I64, 4)
+ oprot.writeI64(self.updatedAt)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ if self.state is None:
+ raise TProtocolException(message='Required field state is unset!')
+ return
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.items()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+
+class WorkflowApplication(object):
+ """
+ Attributes:
+ - id
+ - belongsToMainWorkflow
+ - applicationInterfaceId
+ - computeResourceId
+ - queueName
+ - nodeCount
+ - coreCount
+ - wallTimeLimit
+ - physicalMemory
+ - statuses
+ - errors
+ - createdAt
+ - updatedAt
+ """
+
+ thrift_spec = (
+ None, # 0
+ (1, TType.STRING, 'id', 'UTF8', None, ), # 1
+ (2, TType.BOOL, 'belongsToMainWorkflow', None, None, ), # 2
+ (3, TType.STRING, 'applicationInterfaceId', 'UTF8', None, ), # 3
+ (4, TType.STRING, 'computeResourceId', 'UTF8', None, ), # 4
+ (5, TType.STRING, 'queueName', 'UTF8', None, ), # 5
+ (6, TType.I32, 'nodeCount', None, None, ), # 6
+ (7, TType.I32, 'coreCount', None, None, ), # 7
+ (8, TType.I32, 'wallTimeLimit', None, None, ), # 8
+ (9, TType.I32, 'physicalMemory', None, None, ), # 9
+ (10, TType.LIST, 'statuses', (TType.STRUCT, (ApplicationStatus, ApplicationStatus.thrift_spec), False), None, ), # 10
+ (11, TType.LIST, 'errors', (TType.STRUCT, (airavata.model.commons.ttypes.ErrorModel, airavata.model.commons.ttypes.ErrorModel.thrift_spec), False), None, ), # 11
+ (12, TType.I64, 'createdAt', None, None, ), # 12
+ (13, TType.I64, 'updatedAt', None, None, ), # 13
+ )
+
+ def __init__(self, id=None, belongsToMainWorkflow=None, applicationInterfaceId=None, computeResourceId=None, queueName=None, nodeCount=None, coreCount=None, wallTimeLimit=None, physicalMemory=None, statuses=None, errors=None, createdAt=None, updatedAt=None,):
+ self.id = id
+ self.belongsToMainWorkflow = belongsToMainWorkflow
+ self.applicationInterfaceId = applicationInterfaceId
+ self.computeResourceId = computeResourceId
+ self.queueName = queueName
+ self.nodeCount = nodeCount
+ self.coreCount = coreCount
+ self.wallTimeLimit = wallTimeLimit
+ self.physicalMemory = physicalMemory
+ self.statuses = statuses
+ self.errors = errors
+ self.createdAt = createdAt
+ self.updatedAt = updatedAt
+
+ def read(self, iprot):
+ if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+ iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 1:
+ if ftype == TType.STRING:
+ self.id = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 2:
+ if ftype == TType.BOOL:
+ self.belongsToMainWorkflow = iprot.readBool()
else:
iprot.skip(ftype)
elif fid == 3:
if ftype == TType.STRING:
- self.graph = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.applicationInterfaceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
elif fid == 4:
if ftype == TType.STRING:
- self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.computeResourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
elif fid == 5:
if ftype == TType.STRING:
- self.createdUser = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.queueName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
elif fid == 6:
- if ftype == TType.STRING:
- self.image = iprot.readBinary()
+ if ftype == TType.I32:
+ self.nodeCount = iprot.readI32()
else:
iprot.skip(ftype)
elif fid == 7:
+ if ftype == TType.I32:
+ self.coreCount = iprot.readI32()
+ else:
+ iprot.skip(ftype)
+ elif fid == 8:
+ if ftype == TType.I32:
+ self.wallTimeLimit = iprot.readI32()
+ else:
+ iprot.skip(ftype)
+ elif fid == 9:
+ if ftype == TType.I32:
+ self.physicalMemory = iprot.readI32()
+ else:
+ iprot.skip(ftype)
+ elif fid == 10:
if ftype == TType.LIST:
- self.workflowInputs = []
+ self.statuses = []
(_etype3, _size0) = iprot.readListBegin()
for _i4 in range(_size0):
- _elem5 = airavata.model.application.io.ttypes.InputDataObjectType()
+ _elem5 = ApplicationStatus()
_elem5.read(iprot)
- self.workflowInputs.append(_elem5)
+ self.statuses.append(_elem5)
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 8:
+ elif fid == 11:
if ftype == TType.LIST:
- self.workflowOutputs = []
+ self.errors = []
(_etype9, _size6) = iprot.readListBegin()
for _i10 in range(_size6):
- _elem11 = airavata.model.application.io.ttypes.OutputDataObjectType()
+ _elem11 = airavata.model.commons.ttypes.ErrorModel()
_elem11.read(iprot)
- self.workflowOutputs.append(_elem11)
+ self.errors.append(_elem11)
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 9:
+ elif fid == 12:
if ftype == TType.I64:
- self.creationTime = iprot.readI64()
+ self.createdAt = iprot.readI64()
+ else:
+ iprot.skip(ftype)
+ elif fid == 13:
+ if ftype == TType.I64:
+ self.updatedAt = iprot.readI64()
else:
iprot.skip(ftype)
else:
@@ -188,63 +571,73 @@ class WorkflowModel(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('WorkflowModel')
- if self.templateId is not None:
- oprot.writeFieldBegin('templateId', TType.STRING, 1)
- oprot.writeString(self.templateId.encode('utf-8') if sys.version_info[0] == 2 else self.templateId)
+ oprot.writeStructBegin('WorkflowApplication')
+ if self.id is not None:
+ oprot.writeFieldBegin('id', TType.STRING, 1)
+ oprot.writeString(self.id.encode('utf-8') if sys.version_info[0] == 2 else self.id)
oprot.writeFieldEnd()
- if self.name is not None:
- oprot.writeFieldBegin('name', TType.STRING, 2)
- oprot.writeString(self.name.encode('utf-8') if sys.version_info[0] == 2 else self.name)
+ if self.belongsToMainWorkflow is not None:
+ oprot.writeFieldBegin('belongsToMainWorkflow', TType.BOOL, 2)
+ oprot.writeBool(self.belongsToMainWorkflow)
oprot.writeFieldEnd()
- if self.graph is not None:
- oprot.writeFieldBegin('graph', TType.STRING, 3)
- oprot.writeString(self.graph.encode('utf-8') if sys.version_info[0] == 2 else self.graph)
+ if self.applicationInterfaceId is not None:
+ oprot.writeFieldBegin('applicationInterfaceId', TType.STRING, 3)
+ oprot.writeString(self.applicationInterfaceId.encode('utf-8') if sys.version_info[0] == 2 else self.applicationInterfaceId)
oprot.writeFieldEnd()
- if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 4)
- oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
+ if self.computeResourceId is not None:
+ oprot.writeFieldBegin('computeResourceId', TType.STRING, 4)
+ oprot.writeString(self.computeResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.computeResourceId)
+ oprot.writeFieldEnd()
+ if self.queueName is not None:
+ oprot.writeFieldBegin('queueName', TType.STRING, 5)
+ oprot.writeString(self.queueName.encode('utf-8') if sys.version_info[0] == 2 else self.queueName)
oprot.writeFieldEnd()
- if self.createdUser is not None:
- oprot.writeFieldBegin('createdUser', TType.STRING, 5)
- oprot.writeString(self.createdUser.encode('utf-8') if sys.version_info[0] == 2 else self.createdUser)
+ if self.nodeCount is not None:
+ oprot.writeFieldBegin('nodeCount', TType.I32, 6)
+ oprot.writeI32(self.nodeCount)
oprot.writeFieldEnd()
- if self.image is not None:
- oprot.writeFieldBegin('image', TType.STRING, 6)
- oprot.writeBinary(self.image)
+ if self.coreCount is not None:
+ oprot.writeFieldBegin('coreCount', TType.I32, 7)
+ oprot.writeI32(self.coreCount)
oprot.writeFieldEnd()
- if self.workflowInputs is not None:
- oprot.writeFieldBegin('workflowInputs', TType.LIST, 7)
- oprot.writeListBegin(TType.STRUCT, len(self.workflowInputs))
- for iter12 in self.workflowInputs:
+ if self.wallTimeLimit is not None:
+ oprot.writeFieldBegin('wallTimeLimit', TType.I32, 8)
+ oprot.writeI32(self.wallTimeLimit)
+ oprot.writeFieldEnd()
+ if self.physicalMemory is not None:
+ oprot.writeFieldBegin('physicalMemory', TType.I32, 9)
+ oprot.writeI32(self.physicalMemory)
+ oprot.writeFieldEnd()
+ if self.statuses is not None:
+ oprot.writeFieldBegin('statuses', TType.LIST, 10)
+ oprot.writeListBegin(TType.STRUCT, len(self.statuses))
+ for iter12 in self.statuses:
iter12.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
- if self.workflowOutputs is not None:
- oprot.writeFieldBegin('workflowOutputs', TType.LIST, 8)
- oprot.writeListBegin(TType.STRUCT, len(self.workflowOutputs))
- for iter13 in self.workflowOutputs:
+ if self.errors is not None:
+ oprot.writeFieldBegin('errors', TType.LIST, 11)
+ oprot.writeListBegin(TType.STRUCT, len(self.errors))
+ for iter13 in self.errors:
iter13.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
- if self.creationTime is not None:
- oprot.writeFieldBegin('creationTime', TType.I64, 9)
- oprot.writeI64(self.creationTime)
+ if self.createdAt is not None:
+ oprot.writeFieldBegin('createdAt', TType.I64, 12)
+ oprot.writeI64(self.createdAt)
+ oprot.writeFieldEnd()
+ if self.updatedAt is not None:
+ oprot.writeFieldBegin('updatedAt', TType.I64, 13)
+ oprot.writeI64(self.updatedAt)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
def validate(self):
- if self.templateId is None:
- raise TProtocolException(message='Required field templateId is unset!')
- if self.name is None:
- raise TProtocolException(message='Required field name is unset!')
- if self.graph is None:
- raise TProtocolException(message='Required field graph is unset!')
- if self.gatewayId is None:
- raise TProtocolException(message='Required field gatewayId is unset!')
- if self.createdUser is None:
- raise TProtocolException(message='Required field createdUser is unset!')
+ if self.id is None:
+ raise TProtocolException(message='Required field id is unset!')
+ if self.belongsToMainWorkflow is None:
+ raise TProtocolException(message='Required field belongsToMainWorkflow is unset!')
return
def __repr__(self):
@@ -259,25 +652,46 @@ class WorkflowModel(object):
return not (self == other)
-class ComponentStatus(object):
+class WorkflowConnection(object):
"""
Attributes:
- - state
- - reason
- - timeofStateChange
+ - id
+ - belongsToMainWorkflow
+ - fromType
+ - fromId
+ - fromOutputName
+ - toType
+ - toId
+ - toInputName
+ - createdAt
+ - updatedAt
"""
thrift_spec = (
None, # 0
- (1, TType.I32, 'state', None, 0, ), # 1
- (2, TType.STRING, 'reason', 'UTF8', None, ), # 2
- (3, TType.I64, 'timeofStateChange', None, None, ), # 3
+ (1, TType.STRING, 'id', 'UTF8', "DO_NOT_SET_AT_CLIENTS", ), # 1
+ (2, TType.BOOL, 'belongsToMainWorkflow', None, None, ), # 2
+ (3, TType.I32, 'fromType', None, None, ), # 3
+ (4, TType.STRING, 'fromId', 'UTF8', None, ), # 4
+ (5, TType.STRING, 'fromOutputName', 'UTF8', None, ), # 5
+ (6, TType.I32, 'toType', None, None, ), # 6
+ (7, TType.STRING, 'toId', 'UTF8', None, ), # 7
+ (8, TType.STRING, 'toInputName', 'UTF8', None, ), # 8
+ (9, TType.I64, 'createdAt', None, None, ), # 9
+ (10, TType.I64, 'updatedAt', None, None, ), # 10
)
- def __init__(self, state=thrift_spec[1][4], reason=None, timeofStateChange=None,):
- self.state = state
- self.reason = reason
- self.timeofStateChange = timeofStateChange
+ def __init__(self, id=thrift_spec[1][4], belongsToMainWorkflow=None, fromType=None, fromId=None, fromOutputName=None, toType=None, toId=None, toInputName=None, createdAt=None, updatedAt=None,):
+ self.id = id
+ self.belongsToMainWorkflow = belongsToMainWorkflow
+ self.fromType = fromType
+ self.fromId = fromId
+ self.fromOutputName = fromOutputName
+ self.toType = toType
+ self.toId = toId
+ self.toInputName = toInputName
+ self.createdAt = createdAt
+ self.updatedAt = updatedAt
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -289,18 +703,53 @@ class ComponentStatus(object):
if ftype == TType.STOP:
break
if fid == 1:
- if ftype == TType.I32:
- self.state = iprot.readI32()
+ if ftype == TType.STRING:
+ self.id = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
elif fid == 2:
- if ftype == TType.STRING:
- self.reason = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ if ftype == TType.BOOL:
+ self.belongsToMainWorkflow = iprot.readBool()
else:
iprot.skip(ftype)
elif fid == 3:
+ if ftype == TType.I32:
+ self.fromType = iprot.readI32()
+ else:
+ iprot.skip(ftype)
+ elif fid == 4:
+ if ftype == TType.STRING:
+ self.fromId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 5:
+ if ftype == TType.STRING:
+ self.fromOutputName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 6:
+ if ftype == TType.I32:
+ self.toType = iprot.readI32()
+ else:
+ iprot.skip(ftype)
+ elif fid == 7:
+ if ftype == TType.STRING:
+ self.toId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 8:
+ if ftype == TType.STRING:
+ self.toInputName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 9:
if ftype == TType.I64:
- self.timeofStateChange = iprot.readI64()
+ self.createdAt = iprot.readI64()
+ else:
+ iprot.skip(ftype)
+ elif fid == 10:
+ if ftype == TType.I64:
+ self.updatedAt = iprot.readI64()
else:
iprot.skip(ftype)
else:
@@ -312,25 +761,67 @@ class ComponentStatus(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('ComponentStatus')
- if self.state is not None:
- oprot.writeFieldBegin('state', TType.I32, 1)
- oprot.writeI32(self.state)
+ oprot.writeStructBegin('WorkflowConnection')
+ if self.id is not None:
+ oprot.writeFieldBegin('id', TType.STRING, 1)
+ oprot.writeString(self.id.encode('utf-8') if sys.version_info[0] == 2 else self.id)
+ oprot.writeFieldEnd()
+ if self.belongsToMainWorkflow is not None:
+ oprot.writeFieldBegin('belongsToMainWorkflow', TType.BOOL, 2)
+ oprot.writeBool(self.belongsToMainWorkflow)
+ oprot.writeFieldEnd()
+ if self.fromType is not None:
+ oprot.writeFieldBegin('fromType', TType.I32, 3)
+ oprot.writeI32(self.fromType)
+ oprot.writeFieldEnd()
+ if self.fromId is not None:
+ oprot.writeFieldBegin('fromId', TType.STRING, 4)
+ oprot.writeString(self.fromId.encode('utf-8') if sys.version_info[0] == 2 else self.fromId)
oprot.writeFieldEnd()
- if self.reason is not None:
- oprot.writeFieldBegin('reason', TType.STRING, 2)
- oprot.writeString(self.reason.encode('utf-8') if sys.version_info[0] == 2 else self.reason)
+ if self.fromOutputName is not None:
+ oprot.writeFieldBegin('fromOutputName', TType.STRING, 5)
+ oprot.writeString(self.fromOutputName.encode('utf-8') if sys.version_info[0] == 2 else self.fromOutputName)
oprot.writeFieldEnd()
- if self.timeofStateChange is not None:
- oprot.writeFieldBegin('timeofStateChange', TType.I64, 3)
- oprot.writeI64(self.timeofStateChange)
+ if self.toType is not None:
+ oprot.writeFieldBegin('toType', TType.I32, 6)
+ oprot.writeI32(self.toType)
+ oprot.writeFieldEnd()
+ if self.toId is not None:
+ oprot.writeFieldBegin('toId', TType.STRING, 7)
+ oprot.writeString(self.toId.encode('utf-8') if sys.version_info[0] == 2 else self.toId)
+ oprot.writeFieldEnd()
+ if self.toInputName is not None:
+ oprot.writeFieldBegin('toInputName', TType.STRING, 8)
+ oprot.writeString(self.toInputName.encode('utf-8') if sys.version_info[0] == 2 else self.toInputName)
+ oprot.writeFieldEnd()
+ if self.createdAt is not None:
+ oprot.writeFieldBegin('createdAt', TType.I64, 9)
+ oprot.writeI64(self.createdAt)
+ oprot.writeFieldEnd()
+ if self.updatedAt is not None:
+ oprot.writeFieldBegin('updatedAt', TType.I64, 10)
+ oprot.writeI64(self.updatedAt)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
def validate(self):
- if self.state is None:
- raise TProtocolException(message='Required field state is unset!')
+ if self.id is None:
+ raise TProtocolException(message='Required field id is unset!')
+ if self.belongsToMainWorkflow is None:
+ raise TProtocolException(message='Required field belongsToMainWorkflow is unset!')
+ if self.fromType is None:
+ raise TProtocolException(message='Required field fromType is unset!')
+ if self.fromId is None:
+ raise TProtocolException(message='Required field fromId is unset!')
+ if self.fromOutputName is None:
+ raise TProtocolException(message='Required field fromOutputName is unset!')
+ if self.toType is None:
+ raise TProtocolException(message='Required field toType is unset!')
+ if self.toId is None:
+ raise TProtocolException(message='Required field toId is unset!')
+ if self.toInputName is None:
+ raise TProtocolException(message='Required field toInputName is unset!')
return
def __repr__(self):
@@ -345,25 +836,28 @@ class ComponentStatus(object):
return not (self == other)
-class WorkflowStatus(object):
+class HandlerStatus(object):
"""
Attributes:
+ - id
- state
- - timeOfStateChange
- - reason
+ - description
+ - updatedAt
"""
thrift_spec = (
None, # 0
- (1, TType.I32, 'state', None, None, ), # 1
- (2, TType.I64, 'timeOfStateChange', None, None, ), # 2
- (3, TType.STRING, 'reason', 'UTF8', None, ), # 3
+ (1, TType.STRING, 'id', 'UTF8', None, ), # 1
+ (2, TType.I32, 'state', None, None, ), # 2
+ (3, TType.STRING, 'description', 'UTF8', None, ), # 3
+ (4, TType.I64, 'updatedAt', None, None, ), # 4
)
- def __init__(self, state=None, timeOfStateChange=None, reason=None,):
+ def __init__(self, id=None, state=None, description=None, updatedAt=None,):
+ self.id = id
self.state = state
- self.timeOfStateChange = timeOfStateChange
- self.reason = reason
+ self.description = description
+ self.updatedAt = updatedAt
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -375,18 +869,23 @@ class WorkflowStatus(object):
if ftype == TType.STOP:
break
if fid == 1:
- if ftype == TType.I32:
- self.state = iprot.readI32()
+ if ftype == TType.STRING:
+ self.id = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
elif fid == 2:
- if ftype == TType.I64:
- self.timeOfStateChange = iprot.readI64()
+ if ftype == TType.I32:
+ self.state = iprot.readI32()
else:
iprot.skip(ftype)
elif fid == 3:
if ftype == TType.STRING:
- self.reason = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.description = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 4:
+ if ftype == TType.I64:
+ self.updatedAt = iprot.readI64()
else:
iprot.skip(ftype)
else:
@@ -398,18 +897,22 @@ class WorkflowStatus(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('WorkflowStatus')
+ oprot.writeStructBegin('HandlerStatus')
+ if self.id is not None:
+ oprot.writeFieldBegin('id', TType.STRING, 1)
+ oprot.writeString(self.id.encode('utf-8') if sys.version_info[0] == 2 else self.id)
+ oprot.writeFieldEnd()
if self.state is not None:
- oprot.writeFieldBegin('state', TType.I32, 1)
+ oprot.writeFieldBegin('state', TType.I32, 2)
oprot.writeI32(self.state)
oprot.writeFieldEnd()
- if self.timeOfStateChange is not None:
- oprot.writeFieldBegin('timeOfStateChange', TType.I64, 2)
- oprot.writeI64(self.timeOfStateChange)
+ if self.description is not None:
+ oprot.writeFieldBegin('description', TType.STRING, 3)
+ oprot.writeString(self.description.encode('utf-8') if sys.version_info[0] == 2 else self.description)
oprot.writeFieldEnd()
- if self.reason is not None:
- oprot.writeFieldBegin('reason', TType.STRING, 3)
- oprot.writeString(self.reason.encode('utf-8') if sys.version_info[0] == 2 else self.reason)
+ if self.updatedAt is not None:
+ oprot.writeFieldBegin('updatedAt', TType.I64, 4)
+ oprot.writeI64(self.updatedAt)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -431,28 +934,31 @@ class WorkflowStatus(object):
return not (self == other)
-class EdgeModel(object):
+class DataBlock(object):
"""
Attributes:
- - edgeId
- - name
- - status
- - description
+ - id
+ - value
+ - type
+ - createdAt
+ - updatedAt
"""
thrift_spec = (
None, # 0
- (1, TType.STRING, 'edgeId', 'UTF8', "DO_NOT_SET_AT_CLIENTS", ), # 1
- (2, TType.STRING, 'name', 'UTF8', None, ), # 2
- (3, TType.STRUCT, 'status', (ComponentStatus, ComponentStatus.thrift_spec), None, ), # 3
- (4, TType.STRING, 'description', 'UTF8', None, ), # 4
+ (1, TType.STRING, 'id', 'UTF8', None, ), # 1
+ (2, TType.STRING, 'value', 'UTF8', None, ), # 2
+ (3, TType.I32, 'type', None, None, ), # 3
+ (4, TType.I64, 'createdAt', None, None, ), # 4
+ (5, TType.I64, 'updatedAt', None, None, ), # 5
)
- def __init__(self, edgeId=thrift_spec[1][4], name=None, status=None, description=None,):
- self.edgeId = edgeId
- self.name = name
- self.status = status
- self.description = description
+ def __init__(self, id=None, value=None, type=None, createdAt=None, updatedAt=None,):
+ self.id = id
+ self.value = value
+ self.type = type
+ self.createdAt = createdAt
+ self.updatedAt = updatedAt
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -465,23 +971,27 @@ class EdgeModel(object):
break
if fid == 1:
if ftype == TType.STRING:
- self.edgeId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.id = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.name = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.value = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
elif fid == 3:
- if ftype == TType.STRUCT:
- self.status = ComponentStatus()
- self.status.read(iprot)
+ if ftype == TType.I32:
+ self.type = iprot.readI32()
else:
iprot.skip(ftype)
elif fid == 4:
- if ftype == TType.STRING:
- self.description = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ if ftype == TType.I64:
+ self.createdAt = iprot.readI64()
+ else:
+ iprot.skip(ftype)
+ elif fid == 5:
+ if ftype == TType.I64:
+ self.updatedAt = iprot.readI64()
else:
iprot.skip(ftype)
else:
@@ -493,29 +1003,33 @@ class EdgeModel(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('EdgeModel')
- if self.edgeId is not None:
- oprot.writeFieldBegin('edgeId', TType.STRING, 1)
- oprot.writeString(self.edgeId.encode('utf-8') if sys.version_info[0] == 2 else self.edgeId)
+ oprot.writeStructBegin('DataBlock')
+ if self.id is not None:
+ oprot.writeFieldBegin('id', TType.STRING, 1)
+ oprot.writeString(self.id.encode('utf-8') if sys.version_info[0] == 2 else self.id)
oprot.writeFieldEnd()
- if self.name is not None:
- oprot.writeFieldBegin('name', TType.STRING, 2)
- oprot.writeString(self.name.encode('utf-8') if sys.version_info[0] == 2 else self.name)
+ if self.value is not None:
+ oprot.writeFieldBegin('value', TType.STRING, 2)
+ oprot.writeString(self.value.encode('utf-8') if sys.version_info[0] == 2 else self.value)
oprot.writeFieldEnd()
- if self.status is not None:
- oprot.writeFieldBegin('status', TType.STRUCT, 3)
- self.status.write(oprot)
+ if self.type is not None:
+ oprot.writeFieldBegin('type', TType.I32, 3)
+ oprot.writeI32(self.type)
oprot.writeFieldEnd()
- if self.description is not None:
- oprot.writeFieldBegin('description', TType.STRING, 4)
- oprot.writeString(self.description.encode('utf-8') if sys.version_info[0] == 2 else self.description)
+ if self.createdAt is not None:
+ oprot.writeFieldBegin('createdAt', TType.I64, 4)
+ oprot.writeI64(self.createdAt)
+ oprot.writeFieldEnd()
+ if self.updatedAt is not None:
+ oprot.writeFieldBegin('updatedAt', TType.I64, 5)
+ oprot.writeI64(self.updatedAt)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
def validate(self):
- if self.edgeId is None:
- raise TProtocolException(message='Required field edgeId is unset!')
+ if self.id is None:
+ raise TProtocolException(message='Required field id is unset!')
return
def __repr__(self):
@@ -530,31 +1044,49 @@ class EdgeModel(object):
return not (self == other)
-class PortModel(object):
+class WorkflowHandler(object):
"""
Attributes:
- - portId
- - name
- - status
- - value
- - description
+ - id
+ - belongsToMainWorkflow
+ - type
+ - inputs
+ - outputs
+ - applications
+ - connections
+ - statuses
+ - errors
+ - createdAt
+ - updatedAt
"""
thrift_spec = (
None, # 0
- (1, TType.STRING, 'portId', 'UTF8', "DO_NOT_SET_AT_CLIENTS", ), # 1
- (2, TType.STRING, 'name', 'UTF8', None, ), # 2
- (3, TType.STRUCT, 'status', (ComponentStatus, ComponentStatus.thrift_spec), None, ), # 3
- (4, TType.STRING, 'value', 'UTF8', None, ), # 4
- (5, TType.STRING, 'description', 'UTF8', None, ), # 5
+ (1, TType.STRING, 'id', 'UTF8', None, ), # 1
+ (2, TType.BOOL, 'belongsToMainWorkflow', None, None, ), # 2
+ (3, TType.I32, 'type', None, None, ), # 3
+ (4, TType.LIST, 'inputs', (TType.STRUCT, (airavata.model.application.io.ttypes.InputDataObjectType, airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec), False), None, ), # 4
+ (5, TType.LIST, 'outputs', (TType.STRUCT, (airavata.model.application.io.ttypes.OutputDataObjectType, airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec), False), None, ), # 5
+ (6, TType.LIST, 'applications', (TType.STRUCT, (WorkflowApplication, WorkflowApplication.thrift_spec), False), None, ), # 6
+ (7, TType.LIST, 'connections', (TType.STRUCT, (WorkflowConnection, WorkflowConnection.thrift_spec), False), None, ), # 7
+ (8, TType.LIST, 'statuses', (TType.STRUCT, (HandlerStatus, HandlerStatus.thrift_spec), False), None, ), # 8
+ (9, TType.LIST, 'errors', (TType.STRUCT, (airavata.model.commons.ttypes.ErrorModel, airavata.model.commons.ttypes.ErrorModel.thrift_spec), False), None, ), # 9
+ (10, TType.I64, 'createdAt', None, None, ), # 10
+ (11, TType.I64, 'updatedAt', None, None, ), # 11
)
- def __init__(self, portId=thrift_spec[1][4], name=None, status=None, value=None, description=None,):
- self.portId = portId
- self.name = name
- self.status = status
- self.value = value
- self.description = description
+ def __init__(self, id=None, belongsToMainWorkflow=None, type=None, inputs=None, outputs=None, applications=None, connections=None, statuses=None, errors=None, createdAt=None, updatedAt=None,):
+ self.id = id
+ self.belongsToMainWorkflow = belongsToMainWorkflow
+ self.type = type
+ self.inputs = inputs
+ self.outputs = outputs
+ self.applications = applications
+ self.connections = connections
+ self.statuses = statuses
+ self.errors = errors
+ self.createdAt = createdAt
+ self.updatedAt = updatedAt
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -567,28 +1099,93 @@ class PortModel(object):
break
if fid == 1:
if ftype == TType.STRING:
- self.portId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.id = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
elif fid == 2:
- if ftype == TType.STRING:
- self.name = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ if ftype == TType.BOOL:
+ self.belongsToMainWorkflow = iprot.readBool()
else:
iprot.skip(ftype)
elif fid == 3:
- if ftype == TType.STRUCT:
- self.status = ComponentStatus()
- self.status.read(iprot)
+ if ftype == TType.I32:
+ self.type = iprot.readI32()
else:
iprot.skip(ftype)
elif fid == 4:
- if ftype == TType.STRING:
- self.value = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ if ftype == TType.LIST:
+ self.inputs = []
+ (_etype17, _size14) = iprot.readListBegin()
+ for _i18 in range(_size14):
+ _elem19 = airavata.model.application.io.ttypes.InputDataObjectType()
+ _elem19.read(iprot)
+ self.inputs.append(_elem19)
+ iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 5:
- if ftype == TType.STRING:
- self.description = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ if ftype == TType.LIST:
+ self.outputs = []
+ (_etype23, _size20) = iprot.readListBegin()
+ for _i24 in range(_size20):
+ _elem25 = airavata.model.application.io.ttypes.OutputDataObjectType()
+ _elem25.read(iprot)
+ self.outputs.append(_elem25)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ elif fid == 6:
+ if ftype == TType.LIST:
+ self.applications = []
+ (_etype29, _size26) = iprot.readListBegin()
+ for _i30 in range(_size26):
+ _elem31 = WorkflowApplication()
+ _elem31.read(iprot)
+ self.applications.append(_elem31)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ elif fid == 7:
+ if ftype == TType.LIST:
+ self.connections = []
+ (_etype35, _size32) = iprot.readListBegin()
+ for _i36 in range(_size32):
+ _elem37 = WorkflowConnection()
+ _elem37.read(iprot)
+ self.connections.append(_elem37)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ elif fid == 8:
+ if ftype == TType.LIST:
+ self.statuses = []
+ (_etype41, _size38) = iprot.readListBegin()
+ for _i42 in range(_size38):
+ _elem43 = HandlerStatus()
+ _elem43.read(iprot)
+ self.statuses.append(_elem43)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ elif fid == 9:
+ if ftype == TType.LIST:
+ self.errors = []
+ (_etype47, _size44) = iprot.readListBegin()
+ for _i48 in range(_size44):
+ _elem49 = airavata.model.commons.ttypes.ErrorModel()
+ _elem49.read(iprot)
+ self.errors.append(_elem49)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ elif fid == 10:
+ if ftype == TType.I64:
+ self.createdAt = iprot.readI64()
+ else:
+ iprot.skip(ftype)
+ elif fid == 11:
+ if ftype == TType.I64:
+ self.updatedAt = iprot.readI64()
else:
iprot.skip(ftype)
else:
@@ -600,33 +1197,79 @@ class PortModel(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('PortModel')
- if self.portId is not None:
- oprot.writeFieldBegin('portId', TType.STRING, 1)
- oprot.writeString(self.portId.encode('utf-8') if sys.version_info[0] == 2 else self.portId)
+ oprot.writeStructBegin('WorkflowHandler')
+ if self.id is not None:
+ oprot.writeFieldBegin('id', TType.STRING, 1)
+ oprot.writeString(self.id.encode('utf-8') if sys.version_info[0] == 2 else self.id)
oprot.writeFieldEnd()
- if self.name is not None:
- oprot.writeFieldBegin('name', TType.STRING, 2)
- oprot.writeString(self.name.encode('utf-8') if sys.version_info[0] == 2 else self.name)
+ if self.belongsToMainWorkflow is not None:
+ oprot.writeFieldBegin('belongsToMainWorkflow', TType.BOOL, 2)
+ oprot.writeBool(self.belongsToMainWorkflow)
oprot.writeFieldEnd()
- if self.status is not None:
- oprot.writeFieldBegin('status', TType.STRUCT, 3)
- self.status.write(oprot)
+ if self.type is not None:
+ oprot.writeFieldBegin('type', TType.I32, 3)
+ oprot.writeI32(self.type)
oprot.writeFieldEnd()
- if self.value is not None:
- oprot.writeFieldBegin('value', TType.STRING, 4)
- oprot.writeString(self.value.encode('utf-8') if sys.version_info[0] == 2 else self.value)
+ if self.inputs is not None:
+ oprot.writeFieldBegin('inputs', TType.LIST, 4)
+ oprot.writeListBegin(TType.STRUCT, len(self.inputs))
+ for iter50 in self.inputs:
+ iter50.write(oprot)
+ oprot.writeListEnd()
oprot.writeFieldEnd()
- if self.description is not None:
- oprot.writeFieldBegin('description', TType.STRING, 5)
- oprot.writeString(self.description.encode('utf-8') if sys.version_info[0] == 2 else self.description)
+ if self.outputs is not None:
+ oprot.writeFieldBegin('outputs', TType.LIST, 5)
+ oprot.writeListBegin(TType.STRUCT, len(self.outputs))
+ for iter51 in self.outputs:
+ iter51.write(oprot)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
+ if self.applications is not None:
+ oprot.writeFieldBegin('applications', TType.LIST, 6)
+ oprot.writeListBegin(TType.STRUCT, len(self.applications))
+ for iter52 in self.applications:
+ iter52.write(oprot)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
+ if self.connections is not None:
+ oprot.writeFieldBegin('connections', TType.LIST, 7)
+ oprot.writeListBegin(TType.STRUCT, len(self.connections))
+ for iter53 in self.connections:
+ iter53.write(oprot)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
+ if self.statuses is not None:
+ oprot.writeFieldBegin('statuses', TType.LIST, 8)
+ oprot.writeListBegin(TType.STRUCT, len(self.statuses))
+ for iter54 in self.statuses:
+ iter54.write(oprot)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
+ if self.errors is not None:
+ oprot.writeFieldBegin('errors', TType.LIST, 9)
+ oprot.writeListBegin(TType.STRUCT, len(self.errors))
+ for iter55 in self.errors:
+ iter55.write(oprot)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
+ if self.createdAt is not None:
+ oprot.writeFieldBegin('createdAt', TType.I64, 10)
+ oprot.writeI64(self.createdAt)
+ oprot.writeFieldEnd()
+ if self.updatedAt is not None:
+ oprot.writeFieldBegin('updatedAt', TType.I64, 11)
+ oprot.writeI64(self.updatedAt)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
def validate(self):
- if self.portId is None:
- raise TProtocolException(message='Required field portId is unset!')
+ if self.id is None:
+ raise TProtocolException(message='Required field id is unset!')
+ if self.belongsToMainWorkflow is None:
+ raise TProtocolException(message='Required field belongsToMainWorkflow is unset!')
+ if self.type is None:
+ raise TProtocolException(message='Required field type is unset!')
return
def __repr__(self):
@@ -641,34 +1284,61 @@ class PortModel(object):
return not (self == other)
-class NodeModel(object):
+class AiravataWorkflow(object):
"""
Attributes:
- - nodeId
+ - id
- name
- - applicationId
- - applicationName
- - status
+ - gatewayId
+ - userName
+ - storageResourceId
- description
+ - enableEmailNotification
+ - notificationEmails
+ - applications
+ - handlers
+ - connections
+ - statuses
+ - errors
+ - createdAt
+ - updatedAt
"""
thrift_spec = (
None, # 0
- (1, TType.STRING, 'nodeId', 'UTF8', "DO_NOT_SET_AT_CLIENTS", ), # 1
+ (1, TType.STRING, 'id', 'UTF8', "DO_NOT_SET_AT_CLIENTS", ), # 1
(2, TType.STRING, 'name', 'UTF8', None, ), # 2
- (3, TType.STRING, 'applicationId', 'UTF8', None, ), # 3
- (4, TType.STRING, 'applicationName', 'UTF8', None, ), # 4
- (5, TType.STRUCT, 'status', (ComponentStatus, ComponentStatus.thrift_spec), None, ), # 5
+ (3, TType.STRING, 'gatewayId', 'UTF8', None, ), # 3
+ (4, TType.STRING, 'userName', 'UTF8', None, ), # 4
+ (5, TType.STRING, 'storageResourceId', 'UTF8', None, ), # 5
(6, TType.STRING, 'description', 'UTF8', None, ), # 6
+ (7, TType.BOOL, 'enableEmailNotification', None, None, ), # 7
+ (8, TType.LIST, 'notificationEmails', (TType.STRUCT, (NotificationEmail, NotificationEmail.thrift_spec), False), None, ), # 8
+ (9, TType.LIST, 'applications', (TType.STRUCT, (WorkflowApplication, WorkflowApplication.thrift_spec), False), None, ), # 9
+ (10, TType.LIST, 'handlers', (TType.STRUCT, (WorkflowHandler, WorkflowHandler.thrift_spec), False), None, ), # 10
+ (11, TType.LIST, 'connections', (TType.STRUCT, (WorkflowConnection, WorkflowConnection.thrift_spec), False), None, ), # 11
+ (12, TType.LIST, 'statuses', (TType.STRUCT, (WorkflowStatus, WorkflowStatus.thrift_spec), False), None, ), # 12
+ (13, TType.LIST, 'errors', (TType.STRUCT, (airavata.model.commons.ttypes.ErrorModel, airavata.model.commons.ttypes.ErrorModel.thrift_spec), False), None, ), # 13
+ (14, TType.I64, 'createdAt', None, None, ), # 14
+ (15, TType.I64, 'updatedAt', None, None, ), # 15
)
- def __init__(self, nodeId=thrift_spec[1][4], name=None, applicationId=None, applicationName=None, status=None, description=None,):
- self.nodeId = nodeId
+ def __init__(self, id=thrift_spec[1][4], name=None, gatewayId=None, userName=None, storageResourceId=None, description=None, enableEmailNotification=None, notificationEmails=None, applications=None, handlers=None, connections=None, statuses=None, errors=None, createdAt=None, updatedAt=None,):
+ self.id = id
self.name = name
- self.applicationId = applicationId
- self.applicationName = applicationName
- self.status = status
+ self.gatewayId = gatewayId
+ self.userName = userName
+ self.storageResourceId = storageResourceId
self.description = description
+ self.enableEmailNotification = enableEmailNotification
+ self.notificationEmails = notificationEmails
+ self.applications = applications
+ self.handlers = handlers
+ self.connections = connections
+ self.statuses = statuses
+ self.errors = errors
+ self.createdAt = createdAt
+ self.updatedAt = updatedAt
def read(self, iprot):
if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -681,7 +1351,7 @@ class NodeModel(object):
break
if fid == 1:
if ftype == TType.STRING:
- self.nodeId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.id = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
elif fid == 2:
@@ -691,18 +1361,17 @@ class NodeModel(object):
iprot.skip(ftype)
elif fid == 3:
if ftype == TType.STRING:
- self.applicationId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
elif fid == 4:
if ftype == TType.STRING:
- self.applicationName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+ self.userName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
elif fid == 5:
- if ftype == TType.STRUCT:
- self.status = ComponentStatus()
- self.status.read(iprot)
+ if ftype == TType.STRING:
+ self.storageResourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
elif fid == 6:
@@ -710,6 +1379,87 @@ class NodeModel(object):
self.description = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
+ elif fid == 7:
+ if ftype == TType.BOOL:
+ self.enableEmailNotification = iprot.readBool()
+ else:
+ iprot.skip(ftype)
+ elif fid == 8:
+ if ftype == TType.LIST:
+ self.notificationEmails = []
+ (_etype59, _size56) = iprot.readListBegin()
+ for _i60 in range(_size56):
+ _elem61 = NotificationEmail()
+ _elem61.read(iprot)
+ self.notificationEmails.append(_elem61)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ elif fid == 9:
+ if ftype == TType.LIST:
+ self.applications = []
+ (_etype65, _size62) = iprot.readListBegin()
+ for _i66 in range(_size62):
+ _elem67 = WorkflowApplication()
+ _elem67.read(iprot)
+ self.applications.append(_elem67)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ elif fid == 10:
+ if ftype == TType.LIST:
+ self.handlers = []
+ (_etype71, _size68) = iprot.readListBegin()
+ for _i72 in range(_size68):
+ _elem73 = WorkflowHandler()
+ _elem73.read(iprot)
+ self.handlers.append(_elem73)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ elif fid == 11:
+ if ftype == TType.LIST:
+ self.connections = []
+ (_etype77, _size74) = iprot.readListBegin()
+ for _i78 in range(_size74):
+ _elem79 = WorkflowConnection()
+ _elem79.read(iprot)
+ self.connections.append(_elem79)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ elif fid == 12:
+ if ftype == TType.LIST:
+ self.statuses = []
+ (_etype83, _size80) = iprot.readListBegin()
+ for _i84 in range(_size80):
+ _elem85 = WorkflowStatus()
+ _elem85.read(iprot)
+ self.statuses.append(_elem85)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ elif fid == 13:
+ if ftype == TType.LIST:
+ self.errors = []
+ (_etype89, _size86) = iprot.readListBegin()
+ for _i90 in range(_size86):
+ _elem91 = airavata.model.commons.ttypes.ErrorModel()
+ _elem91.read(iprot)
+ self.errors.append(_elem91)
+ iprot.readListEnd()
+ else:
+ iprot.skip(ftype)
+ elif fid == 14:
+ if ftype == TType.I64:
+ self.createdAt = iprot.readI64()
+ else:
+ iprot.skip(ftype)
+ elif fid == 15:
+ if ftype == TType.I64:
+ self.updatedAt = iprot.readI64()
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -719,37 +1469,99 @@ class NodeModel(object):
if oprot._fast_encode is not None and self.thrift_spec is not None:
oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('NodeModel')
- if self.nodeId is not None:
- oprot.writeFieldBegin('nodeId', TType.STRING, 1)
- oprot.writeString(self.nodeId.encode('utf-8') if sys.version_info[0] == 2 else self.nodeId)
+ oprot.writeStructBegin('AiravataWorkflow')
+ if self.id is not None:
+ oprot.writeFieldBegin('id', TType.STRING, 1)
+ oprot.writeString(self.id.encode('utf-8') if sys.version_info[0] == 2 else self.id)
oprot.writeFieldEnd()
if self.name is not None:
oprot.writeFieldBegin('name', TType.STRING, 2)
oprot.writeString(self.name.encode('utf-8') if sys.version_info[0] == 2 else self.name)
oprot.writeFieldEnd()
- if self.applicationId is not None:
- oprot.writeFieldBegin('applicationId', TType.STRING, 3)
- oprot.writeString(self.applicationId.encode('utf-8') if sys.version_info[0] == 2 else self.applicationId)
+ if self.gatewayId is not None:
+ oprot.writeFieldBegin('gatewayId', TType.STRING, 3)
+ oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
oprot.writeFieldEnd()
- if self.applicationName is not None:
- oprot.writeFieldBegin('applicationName', TType.STRING, 4)
- oprot.writeString(self.applicationName.encode('utf-8') if sys.version_info[0] == 2 else self.applicationName)
+ if self.userName is not None:
+ oprot.writeFieldBegin('userName', TType.STRING, 4)
+ oprot.writeString(self.userName.encode('utf-8') if sys.version_info[0] == 2 else self.userName)
oprot.writeFieldEnd()
- if self.status is not None:
- oprot.writeFieldBegin('status', TType.STRUCT, 5)
- self.status.write(oprot)
+ if self.storageResourceId is not None:
+ oprot.writeFieldBegin('storageResourceId', TType.STRING, 5)
+ oprot.writeString(self.storageResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.storageResourceId)
oprot.writeFieldEnd()
if self.description is not None:
oprot.writeFieldBegin('description', TType.STRING, 6)
oprot.writeString(self.description.encode('utf-8') if sys.version_info[0] == 2 else self.description)
oprot.writeFieldEnd()
+ if self.enableEmailNotification is not None:
+ oprot.writeFieldBegin('enableEmailNotification', TType.BOOL, 7)
+ oprot.writeBool(self.enableEmailNotification)
+ oprot.writeFieldEnd()
+ if self.notificationEmails is not None:
+ oprot.writeFieldBegin('notificationEmails', TType.LIST, 8)
+ oprot.writeListBegin(TType.STRUCT, len(self.notificationEmails))
+ for iter92 in self.notificationEmails:
+ iter92.write(oprot)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
+ if self.applications is not None:
+ oprot.writeFieldBegin('applications', TType.LIST, 9)
+ oprot.writeListBegin(TType.STRUCT, len(self.applications))
+ for iter93 in self.applications:
+ iter93.write(oprot)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
+ if self.handlers is not None:
+ oprot.writeFieldBegin('handlers', TType.LIST, 10)
+ oprot.writeListBegin(TType.STRUCT, len(self.handlers))
+ for iter94 in self.handlers:
+ iter94.write(oprot)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
+ if self.connections is not None:
+ oprot.writeFieldBegin('connections', TType.LIST, 11)
+ oprot.writeListBegin(TType.STRUCT, len(self.connections))
+ for iter95 in self.connections:
+ iter95.write(oprot)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
+ if self.statuses is not None:
+ oprot.writeFieldBegin('statuses', TType.LIST, 12)
+ oprot.writeListBegin(TType.STRUCT, len(self.statuses))
+ for iter96 in self.statuses:
+ iter96.write(oprot)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
+ if self.errors is not None:
+ oprot.writeFieldBegin('errors', TType.LIST, 13)
+ oprot.writeListBegin(TType.STRUCT, len(self.errors))
+ for iter97 in self.errors:
+ iter97.write(oprot)
+ oprot.writeListEnd()
+ oprot.writeFieldEnd()
+ if self.createdAt is not None:
+ oprot.writeFieldBegin('createdAt', TType.I64, 14)
+ oprot.writeI64(self.createdAt)
+ oprot.writeFieldEnd()
+ if self.updatedAt is not None:
+ oprot.writeFieldBegin('updatedAt', TType.I64, 15)
+ oprot.writeI64(self.updatedAt)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
def validate(self):
- if self.nodeId is None:
- raise TProtocolException(message='Required field nodeId is unset!')
+ if self.id is None:
+ raise TProtocolException(message='Required field id is unset!')
+ if self.name is None:
+ raise TProtocolException(message='Required field name is unset!')
+ if self.gatewayId is None:
+ raise TProtocolException(message='Required field gatewayId is unset!')
+ if self.userName is None:
+ raise TProtocolException(message='Required field userName is unset!')
+ if self.storageResourceId is None:
+ raise TProtocolException(message='Required field storageResourceId is unset!')
return
def __repr__(self):
[airavata-django-portal] 03/03: AIRAVATA-2840 WIP: display list of
SSH credentials
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 77ab5c229722a2f986c0b0252721aead411d2032
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Mon Sep 24 15:23:56 2018 -0400
AIRAVATA-2840 WIP: display list of SSH credentials
---
.../dashboards/CredentialStoreDashboard.vue | 187 +++++----------
.../static/django_airavata_admin/src/router.js | 2 +-
django_airavata/apps/admin/urls.py | 5 +-
django_airavata/apps/admin/views.py | 2 +-
django_airavata/apps/api/serializers.py | 7 +
.../js/models/CredentialSummary.js | 38 +--
.../django_airavata_api/js/service_config.js | 263 +++++++++++++--------
django_airavata/apps/api/urls.py | 63 ++---
django_airavata/apps/api/views.py | 215 +++++------------
9 files changed, 343 insertions(+), 439 deletions(-)
diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/dashboards/CredentialStoreDashboard.vue b/django_airavata/apps/admin/static/django_airavata_admin/src/components/dashboards/CredentialStoreDashboard.vue
index a622631..04ba927 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/dashboards/CredentialStoreDashboard.vue
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/dashboards/CredentialStoreDashboard.vue
@@ -1,132 +1,71 @@
<template>
- <div class="gen">
- <loading></loading>
- <div class="main_section interface-main" v-on:created="fetchSSHKeys()">
- <div class="input-field-header">
- Generate New SSH Key
- </div>
- <generate-s-s-h-key v-on:created="fetchSSHKeys()"></generate-s-s-h-key>
- </div>
- <div class="main_section interface-main">
- <div class="input-field-header">
- SSH Keys
- </div>
- <div>
- <div class="ssh" v-bind:id="'id_'+sshKey.token" v-for="sshKey in sshKeys">
- <h6>Description:</h6>
- <label v-if="sshKey.description">{{sshKey.description}}</label>
- <label style="color:#007BFF" v-else>Description for the SHH Key is not available</label>
- <div class="ssh-key">
- <div class="ssh-val">
- <input readonly type="text" v-bind:id="sshKey.token" v-model="sshKey.publicKey"/>
- <button class="vbtn vbtn-default" v-on:click="copySSHKey(sshKey.token)">Copy</button>
- </div>
- <button class="vbtn vbtn-cancel" v-on:click="deleteSSHKey(sshKey)">Delete</button>
- </div>
- </div>
- </div>
- </div>
- </div>
+ <list-layout @add-new-item="addNewSSHCredential" :items="sshKeys" title="SSH Credentials" new-item-button-text="New SSH Credential">
+ <template slot="item-list" slot-scope="slotProps">
+
+ <b-table striped hover :fields="fields" :items="slotProps.items">
+ <template slot="action" slot-scope="data">
+ <delete-link @delete="deleteSSHCredential(data.item)">
+ Are you sure you want to delete this SSH credential?
+ </delete-link>
+ </template>
+ </b-table>
+ </template>
+ </list-layout>
</template>
+
<script>
- import GenerateSSHKey from '../admin/GenerateSSHKey.vue'
- import Loading from '../Loading.vue'
- import Utils from '../../utils'
+import { services } from "django-airavata-api";
+import { components, layouts } from "django-airavata-common-ui";
+import moment from "moment";
- export default {
- components: {
- GenerateSSHKey, Loading
- },
- mounted: function () {
- this.fetchSSHKeys()
- },
- data: function () {
- return {
- sshKeys: []
- }
- },
- methods: {
- fetchSSHKeys: function () {
- Utils.get('/api/credentials/ssh/keys', {success: (value) => this.sshKeys = value})
- },
- deleteSSHKey: function (sshKey) {
- var success = (value) => {
- console.log("Successfully Deleted key:", value)
- var el=document.getElementById('id_'+sshKey.token)
- el.classList.add("remove")
- this.sshKeys.splice(this.sshKeys.indexOf(sshKey), 1)
- this.sshKeys = [].concat(this.sshKeys)
+export default {
+ components: {
+ "delete-link": components.DeleteLink,
+ "list-layout": layouts.ListLayout
+ },
+ created: function() {
+ this.fetchSSHKeys();
+ },
+ data: function() {
+ return {
+ sshKeys: []
+ };
+ },
+ computed: {
+ fields() {
+ return [
+ {
+ label: "Description",
+ key: "description"
+ },
+ {
+ label: "User",
+ key: "username"
+ },
+ {
+ label: "Created",
+ key: "persistedTime",
+ formatter: value => moment(new Date(value)).fromNow()
+ },
+ {
+ label: "Action",
+ key: "action"
}
- Utils.post('/api/credentials/ssh/key/delete', {'token': sshKey.token}, {success: success})
- },
- copySSHKey: function (token) {
- var sshKeyElement = document.getElementById(token)
- sshKeyElement.select()
- document.execCommand('copy')
- sshKeyElement.blur()
- }
-
+ ];
}
+ },
+ methods: {
+ fetchSSHKeys() {
+ services.CredentialSummaryService.allSSHCredentials().then(sshCreds => {
+ console.log(
+ "loaded SSH Credentials",
+ JSON.stringify(sshCreds, null, 4)
+ );
+ this.sshKeys = sshCreds;
+ });
+ },
+ addNewSSHCredentials() {},
+ deleteSSHCredential() {}
}
+};
</script>
-<style>
- .gen {
- padding: 10px;
- width: 40%;
- height: 100%;
- }
-
- @keyframes fadeIn {
- from{opacity: 0}
- to{opacity: 1}
- }
-
- @keyframes fadeOut {
- from{opacity: 1}
- to{opacity: 0}
- }
-
- .ssh {
- padding: 10px;
- border-bottom: solid 1px #dddddd;
- animation: fadeIn 1s;
- }
- .ssh.remove{
- animation: fadeOut 1s;
- opacity: 1;
- }
-
-
- .ssh-key {
- display: inline-flex;
- width: 100%;
- }
-
- .ssh-val {
- display: inline-flex;
- width: 100%;
- }
-
- .ssh-val button {
- margin-left: 0px;
- border-top-left-radius: 0px;
- border-bottom-left-radius: 0px;
- }
-
- .ssh-val input {
- border-top-right-radius: 0px;
- border-bottom-right-radius: 0px;
- }
-
- .ssh .vbtn.vbtn-cancel:hover {
- border-color: #ff0b03;
- background-color: #ff0b03;
- color: white;
- }
-
- .ssh .vbtn.vbtn-cancel:active {
- border-color: #ff0b03;
- background-color: white;
- color: #ff0b03;
- }
-</style>
diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/router.js b/django_airavata/apps/admin/static/django_airavata_admin/src/router.js
index 87f1f52..71eef6f 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/router.js
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/router.js
@@ -113,7 +113,7 @@ const routes = [
name: "group_resource_preference_dashboard"
},
{
- path: "/credential/store",
+ path: "/credentials",
component: CredentialStoreDashboard,
name: "credential_store"
}
diff --git a/django_airavata/apps/admin/urls.py b/django_airavata/apps/admin/urls.py
index c763365..92e06e6 100644
--- a/django_airavata/apps/admin/urls.py
+++ b/django_airavata/apps/admin/urls.py
@@ -6,6 +6,7 @@ app_name = 'django_airavata_admin'
urlpatterns = [
url(r'^$', views.home, name='home'),
url(r'^applications/', views.app_catalog, name='app_catalog'),
- url(r'^credential_store$', views.credential_store, name='credential_store'),
- url(r'^group-resource-profiles/', views.group_resource_profile, name='group_resource_profile'),
+ url(r'^credentials/', views.credential_store, name='credential_store'),
+ url(r'^group-resource-profiles/', views.group_resource_profile,
+ name='group_resource_profile'),
]
diff --git a/django_airavata/apps/admin/views.py b/django_airavata/apps/admin/views.py
index d8c710c..8f1df4b 100644
--- a/django_airavata/apps/admin/views.py
+++ b/django_airavata/apps/admin/views.py
@@ -17,7 +17,7 @@ def app_catalog(request):
@login_required
def credential_store(request):
request.active_nav_item = 'credential_store'
- return render(request, 'admin/credential_store.html')
+ return render(request, 'admin/admin_base.html')
@login_required
diff --git a/django_airavata/apps/api/serializers.py b/django_airavata/apps/api/serializers.py
index c052a40..58652dc 100644
--- a/django_airavata/apps/api/serializers.py
+++ b/django_airavata/apps/api/serializers.py
@@ -630,3 +630,10 @@ class CredentialSummarySerializer(
thrift_utils.create_serializer_class(CredentialSummary)):
type = thrift_utils.ThriftEnumField(SummaryType)
persistedTime = UTCPosixTimestampDateTimeField()
+ userHasWriteAccess = serializers.SerializerMethodField()
+
+ def get_userHasWriteAccess(self, credential_summary):
+ request = self.context['request']
+ return request.airavata_client.userHasAccess(
+ request.authz_token, credential_summary.token,
+ ResourcePermissionType.WRITE)
diff --git a/django_airavata/apps/api/static/django_airavata_api/js/models/CredentialSummary.js b/django_airavata/apps/api/static/django_airavata_api/js/models/CredentialSummary.js
index a85d89e..9a658ec 100644
--- a/django_airavata/apps/api/static/django_airavata_api/js/models/CredentialSummary.js
+++ b/django_airavata/apps/api/static/django_airavata_api/js/models/CredentialSummary.js
@@ -1,25 +1,25 @@
-import BaseModel from './BaseModel'
-import SummaryType from './SummaryType'
+import BaseModel from "./BaseModel";
+import SummaryType from "./SummaryType";
const FIELDS = [
- {
- name: 'type',
- type: SummaryType,
- },
- 'gatewayId',
- 'username',
- 'publicKey',
- {
- name: 'persistedTime',
- type: Date,
- },
- 'token',
- 'description',
+ {
+ name: "type",
+ type: SummaryType
+ },
+ "gatewayId",
+ "username",
+ "publicKey",
+ {
+ name: "persistedTime",
+ type: Date
+ },
+ "token",
+ "description",
+ "userHasWriteAccess"
];
export default class CredentialSummary extends BaseModel {
-
- constructor(data = {}) {
- super(FIELDS, data);
- }
+ constructor(data = {}) {
+ super(FIELDS, data);
+ }
}
diff --git a/django_airavata/apps/api/static/django_airavata_api/js/service_config.js b/django_airavata/apps/api/static/django_airavata_api/js/service_config.js
index 6467fe7..1a707fd 100644
--- a/django_airavata/apps/api/static/django_airavata_api/js/service_config.js
+++ b/django_airavata/apps/api/static/django_airavata_api/js/service_config.js
@@ -1,13 +1,13 @@
-import ApplicationDeploymentDescription from './models/ApplicationDeploymentDescription'
-import ApplicationModule from './models/ApplicationModule';
-import ComputeResourceDescription from './models/ComputeResourceDescription'
-import CredentialSummary from './models/CredentialSummary'
-import Group from './models/Group'
-import GroupResourceProfile from './models/GroupResourceProfile'
-import SharedEntity from './models/SharedEntity'
-import UserProfile from './models/UserProfile'
-import ApplicationInterfaceDefinition from './models/ApplicationInterfaceDefinition';
-import BatchQueue from './models/BatchQueue';
+import ApplicationDeploymentDescription from "./models/ApplicationDeploymentDescription";
+import ApplicationModule from "./models/ApplicationModule";
+import ComputeResourceDescription from "./models/ComputeResourceDescription";
+import CredentialSummary from "./models/CredentialSummary";
+import Group from "./models/Group";
+import GroupResourceProfile from "./models/GroupResourceProfile";
+import SharedEntity from "./models/SharedEntity";
+import UserProfile from "./models/UserProfile";
+import ApplicationInterfaceDefinition from "./models/ApplicationInterfaceDefinition";
+import BatchQueue from "./models/BatchQueue";
const post = "post";
const get = "get";
@@ -42,118 +42,173 @@ pagination:true # whether to treat the response as a paginated response
*/
export default {
- "ApplicationDeployments": {
+ ApplicationDeployments: {
url: "/api/application-deployments",
- viewSet: [{
- name: "list"
- }, {
- name: "create"
- }, {
- name: "retrieve"
- }, {
- name: "update"
- }, {
- name: "delete"
- }, {
- name: "getQueues",
- url: "/api/application-deployments/<lookup>/queues/",
- requestType: 'get',
- modelClass: BatchQueue
- }],
- queryParams: ['appModuleId', 'groupResourceProfileId'],
- modelClass: ApplicationDeploymentDescription,
+ viewSet: [
+ {
+ name: "list"
+ },
+ {
+ name: "create"
+ },
+ {
+ name: "retrieve"
+ },
+ {
+ name: "update"
+ },
+ {
+ name: "delete"
+ },
+ {
+ name: "getQueues",
+ url: "/api/application-deployments/<lookup>/queues/",
+ requestType: "get",
+ modelClass: BatchQueue
+ }
+ ],
+ queryParams: ["appModuleId", "groupResourceProfileId"],
+ modelClass: ApplicationDeploymentDescription
},
- "ApplicationInterfaces": {
+ ApplicationInterfaces: {
url: "/api/application-interfaces",
viewSet: true,
- modelClass: ApplicationInterfaceDefinition,
+ modelClass: ApplicationInterfaceDefinition
},
- "ApplicationModules": {
+ ApplicationModules: {
url: "/api/applications",
- viewSet: [{
- name: "list"
- }, {
- name: "create"
- }, {
- name: "retrieve"
- }, {
- name: "update"
- }, {
- name: "delete"
- }, {
- name: "getApplicationInterface",
- url: "/api/applications/<lookup>/application_interface/",
- requestType: 'get',
- modelClass: ApplicationInterfaceDefinition
- }, {
- name: "getApplicationDeployments",
- url: "/api/applications/<lookup>/application_deployments/",
- requestType: 'get',
- modelClass: ApplicationDeploymentDescription
- }, {
- name: "listAll",
- url: "/api/applications/list_all/",
- requestType: 'get',
- modelClass: ApplicationModule,
- }],
- modelClass: ApplicationModule,
+ viewSet: [
+ {
+ name: "list"
+ },
+ {
+ name: "create"
+ },
+ {
+ name: "retrieve"
+ },
+ {
+ name: "update"
+ },
+ {
+ name: "delete"
+ },
+ {
+ name: "getApplicationInterface",
+ url: "/api/applications/<lookup>/application_interface/",
+ requestType: "get",
+ modelClass: ApplicationInterfaceDefinition
+ },
+ {
+ name: "getApplicationDeployments",
+ url: "/api/applications/<lookup>/application_deployments/",
+ requestType: "get",
+ modelClass: ApplicationDeploymentDescription
+ },
+ {
+ name: "listAll",
+ url: "/api/applications/list_all/",
+ requestType: "get",
+ modelClass: ApplicationModule
+ }
+ ],
+ modelClass: ApplicationModule
},
- "ComputeResources": {
+ ComputeResources: {
url: "/api/compute-resources",
- viewSet: [{
- name: "retrieve"
- }, {
- name: "names",
- url: "/api/compute-resources/all_names/",
- requestType: 'get',
- }, {
- name: "namesList",
- url: "/api/compute-resources/all_names_list/",
- requestType: 'get',
- }],
- modelClass: ComputeResourceDescription,
+ viewSet: [
+ {
+ name: "retrieve"
+ },
+ {
+ name: "names",
+ url: "/api/compute-resources/all_names/",
+ requestType: "get"
+ },
+ {
+ name: "namesList",
+ url: "/api/compute-resources/all_names_list/",
+ requestType: "get"
+ }
+ ],
+ modelClass: ComputeResourceDescription
},
- "CredentialSummaries": {
+ CredentialSummaries: {
url: "/api/credential-summaries/",
- viewSet: [{
- name: "list"
- }],
- modelClass: CredentialSummary,
+ viewSet: [
+ {
+ name: "list"
+ },
+ {
+ name: "delete"
+ },
+ {
+ name: "allSSHCredentials",
+ url: "/api/credential-summaries/ssh/",
+ requestType: "get",
+ modelClass: CredentialSummary
+ },
+ {
+ name: "allPasswordCredentials",
+ url: "/api/credential-summaries/password/",
+ requestType: "get",
+ modelClass: CredentialSummary
+ },
+ {
+ name: "createSSH",
+ url: "/api/credential-summaries/create_ssh/",
+ requestType: "post",
+ modelClass: CredentialSummary
+ },
+ {
+ name: "createPassword",
+ url: "/api/credential-summaries/create_password/",
+ requestType: "post",
+ modelClass: CredentialSummary
+ }
+ ],
+ modelClass: CredentialSummary
},
- "GroupResourceProfiles": {
+ GroupResourceProfiles: {
url: "/api/group-resource-profiles/",
viewSet: true,
- modelClass: GroupResourceProfile,
+ modelClass: GroupResourceProfile
},
- "Groups": {
+ Groups: {
url: "/api/groups",
viewSet: true,
pagination: true,
- queryParams: ['limit', 'offset'],
- modelClass: Group,
+ queryParams: ["limit", "offset"],
+ modelClass: Group
},
- "SharedEntities": {
+ SharedEntities: {
url: "/api/shared-entities",
- viewSet: [{
- name: "retrieve"
- }, {
- name: "update"
- }, {
- name: "merge",
- url: "/api/shared-entities/<lookup>/merge/",
- bodyParams: {
- name: "data"
- },
- requestType: 'put',
- modelClass: SharedEntity
- }],
- modelClass: SharedEntity,
+ viewSet: [
+ {
+ name: "retrieve"
+ },
+ {
+ name: "update"
+ },
+ {
+ name: "merge",
+ url: "/api/shared-entities/<lookup>/merge/",
+ bodyParams: {
+ name: "data"
+ },
+ requestType: "put",
+ modelClass: SharedEntity
+ }
+ ],
+ modelClass: SharedEntity
},
- "UserProfiles": {
+ UserProfiles: {
url: "/api/user-profiles",
- viewSet: [{
- name: "list"
- }],
- modelClass: UserProfile,
- },
-}
+ viewSet: [
+ {
+ name: "list"
+ }
+ ],
+ modelClass: UserProfile
+ }
+};
diff --git a/django_airavata/apps/api/urls.py b/django_airavata/apps/api/urls.py
index 5e4f0bf..7073252 100644
--- a/django_airavata/apps/api/urls.py
+++ b/django_airavata/apps/api/urls.py
@@ -9,19 +9,23 @@ logger = logging.getLogger(__name__)
router = routers.DefaultRouter()
router.register(r'projects', views.ProjectViewSet, base_name='project')
-router.register(r'experiments', views.ExperimentViewSet, base_name='experiment')
-router.register(r'full-experiments', views.FullExperimentViewSet, base_name='full-experiment')
-router.register(r'experiment-search', views.ExperimentSearchViewSet, base_name='experiment-search')
+router.register(r'experiments', views.ExperimentViewSet,
+ base_name='experiment')
+router.register(r'full-experiments', views.FullExperimentViewSet,
+ base_name='full-experiment')
+router.register(r'experiment-search', views.ExperimentSearchViewSet,
+ base_name='experiment-search')
router.register(r'groups', views.GroupViewSet, base_name='group')
-router.register(r'new/application/module', views.RegisterApplicationModule, base_name='register_app_module')
-router.register(r'application-interfaces', views.ApplicationInterfaceViewSet, base_name='application-interface')
-router.register(r'applications', views.ApplicationModuleViewSet, base_name='application')
-router.register(r'application-deployments', views.ApplicationDeploymentViewSet, base_name='application-deployment')
+router.register(r'application-interfaces', views.ApplicationInterfaceViewSet,
+ base_name='application-interface')
+router.register(r'applications', views.ApplicationModuleViewSet,
+ base_name='application')
+router.register(r'application-deployments', views.ApplicationDeploymentViewSet,
+ base_name='application-deployment')
router.register(r'user-profiles', views.UserProfileViewSet,
base_name='user-profile')
router.register(r'group-resource-profiles', views.GroupResourceProfileViewSet,
base_name='group-resource-profile')
-router.register(r'shared/group/entities',views.SharedEntityGroups,base_name="shared_entities_with_groups")
router.register(r'shared-entities', views.SharedEntityViewSet,
base_name='shared-entity')
router.register(r'compute-resources', views.ComputeResourceViewSet,
@@ -32,31 +36,28 @@ router.register(r'credential-summaries', views.CredentialSummaryViewSet,
app_name = 'django_airavata_api'
urlpatterns = [
url(r'^', include(router.urls)),
- url(r'^new/application/module$', views.RegisterApplicationModule.as_view(), name='register_application_module'),
- url(r'^new/application/interface$', views.RegisterApplicationInterface.as_view(),
- name='register_application_interface'),
- url(r'^new/application/deployment$', views.RegisterApplicationDeployments.as_view(),
- name='register_application_deployments'),
- url(r'^application/interfaces$', views.ApplicationInterfaceList.as_view(), name="app_interfaces"),
- url(r'^application/interface$', views.FetchApplicationInterface.as_view(), name="app_interface"),
- url(r'^application/deployment$', views.FetchApplicationDeployment.as_view(), name="app_deployment"),
- url(r'^credentials/ssh/keys', views.FetchSSHPubKeys.as_view(), name="ssh_keys"),
- url(r'^credentials/ssh/key/delete', views.DeleteSSHPubKey.as_view(), name="ssh_key_deletion"),
- url(r'^credentials/ssh/key/create', views.GenerateRegisterSSHKeys.as_view(), name="ssh_key_creation"),
url(r'^upload$', views.upload_input_file, name='upload_input_file'),
url(r'^download', views.download_file, name='download_file'),
- url(r'^credentials/ssh/key/create', views.GenerateRegisterSSHKeys.as_view(), name="ssh_key_creation"),
- url(r'^job/submission/local', views.LocalJobSubmissionView.as_view(), name="local_job_submission"),
- url(r'^job/submission/cloud', views.CloudJobSubmissionView.as_view(), name="cloud_job_submission"),
- url(r'^job/submission/globus', views.GlobusJobSubmissionView.as_view(), name="globus_job_submission"),
- url(r'^job/submission/ssh', views.SshJobSubmissionView.as_view(), name="ssh_job_submission"),
- url(r'^job/submission/unicore', views.UnicoreJobSubmissionView.as_view(), name="unicore_job_submission"),
- url(r'^data/movement/gridftp', views.GridFtpDataMovementView.as_view(), name="grid_ftp_data_movement"),
- url(r'^data/movement/local', views.LocalDataMovementView.as_view(), name="local_ftp_data_movement"),
- url(r'^data/movement/unicore', views.UnicoreDataMovementView.as_view(), name="unicore_ftp_data_movement"),
- url(r'^data/movement/scp', views.ScpDataMovementView.as_view(), name="scp_ftp_data_movement"),
+ url(r'^job/submission/local', views.LocalJobSubmissionView.as_view(),
+ name="local_job_submission"),
+ url(r'^job/submission/cloud', views.CloudJobSubmissionView.as_view(),
+ name="cloud_job_submission"),
+ url(r'^job/submission/globus', views.GlobusJobSubmissionView.as_view(),
+ name="globus_job_submission"),
+ url(r'^job/submission/ssh', views.SshJobSubmissionView.as_view(),
+ name="ssh_job_submission"),
+ url(r'^job/submission/unicore', views.UnicoreJobSubmissionView.as_view(),
+ name="unicore_job_submission"),
+ url(r'^data/movement/gridftp', views.GridFtpDataMovementView.as_view(),
+ name="grid_ftp_data_movement"),
+ url(r'^data/movement/local', views.LocalDataMovementView.as_view(),
+ name="local_ftp_data_movement"),
+ url(r'^data/movement/unicore', views.UnicoreDataMovementView.as_view(),
+ name="unicore_ftp_data_movement"),
+ url(r'^data/movement/scp', views.ScpDataMovementView.as_view(),
+ name="scp_ftp_data_movement"),
]
if logger.isEnabledFor(logging.DEBUG):
- for url in router.urls:
- logger.debug("router url: {}".format(url))
+ for router_url in router.urls:
+ logger.debug("router url: {}".format(router_url))
diff --git a/django_airavata/apps/api/views.py b/django_airavata/apps/api/views.py
index f0aee4a..a375e6b 100644
--- a/django_airavata/apps/api/views.py
+++ b/django_airavata/apps/api/views.py
@@ -7,6 +7,7 @@ from django.http import FileResponse, Http404, JsonResponse
from django.urls import reverse
from rest_framework import mixins
from rest_framework import status
+from rest_framework.decorators import action
from rest_framework.decorators import detail_route
from rest_framework.decorators import list_route
from rest_framework.exceptions import ParseError
@@ -20,7 +21,7 @@ from airavata.model.appcatalog.appinterface.ttypes import ApplicationInterfaceDe
from airavata.model.appcatalog.computeresource.ttypes import ComputeResourceDescription, LOCALSubmission, \
CloudJobSubmission, SSHJobSubmission, GlobusJobSubmission, UnicoreJobSubmission
from airavata.model.application.io.ttypes import DataType
-from airavata.model.credential.store.ttypes import CredentialOwnerType, SummaryType, CredentialSummary
+from airavata.model.credential.store.ttypes import SummaryType, CredentialSummary
from airavata.model.data.movement.ttypes import GridFTPDataMovement, LOCALDataMovement, SCPDataMovement, \
UnicoreDataMovement
from airavata.api.error.ttypes import ProjectNotFoundException
@@ -326,45 +327,6 @@ class ApplicationModuleViewSet(APIBackedViewSet):
return Response(serializer.data)
-# TODO convert to APIBackedViewSet
-class RegisterApplicationModule(APIView):
- parser_classes = (JSONParser,)
-
- def post(self, request, format=None):
- gateway_id = settings.GATEWAY_ID
- app_module = ApplicationModule(request.data['name'], request.data['version'], request.data['description'])
- response = request.airavata_client.registerApplicationModule(request.authz_token, gateway_id, app_module)
- return Response(response)
-
-
-# TODO use ApplicationInterfaceViewSet instead
-class RegisterApplicationInterface(APIView):
- parser_classes = (JSONParser,)
-
- def post(self, request, format=None):
- gateway_id = settings.GATEWAY_ID
- params = request.data
- app_interface_description_serializer = serializers.ApplicationInterfaceDescriptionSerializer(data=params)
- app_interface_description_serializer.is_valid(raise_exception=True)
- app_interface = app_interface_description_serializer.save()
- response = request.airavata_client.registerApplicationInterface(request.authz_token, gateway_id,
- applicationInterface=app_interface)
- return Response(response)
-
-
-# TODO convert to APIBackedViewSet
-class RegisterApplicationDeployments(APIView):
- parser_classes = (JSONParser,)
-
- def post(self, request, format=None):
- gateway_id = settings.GATEWAY_ID
- params = request.data
- app_deployment = ApplicationDeploymentDescription(**params)
- response = request.airavata_client.registerApplicationDeployment(request.authz_token, gateway_id,
- app_deployment)
- return Response(response)
-
-
class ApplicationInterfaceViewSet(APIBackedViewSet):
serializer_class = serializers.ApplicationInterfaceDescriptionSerializer
lookup_field = 'app_interface_id'
@@ -459,87 +421,6 @@ class ApplicationDeploymentViewSet(APIBackedViewSet):
return Response(serializer.data)
-class ComputeResourcesQueues(APIView):
- renderer_classes = (JSONRenderer,)
-
- def get(self, request, format=None):
- details = request.airavata_client.getComputeResource(request.authz_token, request.query_params["id"])
- serializer = thrift_utils.create_serializer(ComputeResourceDescription, instance=details,
- context={'request': request})
- data = serializer.data
- return Response([queue["queueName"] for queue in data["batchQueues"]])
-
-
-class ApplicationInterfaceList(APIView):
- def get(self, request, format=None):
- gateway_id = settings.GATEWAY_ID
- serializer = thrift_utils.create_serializer(ApplicationInterfaceDescription,
- instance=request.airavata_client.getAllApplicationInterfaces(
- request.authz_token, gateway_id),
- context={'request': request}, many=True)
- return Response(serializer.data)
-
-
-class FetchApplicationInterface(APIView):
-
- def get(self, request, format=None):
- gateway_id = settings.GATEWAY_ID
- for app_interface in request.airavata_client.getAllApplicationInterfaces(
- request.authz_token, gateway_id):
- app_modules = app_interface.applicationModules
- if request.query_params["id"] in app_modules:
- return Response(thrift_utils.create_serializer(ApplicationInterfaceDescription,
- instance=app_interface,
- context={'request': request}).data)
- return Response(status=status.HTTP_400_BAD_REQUEST)
-
-
-class FetchApplicationDeployment(APIView):
-
- def get(self, request, format=None):
- gateway_id = settings.GATEWAY_ID
- app_deployments = [app_deployment for app_deployment in request.airavata_client.getAllApplicationDeployments(
- request.authz_token, gateway_id) if request.query_params["id"] == app_deployment.appModuleId]
- serializer = thrift_utils.create_serializer(ApplicationDeploymentDescription,
- instance=app_deployments,
- context={'request': request}, many=True)
- return Response(serializer.data)
- # return Response(request.airavata_client.getAppModuleDeployedResources(request.authz_token, request.query_params["id"]))
-
-
-class FetchSSHPubKeys(APIView):
-
- def get(self, request, format=None):
- gateway_id = settings.GATEWAY_ID
- serializer = thrift_utils.create_serializer(CredentialSummary,
- instance=request.airavata_client.getAllCredentialSummaryForGateway(
- request.authz_token, SummaryType.SSH, gateway_id),
- context={'request': request}, many=True)
- return Response(serializer.data)
-
-
-class GenerateRegisterSSHKeys(APIView):
- parser_classes = (JSONParser,)
- renderer_classes = (JSONRenderer,)
-
- def post(self, request, format=None):
- username = request.user.username
- gateway_id = settings.GATEWAY_ID
- data = request.data
- return Response(request.airavata_client.generateAndRegisterSSHKeys(request.authz_token, gateway_id, username,
- data["description"],
- CredentialOwnerType.GATEWAY))
-
-
-class DeleteSSHPubKey(APIView):
- parser_classes = (JSONParser,)
- renderer_classes = (JSONRenderer,)
-
- def post(self, request, format=None):
- gateway_id = settings.GATEWAY_ID
- return Response(request.airavata_client.deleteSSHPubKey(request.authz_token, request.data['token'], gateway_id))
-
-
class ComputeResourceViewSet(mixins.RetrieveModelMixin,
GenericAPIBackedViewSet):
serializer_class = serializers.ComputeResourceDescriptionSerializer
@@ -761,39 +642,6 @@ class GroupResourceProfileViewSet(APIBackedViewSet):
self.authz_token, instance.groupResourceProfileId)
-class SharedEntityGroups(APIBackedViewSet):
- serializer_class = serializers.SharedGroups
-
- def perform_update(self, serializer):
- before = serializer.data
- after = serializer.initial_data
- del serializer._data
- remaining = [item for item in before["groupList"] if item not in after["groupList"]]
- params = dict(after)
- params["domainId"] = settings.GATEWAY_ID
- params["permissionTypeId"] = READ_PERMISSION_TYPE.format(settings.GATEWAY_ID)
- params["cascadePermission"] = True
- ret = self.request.sharing_client.shareEntityWithGroups(**params)
- if remaining:
- self.request.sharing_client.revokeEntitySharingFromGroups(domainId=settings.GATEWAY_ID,
- entityId=before["entityId"], groupList=remaining,
- permissionTypeId=READ_PERMISSION_TYPE.format(
- settings.GATEWAY_ID))
- serializer.save()
-
- def get_instance(self, entity_id):
- groups = {
- 'entityId': entity_id
- }
- group_list = self.request.sharing_client.getListOfSharedGroups(domainId=settings.GATEWAY_ID, entityId=entity_id,
- permissionTypeId=READ_PERMISSION_TYPE.format(
- settings.GATEWAY_ID))
- if group_list:
- group_list = map(lambda val: val.groupId, group_list)
- groups['groupList'] = group_list
- return groups
-
-
class SharedEntityViewSet(mixins.RetrieveModelMixin,
mixins.UpdateModelMixin,
GenericAPIBackedViewSet):
@@ -939,6 +787,59 @@ class CredentialSummaryViewSet(mixins.ListModelMixin,
serializer_class = serializers.CredentialSummarySerializer
def get_list(self):
- # NOTE: only supported SummaryType is SSH for now
- return self.request.airavata_client.getAllCredentialSummaryForGateway(
- self.authz_token, SummaryType.SSH, settings.GATEWAY_ID)
+ ssh_creds = self.request.airavata_client.getAllCredentialSummaries(
+ self.authz_token, SummaryType.SSH)
+ pwd_creds = self.request.airavata_client.getAllCredentialSummaries(
+ self.authz_token, SummaryType.PASSWD)
+ return ssh_creds + pwd_creds
+
+ @action(detail=False)
+ def ssh(self, request):
+ summaries = self.request.airavata_client.getAllCredentialSummaries(
+ self.authz_token, SummaryType.SSH
+ )
+ serializer = self.get_serializer(summaries, many=True)
+ return Response(serializer.data)
+
+ @action(detail=False)
+ def password(self, request):
+ summaries = self.request.airavata_client.getAllCredentialSummaries(
+ self.authz_token, SummaryType.PASSWD
+ )
+ serializer = self.get_serializer(summaries, many=True)
+ return Response(serializer.data)
+
+ @action(methods=['post'], detail=False)
+ def create_ssh(self, request):
+ description = request.POST.get('description')
+ if description is None:
+ raise ParseError("'description' is required in request")
+ token_id = self.request.airavata_client.generateAndRegisterSSHKeys(
+ request.authz_token, description)
+ credential_summary = self.request.airavata_client.getCredentialSummary(
+ request.authz_token, SummaryType.SSH, token_id)
+ serializer = self.get_serializer(credential_summary)
+ return Response(serializer.data)
+
+ @action(methods=['post'], detail=False)
+ def create_password(self, request):
+ username = request.POST.get('username')
+ password = request.POST.get('password')
+ description = request.POST.get('description')
+ if username is None or password is None or description is None:
+ raise ParseError("'username', 'password' and 'description' "
+ "are all required in request")
+ token_id = self.request.airavata_client.registerPwdCredential(
+ request.authz_token, username, password, description)
+ credential_summary = self.request.airavata_client.getCredentialSummary(
+ request.authz_token, SummaryType.PASSWD, token_id)
+ serializer = self.get_serializer(credential_summary)
+ return Response(serializer.data)
+
+ def perform_destroy(self, instance):
+ if instance.type == SummaryType.SSH:
+ self.request.airavata_client.deleteSSHPubKey(
+ self.authz_token, instance.token)
+ elif instance.type == SummaryType.PASSWD:
+ self.request.airavata_client.deletePWDCredential(
+ self.authz_token, instance.token)