From commits-return-19459-archive-asf-public=cust-asf.ponee.io@airavata.apache.org Tue Jul 17 00:45:31 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 1786A18067E for ; Tue, 17 Jul 2018 00:45:29 +0200 (CEST) Received: (qmail 98789 invoked by uid 500); 16 Jul 2018 22:45:29 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 98780 invoked by uid 99); 16 Jul 2018 22:45:29 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Jul 2018 22:45:29 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 7276481E14; Mon, 16 Jul 2018 22:45:28 +0000 (UTC) Date: Mon, 16 Jul 2018 22:45:29 +0000 To: "commits@airavata.apache.org" Subject: [airavata] 02/02: AIRAVATA-2842 Regenerated thrift stubs MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: machristie@apache.org In-Reply-To: <153178112788.8774.1884965995224116725@gitbox.apache.org> References: <153178112788.8774.1884965995224116725@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: airavata X-Git-Refname: refs/heads/group-based-auth X-Git-Reftype: branch X-Git-Rev: f9d666c4761995fd067fa0e527288af6003f841e X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180716224528.7276481E14@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch group-based-auth in repository https://gitbox.apache.org/repos/asf/airavata.git commit f9d666c4761995fd067fa0e527288af6003f841e Author: Marcus Christie AuthorDate: Mon Jul 16 18:44:56 2018 -0400 AIRAVATA-2842 Regenerated thrift stubs --- .../java/org/apache/airavata/api/Airavata.java | 147 ++------------------- .../resources/lib/airavata/api/Airavata-remote | 8 +- .../main/resources/lib/airavata/api/Airavata.py | 33 +---- 3 files changed, 22 insertions(+), 166 deletions(-) diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java index 667c125..4eb15dd 100644 --- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java +++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java @@ -1230,8 +1230,6 @@ public class Airavata { * * @param gatewayId * ID of the gateway which need to list all accessible application deployment documentation. - * @param permissionType - * ResourcePermissionType to check for this user * * @return list * Returns the list of all Application Module Objects that are accessible to the user. @@ -1239,9 +1237,8 @@ public class Airavata { * * @param authzToken * @param gatewayId - * @param permissionType */ - public java.util.List getAccessibleAppModules(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.airavata.model.group.ResourcePermissionType permissionType) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.Autho [...] + public java.util.List getAccessibleAppModules(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException; /** * @@ -3240,7 +3237,7 @@ public class Airavata { public void getAllAppModules(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException; - public void getAccessibleAppModules(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.airavata.model.group.ResourcePermissionType permissionType, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException; + public void getAccessibleAppModules(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException; public void deleteApplicationModule(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String appModuleId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -5559,18 +5556,17 @@ public class Airavata { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllAppModules failed: unknown result"); } - public java.util.List getAccessibleAppModules(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.airavata.model.group.ResourcePermissionType permissionType) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.Autho [...] + public java.util.List getAccessibleAppModules(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException { - send_getAccessibleAppModules(authzToken, gatewayId, permissionType); + send_getAccessibleAppModules(authzToken, gatewayId); return recv_getAccessibleAppModules(); } - public void send_getAccessibleAppModules(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.airavata.model.group.ResourcePermissionType permissionType) throws org.apache.thrift.TException + public void send_getAccessibleAppModules(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId) throws org.apache.thrift.TException { getAccessibleAppModules_args args = new getAccessibleAppModules_args(); args.setAuthzToken(authzToken); args.setGatewayId(gatewayId); - args.setPermissionType(permissionType); sendBase("getAccessibleAppModules", args); } @@ -12598,9 +12594,9 @@ public class Airavata { } } - public void getAccessibleAppModules(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.airavata.model.group.ResourcePermissionType permissionType, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { + public void getAccessibleAppModules(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { checkReady(); - getAccessibleAppModules_call method_call = new getAccessibleAppModules_call(authzToken, gatewayId, permissionType, resultHandler, this, ___protocolFactory, ___transport); + getAccessibleAppModules_call method_call = new getAccessibleAppModules_call(authzToken, gatewayId, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -12608,12 +12604,10 @@ public class Airavata { public static class getAccessibleAppModules_call extends org.apache.thrift.async.TAsyncMethodCall> { private org.apache.airavata.model.security.AuthzToken authzToken; private java.lang.String gatewayId; - private org.apache.airavata.model.group.ResourcePermissionType permissionType; - public getAccessibleAppModules_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.airavata.model.group.ResourcePermissionType permissionType, org.apache.thrift.async.AsyncMethodCallback> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTr [...] + public getAccessibleAppModules_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.thrift.async.AsyncMethodCallback> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.authzToken = authzToken; this.gatewayId = gatewayId; - this.permissionType = permissionType; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { @@ -12621,7 +12615,6 @@ public class Airavata { getAccessibleAppModules_args args = new getAccessibleAppModules_args(); args.setAuthzToken(authzToken); args.setGatewayId(gatewayId); - args.setPermissionType(permissionType); args.write(prot); prot.writeMessageEnd(); } @@ -19502,7 +19495,7 @@ public class Airavata { public getAccessibleAppModules_result getResult(I iface, getAccessibleAppModules_args args) throws org.apache.thrift.TException { getAccessibleAppModules_result result = new getAccessibleAppModules_result(); try { - result.success = iface.getAccessibleAppModules(args.authzToken, args.gatewayId, args.permissionType); + result.success = iface.getAccessibleAppModules(args.authzToken, args.gatewayId); } catch (org.apache.airavata.model.error.InvalidRequestException ire) { result.ire = ire; } catch (org.apache.airavata.model.error.AiravataClientException ace) { @@ -28130,7 +28123,7 @@ public class Airavata { } public void start(I iface, getAccessibleAppModules_args args, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { - iface.getAccessibleAppModules(args.authzToken, args.gatewayId, args.permissionType,resultHandler); + iface.getAccessibleAppModules(args.authzToken, args.gatewayId,resultHandler); } } @@ -113142,28 +113135,17 @@ public class Airavata { private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField PERMISSION_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("permissionType", org.apache.thrift.protocol.TType.I32, (short)3); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getAccessibleAppModules_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getAccessibleAppModules_argsTupleSchemeFactory(); public org.apache.airavata.model.security.AuthzToken authzToken; // required public java.lang.String gatewayId; // required - /** - * - * @see org.apache.airavata.model.group.ResourcePermissionType - */ - public org.apache.airavata.model.group.ResourcePermissionType permissionType; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { AUTHZ_TOKEN((short)1, "authzToken"), - GATEWAY_ID((short)2, "gatewayId"), - /** - * - * @see org.apache.airavata.model.group.ResourcePermissionType - */ - PERMISSION_TYPE((short)3, "permissionType"); + GATEWAY_ID((short)2, "gatewayId"); private static final java.util.Map byName = new java.util.HashMap(); @@ -113182,8 +113164,6 @@ public class Airavata { return AUTHZ_TOKEN; case 2: // GATEWAY_ID return GATEWAY_ID; - case 3: // PERMISSION_TYPE - return PERMISSION_TYPE; default: return null; } @@ -113231,8 +113211,6 @@ public class Airavata { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class))); tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.PERMISSION_TYPE, new org.apache.thrift.meta_data.FieldMetaData("permissionType", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.group.ResourcePermissionType.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAccessibleAppModules_args.class, metaDataMap); } @@ -113242,13 +113220,11 @@ public class Airavata { public getAccessibleAppModules_args( org.apache.airavata.model.security.AuthzToken authzToken, - java.lang.String gatewayId, - org.apache.airavata.model.group.ResourcePermissionType permissionType) + java.lang.String gatewayId) { this(); this.authzToken = authzToken; this.gatewayId = gatewayId; - this.permissionType = permissionType; } /** @@ -113261,9 +113237,6 @@ public class Airavata { if (other.isSetGatewayId()) { this.gatewayId = other.gatewayId; } - if (other.isSetPermissionType()) { - this.permissionType = other.permissionType; - } } public getAccessibleAppModules_args deepCopy() { @@ -113274,7 +113247,6 @@ public class Airavata { public void clear() { this.authzToken = null; this.gatewayId = null; - this.permissionType = null; } public org.apache.airavata.model.security.AuthzToken getAuthzToken() { @@ -113325,38 +113297,6 @@ public class Airavata { } } - /** - * - * @see org.apache.airavata.model.group.ResourcePermissionType - */ - public org.apache.airavata.model.group.ResourcePermissionType getPermissionType() { - return this.permissionType; - } - - /** - * - * @see org.apache.airavata.model.group.ResourcePermissionType - */ - public getAccessibleAppModules_args setPermissionType(org.apache.airavata.model.group.ResourcePermissionType permissionType) { - this.permissionType = permissionType; - return this; - } - - public void unsetPermissionType() { - this.permissionType = null; - } - - /** Returns true if field permissionType is set (has been assigned a value) and false otherwise */ - public boolean isSetPermissionType() { - return this.permissionType != null; - } - - public void setPermissionTypeIsSet(boolean value) { - if (!value) { - this.permissionType = null; - } - } - public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case AUTHZ_TOKEN: @@ -113375,14 +113315,6 @@ public class Airavata { } break; - case PERMISSION_TYPE: - if (value == null) { - unsetPermissionType(); - } else { - setPermissionType((org.apache.airavata.model.group.ResourcePermissionType)value); - } - break; - } } @@ -113394,9 +113326,6 @@ public class Airavata { case GATEWAY_ID: return getGatewayId(); - case PERMISSION_TYPE: - return getPermissionType(); - } throw new java.lang.IllegalStateException(); } @@ -113412,8 +113341,6 @@ public class Airavata { return isSetAuthzToken(); case GATEWAY_ID: return isSetGatewayId(); - case PERMISSION_TYPE: - return isSetPermissionType(); } throw new java.lang.IllegalStateException(); } @@ -113451,15 +113378,6 @@ public class Airavata { return false; } - boolean this_present_permissionType = true && this.isSetPermissionType(); - boolean that_present_permissionType = true && that.isSetPermissionType(); - if (this_present_permissionType || that_present_permissionType) { - if (!(this_present_permissionType && that_present_permissionType)) - return false; - if (!this.permissionType.equals(that.permissionType)) - return false; - } - return true; } @@ -113475,10 +113393,6 @@ public class Airavata { if (isSetGatewayId()) hashCode = hashCode * 8191 + gatewayId.hashCode(); - hashCode = hashCode * 8191 + ((isSetPermissionType()) ? 131071 : 524287); - if (isSetPermissionType()) - hashCode = hashCode * 8191 + permissionType.getValue(); - return hashCode; } @@ -113510,16 +113424,6 @@ public class Airavata { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetPermissionType()).compareTo(other.isSetPermissionType()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetPermissionType()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.permissionType, other.permissionType); - if (lastComparison != 0) { - return lastComparison; - } - } return 0; } @@ -113555,14 +113459,6 @@ public class Airavata { sb.append(this.gatewayId); } first = false; - if (!first) sb.append(", "); - sb.append("permissionType:"); - if (this.permissionType == null) { - sb.append("null"); - } else { - sb.append(this.permissionType); - } - first = false; sb.append(")"); return sb.toString(); } @@ -113575,9 +113471,6 @@ public class Airavata { if (gatewayId == null) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' was not present! Struct: " + toString()); } - if (permissionType == null) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'permissionType' was not present! Struct: " + toString()); - } // check for sub-struct validity if (authzToken != null) { authzToken.validate(); @@ -113635,14 +113528,6 @@ public class Airavata { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // PERMISSION_TYPE - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.permissionType = org.apache.airavata.model.group.ResourcePermissionType.findByValue(iprot.readI32()); - struct.setPermissionTypeIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -113668,11 +113553,6 @@ public class Airavata { oprot.writeString(struct.gatewayId); oprot.writeFieldEnd(); } - if (struct.permissionType != null) { - oprot.writeFieldBegin(PERMISSION_TYPE_FIELD_DESC); - oprot.writeI32(struct.permissionType.getValue()); - oprot.writeFieldEnd(); - } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -113692,7 +113572,6 @@ public class Airavata { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; struct.authzToken.write(oprot); oprot.writeString(struct.gatewayId); - oprot.writeI32(struct.permissionType.getValue()); } @Override @@ -113703,8 +113582,6 @@ public class Airavata { struct.setAuthzTokenIsSet(true); struct.gatewayId = iprot.readString(); struct.setGatewayIdIsSet(true); - struct.permissionType = org.apache.airavata.model.group.ResourcePermissionType.findByValue(iprot.readI32()); - struct.setPermissionTypeIsSet(true); } } diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata-remote b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata-remote index 61cc51a..d0013e0 100755 --- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata-remote +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata-remote @@ -79,7 +79,7 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help': print(' ApplicationModule getApplicationModule(AuthzToken authzToken, string appModuleId)') print(' bool updateApplicationModule(AuthzToken authzToken, string appModuleId, ApplicationModule applicationModule)') print(' getAllAppModules(AuthzToken authzToken, string gatewayId)') - print(' getAccessibleAppModules(AuthzToken authzToken, string gatewayId, ResourcePermissionType permissionType)') + print(' getAccessibleAppModules(AuthzToken authzToken, string gatewayId)') print(' bool deleteApplicationModule(AuthzToken authzToken, string appModuleId)') print(' string registerApplicationDeployment(AuthzToken authzToken, string gatewayId, ApplicationDeploymentDescription applicationDeployment)') print(' ApplicationDeploymentDescription getApplicationDeployment(AuthzToken authzToken, string appDeploymentId)') @@ -624,10 +624,10 @@ elif cmd == 'getAllAppModules': pp.pprint(client.getAllAppModules(eval(args[0]), args[1],)) elif cmd == 'getAccessibleAppModules': - if len(args) != 3: - print('getAccessibleAppModules requires 3 args') + if len(args) != 2: + print('getAccessibleAppModules requires 2 args') sys.exit(1) - pp.pprint(client.getAccessibleAppModules(eval(args[0]), args[1], eval(args[2]),)) + pp.pprint(client.getAccessibleAppModules(eval(args[0]), args[1],)) elif cmd == 'deleteApplicationModule': if len(args) != 2: diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata.py index 4c5eb12..28c624a 100644 --- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata.py +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata.py @@ -1358,15 +1358,13 @@ class Iface(object): """ pass - def getAccessibleAppModules(self, authzToken, gatewayId, permissionType): + def getAccessibleAppModules(self, authzToken, gatewayId): """ Fetch all accessible Application Module Descriptions. @param gatewayId ID of the gateway which need to list all accessible application deployment documentation. - @param permissionType - ResourcePermissionType to check for this user @return list Returns the list of all Application Module Objects that are accessible to the user. @@ -1375,7 +1373,6 @@ class Iface(object): Parameters: - authzToken - gatewayId - - permissionType """ pass @@ -6896,15 +6893,13 @@ class Client(Iface): raise result.ae raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllAppModules failed: unknown result") - def getAccessibleAppModules(self, authzToken, gatewayId, permissionType): + def getAccessibleAppModules(self, authzToken, gatewayId): """ Fetch all accessible Application Module Descriptions. @param gatewayId ID of the gateway which need to list all accessible application deployment documentation. - @param permissionType - ResourcePermissionType to check for this user @return list Returns the list of all Application Module Objects that are accessible to the user. @@ -6913,17 +6908,15 @@ class Client(Iface): Parameters: - authzToken - gatewayId - - permissionType """ - self.send_getAccessibleAppModules(authzToken, gatewayId, permissionType) + self.send_getAccessibleAppModules(authzToken, gatewayId) return self.recv_getAccessibleAppModules() - def send_getAccessibleAppModules(self, authzToken, gatewayId, permissionType): + def send_getAccessibleAppModules(self, authzToken, gatewayId): self._oprot.writeMessageBegin('getAccessibleAppModules', TMessageType.CALL, self._seqid) args = getAccessibleAppModules_args() args.authzToken = authzToken args.gatewayId = gatewayId - args.permissionType = permissionType args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() @@ -15702,7 +15695,7 @@ class Processor(Iface, TProcessor): iprot.readMessageEnd() result = getAccessibleAppModules_result() try: - result.success = self._handler.getAccessibleAppModules(args.authzToken, args.gatewayId, args.permissionType) + result.success = self._handler.getAccessibleAppModules(args.authzToken, args.gatewayId) msg_type = TMessageType.REPLY except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): raise @@ -31095,20 +31088,17 @@ class getAccessibleAppModules_args(object): Attributes: - authzToken - gatewayId - - permissionType """ 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.I32, 'permissionType', None, None, ), # 3 ) - def __init__(self, authzToken=None, gatewayId=None, permissionType=None,): + def __init__(self, authzToken=None, gatewayId=None,): self.authzToken = authzToken self.gatewayId = gatewayId - self.permissionType = permissionType def read(self, iprot): if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: @@ -31130,11 +31120,6 @@ class getAccessibleAppModules_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.I32: - self.permissionType = iprot.readI32() - else: - iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -31153,10 +31138,6 @@ class getAccessibleAppModules_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.permissionType is not None: - oprot.writeFieldBegin('permissionType', TType.I32, 3) - oprot.writeI32(self.permissionType) - oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -31165,8 +31146,6 @@ class getAccessibleAppModules_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.permissionType is None: - raise TProtocolException(message='Required field permissionType is unset!') return def __repr__(self):