You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/08/03 16:01:57 UTC
[41/50] [abbrv] airavata git commit: updating some of the group
management API methods in AiravataServerHandler
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/tenant/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/tenant/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/tenant/ttypes.py
index f13ce58..493eaff 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/tenant/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/tenant/ttypes.py
@@ -26,6 +26,7 @@ class TenantApprovalStatus:
CANCELLED = 4
DENIED = 5
CREATED = 6
+ DEPLOYED = 7
_VALUES_TO_NAMES = {
0: "REQUESTED",
@@ -35,6 +36,7 @@ class TenantApprovalStatus:
4: "CANCELLED",
5: "DENIED",
6: "CREATED",
+ 7: "DEPLOYED",
}
_NAMES_TO_VALUES = {
@@ -45,9 +47,227 @@ class TenantApprovalStatus:
"CANCELLED": 4,
"DENIED": 5,
"CREATED": 6,
+ "DEPLOYED": 7,
}
+class TenantPreferences:
+ """
+ Attributes:
+ - tenantAdminFirstName
+ - tenantAdminLastName
+ - tenantAdminEmail
+ """
+
+ thrift_spec = (
+ None, # 0
+ None, # 1
+ None, # 2
+ None, # 3
+ None, # 4
+ None, # 5
+ None, # 6
+ None, # 7
+ None, # 8
+ None, # 9
+ (10, TType.STRING, 'tenantAdminFirstName', None, None, ), # 10
+ (11, TType.STRING, 'tenantAdminLastName', None, None, ), # 11
+ (12, TType.STRING, 'tenantAdminEmail', None, None, ), # 12
+ )
+
+ def __init__(self, tenantAdminFirstName=None, tenantAdminLastName=None, tenantAdminEmail=None,):
+ self.tenantAdminFirstName = tenantAdminFirstName
+ self.tenantAdminLastName = tenantAdminLastName
+ self.tenantAdminEmail = tenantAdminEmail
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 10:
+ if ftype == TType.STRING:
+ self.tenantAdminFirstName = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 11:
+ if ftype == TType.STRING:
+ self.tenantAdminLastName = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 12:
+ if ftype == TType.STRING:
+ self.tenantAdminEmail = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('TenantPreferences')
+ if self.tenantAdminFirstName is not None:
+ oprot.writeFieldBegin('tenantAdminFirstName', TType.STRING, 10)
+ oprot.writeString(self.tenantAdminFirstName)
+ oprot.writeFieldEnd()
+ if self.tenantAdminLastName is not None:
+ oprot.writeFieldBegin('tenantAdminLastName', TType.STRING, 11)
+ oprot.writeString(self.tenantAdminLastName)
+ oprot.writeFieldEnd()
+ if self.tenantAdminEmail is not None:
+ oprot.writeFieldBegin('tenantAdminEmail', TType.STRING, 12)
+ oprot.writeString(self.tenantAdminEmail)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ return
+
+
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.tenantAdminFirstName)
+ value = (value * 31) ^ hash(self.tenantAdminLastName)
+ value = (value * 31) ^ hash(self.tenantAdminEmail)
+ return value
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ 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 TenantConfig:
+ """
+ Attributes:
+ - oauthClientId
+ - oauthClientSecret
+ - identityServerUserName
+ - identityServerPasswordToken
+ """
+
+ thrift_spec = (
+ None, # 0
+ None, # 1
+ None, # 2
+ None, # 3
+ None, # 4
+ None, # 5
+ None, # 6
+ None, # 7
+ None, # 8
+ None, # 9
+ None, # 10
+ None, # 11
+ None, # 12
+ (13, TType.STRING, 'identityServerUserName', None, None, ), # 13
+ (14, TType.STRING, 'identityServerPasswordToken', None, None, ), # 14
+ None, # 15
+ (16, TType.STRING, 'oauthClientId', None, None, ), # 16
+ (17, TType.STRING, 'oauthClientSecret', None, None, ), # 17
+ )
+
+ def __init__(self, oauthClientId=None, oauthClientSecret=None, identityServerUserName=None, identityServerPasswordToken=None,):
+ self.oauthClientId = oauthClientId
+ self.oauthClientSecret = oauthClientSecret
+ self.identityServerUserName = identityServerUserName
+ self.identityServerPasswordToken = identityServerPasswordToken
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 16:
+ if ftype == TType.STRING:
+ self.oauthClientId = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 17:
+ if ftype == TType.STRING:
+ self.oauthClientSecret = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 13:
+ if ftype == TType.STRING:
+ self.identityServerUserName = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 14:
+ if ftype == TType.STRING:
+ self.identityServerPasswordToken = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('TenantConfig')
+ if self.identityServerUserName is not None:
+ oprot.writeFieldBegin('identityServerUserName', TType.STRING, 13)
+ oprot.writeString(self.identityServerUserName)
+ oprot.writeFieldEnd()
+ if self.identityServerPasswordToken is not None:
+ oprot.writeFieldBegin('identityServerPasswordToken', TType.STRING, 14)
+ oprot.writeString(self.identityServerPasswordToken)
+ oprot.writeFieldEnd()
+ if self.oauthClientId is not None:
+ oprot.writeFieldBegin('oauthClientId', TType.STRING, 16)
+ oprot.writeString(self.oauthClientId)
+ oprot.writeFieldEnd()
+ if self.oauthClientSecret is not None:
+ oprot.writeFieldBegin('oauthClientSecret', TType.STRING, 17)
+ oprot.writeString(self.oauthClientSecret)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ return
+
+
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.oauthClientId)
+ value = (value * 31) ^ hash(self.oauthClientSecret)
+ value = (value * 31) ^ hash(self.identityServerUserName)
+ value = (value * 31) ^ hash(self.identityServerPasswordToken)
+ return value
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ 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 Tenant:
"""
Attributes:
@@ -60,14 +280,7 @@ class Tenant:
- tenantURL
- tenantPublicAbstract
- reviewProposalDescription
- - tenantAdminFirstName
- - tenantAdminLastName
- - tenantAdminEmail
- - identityServerUserName
- - identityServerPasswordToken
- declinedReason
- - oauthClientId
- - oauthClientSecret
- requestCreationTime
- requesterUsername
"""
@@ -83,19 +296,19 @@ class Tenant:
(7, TType.STRING, 'tenantURL', None, None, ), # 7
(8, TType.STRING, 'tenantPublicAbstract', None, None, ), # 8
(9, TType.STRING, 'reviewProposalDescription', None, None, ), # 9
- (10, TType.STRING, 'tenantAdminFirstName', None, None, ), # 10
- (11, TType.STRING, 'tenantAdminLastName', None, None, ), # 11
- (12, TType.STRING, 'tenantAdminEmail', None, None, ), # 12
- (13, TType.STRING, 'identityServerUserName', None, None, ), # 13
- (14, TType.STRING, 'identityServerPasswordToken', None, None, ), # 14
+ None, # 10
+ None, # 11
+ None, # 12
+ None, # 13
+ None, # 14
(15, TType.STRING, 'declinedReason', None, None, ), # 15
- (16, TType.STRING, 'oauthClientId', None, None, ), # 16
- (17, TType.STRING, 'oauthClientSecret', None, None, ), # 17
+ None, # 16
+ None, # 17
(18, TType.I64, 'requestCreationTime', None, None, ), # 18
(19, TType.STRING, 'requesterUsername', None, None, ), # 19
)
- def __init__(self, tenantId=None, tenantApprovalStatus=None, tenantName=None, domain=None, emailAddress=None, tenantAcronym=None, tenantURL=None, tenantPublicAbstract=None, reviewProposalDescription=None, tenantAdminFirstName=None, tenantAdminLastName=None, tenantAdminEmail=None, identityServerUserName=None, identityServerPasswordToken=None, declinedReason=None, oauthClientId=None, oauthClientSecret=None, requestCreationTime=None, requesterUsername=None,):
+ def __init__(self, tenantId=None, tenantApprovalStatus=None, tenantName=None, domain=None, emailAddress=None, tenantAcronym=None, tenantURL=None, tenantPublicAbstract=None, reviewProposalDescription=None, declinedReason=None, requestCreationTime=None, requesterUsername=None,):
self.tenantId = tenantId
self.tenantApprovalStatus = tenantApprovalStatus
self.tenantName = tenantName
@@ -105,14 +318,7 @@ class Tenant:
self.tenantURL = tenantURL
self.tenantPublicAbstract = tenantPublicAbstract
self.reviewProposalDescription = reviewProposalDescription
- self.tenantAdminFirstName = tenantAdminFirstName
- self.tenantAdminLastName = tenantAdminLastName
- self.tenantAdminEmail = tenantAdminEmail
- self.identityServerUserName = identityServerUserName
- self.identityServerPasswordToken = identityServerPasswordToken
self.declinedReason = declinedReason
- self.oauthClientId = oauthClientId
- self.oauthClientSecret = oauthClientSecret
self.requestCreationTime = requestCreationTime
self.requesterUsername = requesterUsername
@@ -170,46 +376,11 @@ class Tenant:
self.reviewProposalDescription = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 10:
- if ftype == TType.STRING:
- self.tenantAdminFirstName = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 11:
- if ftype == TType.STRING:
- self.tenantAdminLastName = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 12:
- if ftype == TType.STRING:
- self.tenantAdminEmail = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 13:
- if ftype == TType.STRING:
- self.identityServerUserName = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 14:
- if ftype == TType.STRING:
- self.identityServerPasswordToken = iprot.readString()
- else:
- iprot.skip(ftype)
elif fid == 15:
if ftype == TType.STRING:
self.declinedReason = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 16:
- if ftype == TType.STRING:
- self.oauthClientId = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 17:
- if ftype == TType.STRING:
- self.oauthClientSecret = iprot.readString()
- else:
- iprot.skip(ftype)
elif fid == 18:
if ftype == TType.I64:
self.requestCreationTime = iprot.readI64()
@@ -266,38 +437,10 @@ class Tenant:
oprot.writeFieldBegin('reviewProposalDescription', TType.STRING, 9)
oprot.writeString(self.reviewProposalDescription)
oprot.writeFieldEnd()
- if self.tenantAdminFirstName is not None:
- oprot.writeFieldBegin('tenantAdminFirstName', TType.STRING, 10)
- oprot.writeString(self.tenantAdminFirstName)
- oprot.writeFieldEnd()
- if self.tenantAdminLastName is not None:
- oprot.writeFieldBegin('tenantAdminLastName', TType.STRING, 11)
- oprot.writeString(self.tenantAdminLastName)
- oprot.writeFieldEnd()
- if self.tenantAdminEmail is not None:
- oprot.writeFieldBegin('tenantAdminEmail', TType.STRING, 12)
- oprot.writeString(self.tenantAdminEmail)
- oprot.writeFieldEnd()
- if self.identityServerUserName is not None:
- oprot.writeFieldBegin('identityServerUserName', TType.STRING, 13)
- oprot.writeString(self.identityServerUserName)
- oprot.writeFieldEnd()
- if self.identityServerPasswordToken is not None:
- oprot.writeFieldBegin('identityServerPasswordToken', TType.STRING, 14)
- oprot.writeString(self.identityServerPasswordToken)
- oprot.writeFieldEnd()
if self.declinedReason is not None:
oprot.writeFieldBegin('declinedReason', TType.STRING, 15)
oprot.writeString(self.declinedReason)
oprot.writeFieldEnd()
- if self.oauthClientId is not None:
- oprot.writeFieldBegin('oauthClientId', TType.STRING, 16)
- oprot.writeString(self.oauthClientId)
- oprot.writeFieldEnd()
- if self.oauthClientSecret is not None:
- oprot.writeFieldBegin('oauthClientSecret', TType.STRING, 17)
- oprot.writeString(self.oauthClientSecret)
- oprot.writeFieldEnd()
if self.requestCreationTime is not None:
oprot.writeFieldBegin('requestCreationTime', TType.I64, 18)
oprot.writeI64(self.requestCreationTime)
@@ -328,14 +471,7 @@ class Tenant:
value = (value * 31) ^ hash(self.tenantURL)
value = (value * 31) ^ hash(self.tenantPublicAbstract)
value = (value * 31) ^ hash(self.reviewProposalDescription)
- value = (value * 31) ^ hash(self.tenantAdminFirstName)
- value = (value * 31) ^ hash(self.tenantAdminLastName)
- value = (value * 31) ^ hash(self.tenantAdminEmail)
- value = (value * 31) ^ hash(self.identityServerUserName)
- value = (value * 31) ^ hash(self.identityServerPasswordToken)
value = (value * 31) ^ hash(self.declinedReason)
- value = (value * 31) ^ hash(self.oauthClientId)
- value = (value * 31) ^ hash(self.oauthClientSecret)
value = (value * 31) ^ hash(self.requestCreationTime)
value = (value * 31) ^ hash(self.requesterUsername)
return value
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
index d3e6914..707c995 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
@@ -26,6 +26,7 @@ class GatewayApprovalStatus:
CANCELLED = 4
DENIED = 5
CREATED = 6
+ DEPLOYED = 7
_VALUES_TO_NAMES = {
0: "REQUESTED",
@@ -35,6 +36,7 @@ class GatewayApprovalStatus:
4: "CANCELLED",
5: "DENIED",
6: "CREATED",
+ 7: "DEPLOYED",
}
_NAMES_TO_VALUES = {
@@ -45,6 +47,7 @@ class GatewayApprovalStatus:
"CANCELLED": 4,
"DENIED": 5,
"CREATED": 6,
+ "DEPLOYED": 7,
}
class NotificationPriority:
@@ -462,6 +465,7 @@ class User:
class Gateway:
"""
Attributes:
+ - airavataInternalGatewayId
- gatewayId
- gatewayApprovalStatus
- gatewayName
@@ -485,28 +489,30 @@ class Gateway:
thrift_spec = (
None, # 0
- (1, TType.STRING, 'gatewayId', None, None, ), # 1
- (2, TType.I32, 'gatewayApprovalStatus', None, None, ), # 2
- (3, TType.STRING, 'gatewayName', None, None, ), # 3
- (4, TType.STRING, 'domain', None, None, ), # 4
- (5, TType.STRING, 'emailAddress', None, None, ), # 5
- (6, TType.STRING, 'gatewayAcronym', None, None, ), # 6
- (7, TType.STRING, 'gatewayURL', None, None, ), # 7
- (8, TType.STRING, 'gatewayPublicAbstract', None, None, ), # 8
- (9, TType.STRING, 'reviewProposalDescription', None, None, ), # 9
- (10, TType.STRING, 'gatewayAdminFirstName', None, None, ), # 10
- (11, TType.STRING, 'gatewayAdminLastName', None, None, ), # 11
- (12, TType.STRING, 'gatewayAdminEmail', None, None, ), # 12
- (13, TType.STRING, 'identityServerUserName', None, None, ), # 13
- (14, TType.STRING, 'identityServerPasswordToken', None, None, ), # 14
- (15, TType.STRING, 'declinedReason', None, None, ), # 15
- (16, TType.STRING, 'oauthClientId', None, None, ), # 16
- (17, TType.STRING, 'oauthClientSecret', None, None, ), # 17
- (18, TType.I64, 'requestCreationTime', None, None, ), # 18
- (19, TType.STRING, 'requesterUsername', None, None, ), # 19
+ (1, TType.STRING, 'airavataInternalGatewayId', None, None, ), # 1
+ (2, TType.STRING, 'gatewayId', None, None, ), # 2
+ (3, TType.I32, 'gatewayApprovalStatus', None, None, ), # 3
+ (4, TType.STRING, 'gatewayName', None, None, ), # 4
+ (5, TType.STRING, 'domain', None, None, ), # 5
+ (6, TType.STRING, 'emailAddress', None, None, ), # 6
+ (7, TType.STRING, 'gatewayAcronym', None, None, ), # 7
+ (8, TType.STRING, 'gatewayURL', None, None, ), # 8
+ (9, TType.STRING, 'gatewayPublicAbstract', None, None, ), # 9
+ (10, TType.STRING, 'reviewProposalDescription', None, None, ), # 10
+ (11, TType.STRING, 'gatewayAdminFirstName', None, None, ), # 11
+ (12, TType.STRING, 'gatewayAdminLastName', None, None, ), # 12
+ (13, TType.STRING, 'gatewayAdminEmail', None, None, ), # 13
+ (14, TType.STRING, 'identityServerUserName', None, None, ), # 14
+ (15, TType.STRING, 'identityServerPasswordToken', None, None, ), # 15
+ (16, TType.STRING, 'declinedReason', None, None, ), # 16
+ (17, TType.STRING, 'oauthClientId', None, None, ), # 17
+ (18, TType.STRING, 'oauthClientSecret', None, None, ), # 18
+ (19, TType.I64, 'requestCreationTime', None, None, ), # 19
+ (20, TType.STRING, 'requesterUsername', None, None, ), # 20
)
- def __init__(self, gatewayId=None, gatewayApprovalStatus=None, gatewayName=None, domain=None, emailAddress=None, gatewayAcronym=None, gatewayURL=None, gatewayPublicAbstract=None, reviewProposalDescription=None, gatewayAdminFirstName=None, gatewayAdminLastName=None, gatewayAdminEmail=None, identityServerUserName=None, identityServerPasswordToken=None, declinedReason=None, oauthClientId=None, oauthClientSecret=None, requestCreationTime=None, requesterUsername=None,):
+ def __init__(self, airavataInternalGatewayId=None, gatewayId=None, gatewayApprovalStatus=None, gatewayName=None, domain=None, emailAddress=None, gatewayAcronym=None, gatewayURL=None, gatewayPublicAbstract=None, reviewProposalDescription=None, gatewayAdminFirstName=None, gatewayAdminLastName=None, gatewayAdminEmail=None, identityServerUserName=None, identityServerPasswordToken=None, declinedReason=None, oauthClientId=None, oauthClientSecret=None, requestCreationTime=None, requesterUsername=None,):
+ self.airavataInternalGatewayId = airavataInternalGatewayId
self.gatewayId = gatewayId
self.gatewayApprovalStatus = gatewayApprovalStatus
self.gatewayName = gatewayName
@@ -538,95 +544,100 @@ class Gateway:
break
if fid == 1:
if ftype == TType.STRING:
- self.gatewayId = iprot.readString()
+ self.airavataInternalGatewayId = iprot.readString()
else:
iprot.skip(ftype)
elif fid == 2:
+ if ftype == TType.STRING:
+ self.gatewayId = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 3:
if ftype == TType.I32:
self.gatewayApprovalStatus = iprot.readI32()
else:
iprot.skip(ftype)
- elif fid == 3:
+ elif fid == 4:
if ftype == TType.STRING:
self.gatewayName = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 4:
+ elif fid == 5:
if ftype == TType.STRING:
self.domain = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 5:
+ elif fid == 6:
if ftype == TType.STRING:
self.emailAddress = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 6:
+ elif fid == 7:
if ftype == TType.STRING:
self.gatewayAcronym = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 7:
+ elif fid == 8:
if ftype == TType.STRING:
self.gatewayURL = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 8:
+ elif fid == 9:
if ftype == TType.STRING:
self.gatewayPublicAbstract = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 9:
+ elif fid == 10:
if ftype == TType.STRING:
self.reviewProposalDescription = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 10:
+ elif fid == 11:
if ftype == TType.STRING:
self.gatewayAdminFirstName = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 11:
+ elif fid == 12:
if ftype == TType.STRING:
self.gatewayAdminLastName = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 12:
+ elif fid == 13:
if ftype == TType.STRING:
self.gatewayAdminEmail = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 13:
+ elif fid == 14:
if ftype == TType.STRING:
self.identityServerUserName = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 14:
+ elif fid == 15:
if ftype == TType.STRING:
self.identityServerPasswordToken = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 15:
+ elif fid == 16:
if ftype == TType.STRING:
self.declinedReason = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 16:
+ elif fid == 17:
if ftype == TType.STRING:
self.oauthClientId = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 17:
+ elif fid == 18:
if ftype == TType.STRING:
self.oauthClientSecret = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 18:
+ elif fid == 19:
if ftype == TType.I64:
self.requestCreationTime = iprot.readI64()
else:
iprot.skip(ftype)
- elif fid == 19:
+ elif fid == 20:
if ftype == TType.STRING:
self.requesterUsername = iprot.readString()
else:
@@ -641,80 +652,84 @@ class Gateway:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('Gateway')
+ if self.airavataInternalGatewayId is not None:
+ oprot.writeFieldBegin('airavataInternalGatewayId', TType.STRING, 1)
+ oprot.writeString(self.airavataInternalGatewayId)
+ oprot.writeFieldEnd()
if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 1)
+ oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
oprot.writeString(self.gatewayId)
oprot.writeFieldEnd()
if self.gatewayApprovalStatus is not None:
- oprot.writeFieldBegin('gatewayApprovalStatus', TType.I32, 2)
+ oprot.writeFieldBegin('gatewayApprovalStatus', TType.I32, 3)
oprot.writeI32(self.gatewayApprovalStatus)
oprot.writeFieldEnd()
if self.gatewayName is not None:
- oprot.writeFieldBegin('gatewayName', TType.STRING, 3)
+ oprot.writeFieldBegin('gatewayName', TType.STRING, 4)
oprot.writeString(self.gatewayName)
oprot.writeFieldEnd()
if self.domain is not None:
- oprot.writeFieldBegin('domain', TType.STRING, 4)
+ oprot.writeFieldBegin('domain', TType.STRING, 5)
oprot.writeString(self.domain)
oprot.writeFieldEnd()
if self.emailAddress is not None:
- oprot.writeFieldBegin('emailAddress', TType.STRING, 5)
+ oprot.writeFieldBegin('emailAddress', TType.STRING, 6)
oprot.writeString(self.emailAddress)
oprot.writeFieldEnd()
if self.gatewayAcronym is not None:
- oprot.writeFieldBegin('gatewayAcronym', TType.STRING, 6)
+ oprot.writeFieldBegin('gatewayAcronym', TType.STRING, 7)
oprot.writeString(self.gatewayAcronym)
oprot.writeFieldEnd()
if self.gatewayURL is not None:
- oprot.writeFieldBegin('gatewayURL', TType.STRING, 7)
+ oprot.writeFieldBegin('gatewayURL', TType.STRING, 8)
oprot.writeString(self.gatewayURL)
oprot.writeFieldEnd()
if self.gatewayPublicAbstract is not None:
- oprot.writeFieldBegin('gatewayPublicAbstract', TType.STRING, 8)
+ oprot.writeFieldBegin('gatewayPublicAbstract', TType.STRING, 9)
oprot.writeString(self.gatewayPublicAbstract)
oprot.writeFieldEnd()
if self.reviewProposalDescription is not None:
- oprot.writeFieldBegin('reviewProposalDescription', TType.STRING, 9)
+ oprot.writeFieldBegin('reviewProposalDescription', TType.STRING, 10)
oprot.writeString(self.reviewProposalDescription)
oprot.writeFieldEnd()
if self.gatewayAdminFirstName is not None:
- oprot.writeFieldBegin('gatewayAdminFirstName', TType.STRING, 10)
+ oprot.writeFieldBegin('gatewayAdminFirstName', TType.STRING, 11)
oprot.writeString(self.gatewayAdminFirstName)
oprot.writeFieldEnd()
if self.gatewayAdminLastName is not None:
- oprot.writeFieldBegin('gatewayAdminLastName', TType.STRING, 11)
+ oprot.writeFieldBegin('gatewayAdminLastName', TType.STRING, 12)
oprot.writeString(self.gatewayAdminLastName)
oprot.writeFieldEnd()
if self.gatewayAdminEmail is not None:
- oprot.writeFieldBegin('gatewayAdminEmail', TType.STRING, 12)
+ oprot.writeFieldBegin('gatewayAdminEmail', TType.STRING, 13)
oprot.writeString(self.gatewayAdminEmail)
oprot.writeFieldEnd()
if self.identityServerUserName is not None:
- oprot.writeFieldBegin('identityServerUserName', TType.STRING, 13)
+ oprot.writeFieldBegin('identityServerUserName', TType.STRING, 14)
oprot.writeString(self.identityServerUserName)
oprot.writeFieldEnd()
if self.identityServerPasswordToken is not None:
- oprot.writeFieldBegin('identityServerPasswordToken', TType.STRING, 14)
+ oprot.writeFieldBegin('identityServerPasswordToken', TType.STRING, 15)
oprot.writeString(self.identityServerPasswordToken)
oprot.writeFieldEnd()
if self.declinedReason is not None:
- oprot.writeFieldBegin('declinedReason', TType.STRING, 15)
+ oprot.writeFieldBegin('declinedReason', TType.STRING, 16)
oprot.writeString(self.declinedReason)
oprot.writeFieldEnd()
if self.oauthClientId is not None:
- oprot.writeFieldBegin('oauthClientId', TType.STRING, 16)
+ oprot.writeFieldBegin('oauthClientId', TType.STRING, 17)
oprot.writeString(self.oauthClientId)
oprot.writeFieldEnd()
if self.oauthClientSecret is not None:
- oprot.writeFieldBegin('oauthClientSecret', TType.STRING, 17)
+ oprot.writeFieldBegin('oauthClientSecret', TType.STRING, 18)
oprot.writeString(self.oauthClientSecret)
oprot.writeFieldEnd()
if self.requestCreationTime is not None:
- oprot.writeFieldBegin('requestCreationTime', TType.I64, 18)
+ oprot.writeFieldBegin('requestCreationTime', TType.I64, 19)
oprot.writeI64(self.requestCreationTime)
oprot.writeFieldEnd()
if self.requesterUsername is not None:
- oprot.writeFieldBegin('requesterUsername', TType.STRING, 19)
+ oprot.writeFieldBegin('requesterUsername', TType.STRING, 20)
oprot.writeString(self.requesterUsername)
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -730,6 +745,7 @@ class Gateway:
def __hash__(self):
value = 17
+ value = (value * 31) ^ hash(self.airavataInternalGatewayId)
value = (value * 31) ^ hash(self.gatewayId)
value = (value * 31) ^ hash(self.gatewayApprovalStatus)
value = (value * 31) ^ hash(self.gatewayName)
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/tenant/Tenant.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/tenant/Tenant.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/tenant/Tenant.java
index 77dd186..188c2da 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/tenant/Tenant.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/tenant/Tenant.java
@@ -64,14 +64,7 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
private static final org.apache.thrift.protocol.TField TENANT_URL_FIELD_DESC = new org.apache.thrift.protocol.TField("tenantURL", org.apache.thrift.protocol.TType.STRING, (short)7);
private static final org.apache.thrift.protocol.TField TENANT_PUBLIC_ABSTRACT_FIELD_DESC = new org.apache.thrift.protocol.TField("tenantPublicAbstract", org.apache.thrift.protocol.TType.STRING, (short)8);
private static final org.apache.thrift.protocol.TField REVIEW_PROPOSAL_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("reviewProposalDescription", org.apache.thrift.protocol.TType.STRING, (short)9);
- private static final org.apache.thrift.protocol.TField TENANT_ADMIN_FIRST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tenantAdminFirstName", org.apache.thrift.protocol.TType.STRING, (short)10);
- private static final org.apache.thrift.protocol.TField TENANT_ADMIN_LAST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tenantAdminLastName", org.apache.thrift.protocol.TType.STRING, (short)11);
- private static final org.apache.thrift.protocol.TField TENANT_ADMIN_EMAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("tenantAdminEmail", org.apache.thrift.protocol.TType.STRING, (short)12);
- private static final org.apache.thrift.protocol.TField IDENTITY_SERVER_USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("identityServerUserName", org.apache.thrift.protocol.TType.STRING, (short)13);
- private static final org.apache.thrift.protocol.TField IDENTITY_SERVER_PASSWORD_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("identityServerPasswordToken", org.apache.thrift.protocol.TType.STRING, (short)14);
private static final org.apache.thrift.protocol.TField DECLINED_REASON_FIELD_DESC = new org.apache.thrift.protocol.TField("declinedReason", org.apache.thrift.protocol.TType.STRING, (short)15);
- private static final org.apache.thrift.protocol.TField OAUTH_CLIENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("oauthClientId", org.apache.thrift.protocol.TType.STRING, (short)16);
- private static final org.apache.thrift.protocol.TField OAUTH_CLIENT_SECRET_FIELD_DESC = new org.apache.thrift.protocol.TField("oauthClientSecret", org.apache.thrift.protocol.TType.STRING, (short)17);
private static final org.apache.thrift.protocol.TField REQUEST_CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("requestCreationTime", org.apache.thrift.protocol.TType.I64, (short)18);
private static final org.apache.thrift.protocol.TField REQUESTER_USERNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("requesterUsername", org.apache.thrift.protocol.TType.STRING, (short)19);
@@ -90,14 +83,7 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
private String tenantURL; // optional
private String tenantPublicAbstract; // optional
private String reviewProposalDescription; // optional
- private String tenantAdminFirstName; // optional
- private String tenantAdminLastName; // optional
- private String tenantAdminEmail; // optional
- private String identityServerUserName; // optional
- private String identityServerPasswordToken; // optional
private String declinedReason; // optional
- private String oauthClientId; // optional
- private String oauthClientSecret; // optional
private long requestCreationTime; // optional
private String requesterUsername; // optional
@@ -116,14 +102,7 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
TENANT_URL((short)7, "tenantURL"),
TENANT_PUBLIC_ABSTRACT((short)8, "tenantPublicAbstract"),
REVIEW_PROPOSAL_DESCRIPTION((short)9, "reviewProposalDescription"),
- TENANT_ADMIN_FIRST_NAME((short)10, "tenantAdminFirstName"),
- TENANT_ADMIN_LAST_NAME((short)11, "tenantAdminLastName"),
- TENANT_ADMIN_EMAIL((short)12, "tenantAdminEmail"),
- IDENTITY_SERVER_USER_NAME((short)13, "identityServerUserName"),
- IDENTITY_SERVER_PASSWORD_TOKEN((short)14, "identityServerPasswordToken"),
DECLINED_REASON((short)15, "declinedReason"),
- OAUTH_CLIENT_ID((short)16, "oauthClientId"),
- OAUTH_CLIENT_SECRET((short)17, "oauthClientSecret"),
REQUEST_CREATION_TIME((short)18, "requestCreationTime"),
REQUESTER_USERNAME((short)19, "requesterUsername");
@@ -158,22 +137,8 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
return TENANT_PUBLIC_ABSTRACT;
case 9: // REVIEW_PROPOSAL_DESCRIPTION
return REVIEW_PROPOSAL_DESCRIPTION;
- case 10: // TENANT_ADMIN_FIRST_NAME
- return TENANT_ADMIN_FIRST_NAME;
- case 11: // TENANT_ADMIN_LAST_NAME
- return TENANT_ADMIN_LAST_NAME;
- case 12: // TENANT_ADMIN_EMAIL
- return TENANT_ADMIN_EMAIL;
- case 13: // IDENTITY_SERVER_USER_NAME
- return IDENTITY_SERVER_USER_NAME;
- case 14: // IDENTITY_SERVER_PASSWORD_TOKEN
- return IDENTITY_SERVER_PASSWORD_TOKEN;
case 15: // DECLINED_REASON
return DECLINED_REASON;
- case 16: // OAUTH_CLIENT_ID
- return OAUTH_CLIENT_ID;
- case 17: // OAUTH_CLIENT_SECRET
- return OAUTH_CLIENT_SECRET;
case 18: // REQUEST_CREATION_TIME
return REQUEST_CREATION_TIME;
case 19: // REQUESTER_USERNAME
@@ -220,7 +185,7 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
// isset id assignments
private static final int __REQUESTCREATIONTIME_ISSET_ID = 0;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.TENANT_NAME,_Fields.DOMAIN,_Fields.EMAIL_ADDRESS,_Fields.TENANT_ACRONYM,_Fields.TENANT_URL,_Fields.TENANT_PUBLIC_ABSTRACT,_Fields.REVIEW_PROPOSAL_DESCRIPTION,_Fields.TENANT_ADMIN_FIRST_NAME,_Fields.TENANT_ADMIN_LAST_NAME,_Fields.TENANT_ADMIN_EMAIL,_Fields.IDENTITY_SERVER_USER_NAME,_Fields.IDENTITY_SERVER_PASSWORD_TOKEN,_Fields.DECLINED_REASON,_Fields.OAUTH_CLIENT_ID,_Fields.OAUTH_CLIENT_SECRET,_Fields.REQUEST_CREATION_TIME,_Fields.REQUESTER_USERNAME};
+ private static final _Fields optionals[] = {_Fields.TENANT_NAME,_Fields.DOMAIN,_Fields.EMAIL_ADDRESS,_Fields.TENANT_ACRONYM,_Fields.TENANT_URL,_Fields.TENANT_PUBLIC_ABSTRACT,_Fields.REVIEW_PROPOSAL_DESCRIPTION,_Fields.DECLINED_REASON,_Fields.REQUEST_CREATION_TIME,_Fields.REQUESTER_USERNAME};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -242,22 +207,8 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.REVIEW_PROPOSAL_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("reviewProposalDescription", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.TENANT_ADMIN_FIRST_NAME, new org.apache.thrift.meta_data.FieldMetaData("tenantAdminFirstName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.TENANT_ADMIN_LAST_NAME, new org.apache.thrift.meta_data.FieldMetaData("tenantAdminLastName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.TENANT_ADMIN_EMAIL, new org.apache.thrift.meta_data.FieldMetaData("tenantAdminEmail", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.IDENTITY_SERVER_USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("identityServerUserName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.IDENTITY_SERVER_PASSWORD_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("identityServerPasswordToken", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.DECLINED_REASON, new org.apache.thrift.meta_data.FieldMetaData("declinedReason", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.OAUTH_CLIENT_ID, new org.apache.thrift.meta_data.FieldMetaData("oauthClientId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.OAUTH_CLIENT_SECRET, new org.apache.thrift.meta_data.FieldMetaData("oauthClientSecret", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.REQUEST_CREATION_TIME, new org.apache.thrift.meta_data.FieldMetaData("requestCreationTime", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.REQUESTER_USERNAME, new org.apache.thrift.meta_data.FieldMetaData("requesterUsername", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -310,30 +261,9 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
if (other.isSetReviewProposalDescription()) {
this.reviewProposalDescription = other.reviewProposalDescription;
}
- if (other.isSetTenantAdminFirstName()) {
- this.tenantAdminFirstName = other.tenantAdminFirstName;
- }
- if (other.isSetTenantAdminLastName()) {
- this.tenantAdminLastName = other.tenantAdminLastName;
- }
- if (other.isSetTenantAdminEmail()) {
- this.tenantAdminEmail = other.tenantAdminEmail;
- }
- if (other.isSetIdentityServerUserName()) {
- this.identityServerUserName = other.identityServerUserName;
- }
- if (other.isSetIdentityServerPasswordToken()) {
- this.identityServerPasswordToken = other.identityServerPasswordToken;
- }
if (other.isSetDeclinedReason()) {
this.declinedReason = other.declinedReason;
}
- if (other.isSetOauthClientId()) {
- this.oauthClientId = other.oauthClientId;
- }
- if (other.isSetOauthClientSecret()) {
- this.oauthClientSecret = other.oauthClientSecret;
- }
this.requestCreationTime = other.requestCreationTime;
if (other.isSetRequesterUsername()) {
this.requesterUsername = other.requesterUsername;
@@ -355,14 +285,7 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
this.tenantURL = null;
this.tenantPublicAbstract = null;
this.reviewProposalDescription = null;
- this.tenantAdminFirstName = null;
- this.tenantAdminLastName = null;
- this.tenantAdminEmail = null;
- this.identityServerUserName = null;
- this.identityServerPasswordToken = null;
this.declinedReason = null;
- this.oauthClientId = null;
- this.oauthClientSecret = null;
setRequestCreationTimeIsSet(false);
this.requestCreationTime = 0;
this.requesterUsername = null;
@@ -583,121 +506,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
}
}
- public String getTenantAdminFirstName() {
- return this.tenantAdminFirstName;
- }
-
- public void setTenantAdminFirstName(String tenantAdminFirstName) {
- this.tenantAdminFirstName = tenantAdminFirstName;
- }
-
- public void unsetTenantAdminFirstName() {
- this.tenantAdminFirstName = null;
- }
-
- /** Returns true if field tenantAdminFirstName is set (has been assigned a value) and false otherwise */
- public boolean isSetTenantAdminFirstName() {
- return this.tenantAdminFirstName != null;
- }
-
- public void setTenantAdminFirstNameIsSet(boolean value) {
- if (!value) {
- this.tenantAdminFirstName = null;
- }
- }
-
- public String getTenantAdminLastName() {
- return this.tenantAdminLastName;
- }
-
- public void setTenantAdminLastName(String tenantAdminLastName) {
- this.tenantAdminLastName = tenantAdminLastName;
- }
-
- public void unsetTenantAdminLastName() {
- this.tenantAdminLastName = null;
- }
-
- /** Returns true if field tenantAdminLastName is set (has been assigned a value) and false otherwise */
- public boolean isSetTenantAdminLastName() {
- return this.tenantAdminLastName != null;
- }
-
- public void setTenantAdminLastNameIsSet(boolean value) {
- if (!value) {
- this.tenantAdminLastName = null;
- }
- }
-
- public String getTenantAdminEmail() {
- return this.tenantAdminEmail;
- }
-
- public void setTenantAdminEmail(String tenantAdminEmail) {
- this.tenantAdminEmail = tenantAdminEmail;
- }
-
- public void unsetTenantAdminEmail() {
- this.tenantAdminEmail = null;
- }
-
- /** Returns true if field tenantAdminEmail is set (has been assigned a value) and false otherwise */
- public boolean isSetTenantAdminEmail() {
- return this.tenantAdminEmail != null;
- }
-
- public void setTenantAdminEmailIsSet(boolean value) {
- if (!value) {
- this.tenantAdminEmail = null;
- }
- }
-
- public String getIdentityServerUserName() {
- return this.identityServerUserName;
- }
-
- public void setIdentityServerUserName(String identityServerUserName) {
- this.identityServerUserName = identityServerUserName;
- }
-
- public void unsetIdentityServerUserName() {
- this.identityServerUserName = null;
- }
-
- /** Returns true if field identityServerUserName is set (has been assigned a value) and false otherwise */
- public boolean isSetIdentityServerUserName() {
- return this.identityServerUserName != null;
- }
-
- public void setIdentityServerUserNameIsSet(boolean value) {
- if (!value) {
- this.identityServerUserName = null;
- }
- }
-
- public String getIdentityServerPasswordToken() {
- return this.identityServerPasswordToken;
- }
-
- public void setIdentityServerPasswordToken(String identityServerPasswordToken) {
- this.identityServerPasswordToken = identityServerPasswordToken;
- }
-
- public void unsetIdentityServerPasswordToken() {
- this.identityServerPasswordToken = null;
- }
-
- /** Returns true if field identityServerPasswordToken is set (has been assigned a value) and false otherwise */
- public boolean isSetIdentityServerPasswordToken() {
- return this.identityServerPasswordToken != null;
- }
-
- public void setIdentityServerPasswordTokenIsSet(boolean value) {
- if (!value) {
- this.identityServerPasswordToken = null;
- }
- }
-
public String getDeclinedReason() {
return this.declinedReason;
}
@@ -721,52 +529,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
}
}
- public String getOauthClientId() {
- return this.oauthClientId;
- }
-
- public void setOauthClientId(String oauthClientId) {
- this.oauthClientId = oauthClientId;
- }
-
- public void unsetOauthClientId() {
- this.oauthClientId = null;
- }
-
- /** Returns true if field oauthClientId is set (has been assigned a value) and false otherwise */
- public boolean isSetOauthClientId() {
- return this.oauthClientId != null;
- }
-
- public void setOauthClientIdIsSet(boolean value) {
- if (!value) {
- this.oauthClientId = null;
- }
- }
-
- public String getOauthClientSecret() {
- return this.oauthClientSecret;
- }
-
- public void setOauthClientSecret(String oauthClientSecret) {
- this.oauthClientSecret = oauthClientSecret;
- }
-
- public void unsetOauthClientSecret() {
- this.oauthClientSecret = null;
- }
-
- /** Returns true if field oauthClientSecret is set (has been assigned a value) and false otherwise */
- public boolean isSetOauthClientSecret() {
- return this.oauthClientSecret != null;
- }
-
- public void setOauthClientSecretIsSet(boolean value) {
- if (!value) {
- this.oauthClientSecret = null;
- }
- }
-
public long getRequestCreationTime() {
return this.requestCreationTime;
}
@@ -886,46 +648,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
}
break;
- case TENANT_ADMIN_FIRST_NAME:
- if (value == null) {
- unsetTenantAdminFirstName();
- } else {
- setTenantAdminFirstName((String)value);
- }
- break;
-
- case TENANT_ADMIN_LAST_NAME:
- if (value == null) {
- unsetTenantAdminLastName();
- } else {
- setTenantAdminLastName((String)value);
- }
- break;
-
- case TENANT_ADMIN_EMAIL:
- if (value == null) {
- unsetTenantAdminEmail();
- } else {
- setTenantAdminEmail((String)value);
- }
- break;
-
- case IDENTITY_SERVER_USER_NAME:
- if (value == null) {
- unsetIdentityServerUserName();
- } else {
- setIdentityServerUserName((String)value);
- }
- break;
-
- case IDENTITY_SERVER_PASSWORD_TOKEN:
- if (value == null) {
- unsetIdentityServerPasswordToken();
- } else {
- setIdentityServerPasswordToken((String)value);
- }
- break;
-
case DECLINED_REASON:
if (value == null) {
unsetDeclinedReason();
@@ -934,22 +656,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
}
break;
- case OAUTH_CLIENT_ID:
- if (value == null) {
- unsetOauthClientId();
- } else {
- setOauthClientId((String)value);
- }
- break;
-
- case OAUTH_CLIENT_SECRET:
- if (value == null) {
- unsetOauthClientSecret();
- } else {
- setOauthClientSecret((String)value);
- }
- break;
-
case REQUEST_CREATION_TIME:
if (value == null) {
unsetRequestCreationTime();
@@ -998,30 +704,9 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
case REVIEW_PROPOSAL_DESCRIPTION:
return getReviewProposalDescription();
- case TENANT_ADMIN_FIRST_NAME:
- return getTenantAdminFirstName();
-
- case TENANT_ADMIN_LAST_NAME:
- return getTenantAdminLastName();
-
- case TENANT_ADMIN_EMAIL:
- return getTenantAdminEmail();
-
- case IDENTITY_SERVER_USER_NAME:
- return getIdentityServerUserName();
-
- case IDENTITY_SERVER_PASSWORD_TOKEN:
- return getIdentityServerPasswordToken();
-
case DECLINED_REASON:
return getDeclinedReason();
- case OAUTH_CLIENT_ID:
- return getOauthClientId();
-
- case OAUTH_CLIENT_SECRET:
- return getOauthClientSecret();
-
case REQUEST_CREATION_TIME:
return getRequestCreationTime();
@@ -1057,22 +742,8 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
return isSetTenantPublicAbstract();
case REVIEW_PROPOSAL_DESCRIPTION:
return isSetReviewProposalDescription();
- case TENANT_ADMIN_FIRST_NAME:
- return isSetTenantAdminFirstName();
- case TENANT_ADMIN_LAST_NAME:
- return isSetTenantAdminLastName();
- case TENANT_ADMIN_EMAIL:
- return isSetTenantAdminEmail();
- case IDENTITY_SERVER_USER_NAME:
- return isSetIdentityServerUserName();
- case IDENTITY_SERVER_PASSWORD_TOKEN:
- return isSetIdentityServerPasswordToken();
case DECLINED_REASON:
return isSetDeclinedReason();
- case OAUTH_CLIENT_ID:
- return isSetOauthClientId();
- case OAUTH_CLIENT_SECRET:
- return isSetOauthClientSecret();
case REQUEST_CREATION_TIME:
return isSetRequestCreationTime();
case REQUESTER_USERNAME:
@@ -1175,51 +846,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
return false;
}
- boolean this_present_tenantAdminFirstName = true && this.isSetTenantAdminFirstName();
- boolean that_present_tenantAdminFirstName = true && that.isSetTenantAdminFirstName();
- if (this_present_tenantAdminFirstName || that_present_tenantAdminFirstName) {
- if (!(this_present_tenantAdminFirstName && that_present_tenantAdminFirstName))
- return false;
- if (!this.tenantAdminFirstName.equals(that.tenantAdminFirstName))
- return false;
- }
-
- boolean this_present_tenantAdminLastName = true && this.isSetTenantAdminLastName();
- boolean that_present_tenantAdminLastName = true && that.isSetTenantAdminLastName();
- if (this_present_tenantAdminLastName || that_present_tenantAdminLastName) {
- if (!(this_present_tenantAdminLastName && that_present_tenantAdminLastName))
- return false;
- if (!this.tenantAdminLastName.equals(that.tenantAdminLastName))
- return false;
- }
-
- boolean this_present_tenantAdminEmail = true && this.isSetTenantAdminEmail();
- boolean that_present_tenantAdminEmail = true && that.isSetTenantAdminEmail();
- if (this_present_tenantAdminEmail || that_present_tenantAdminEmail) {
- if (!(this_present_tenantAdminEmail && that_present_tenantAdminEmail))
- return false;
- if (!this.tenantAdminEmail.equals(that.tenantAdminEmail))
- return false;
- }
-
- boolean this_present_identityServerUserName = true && this.isSetIdentityServerUserName();
- boolean that_present_identityServerUserName = true && that.isSetIdentityServerUserName();
- if (this_present_identityServerUserName || that_present_identityServerUserName) {
- if (!(this_present_identityServerUserName && that_present_identityServerUserName))
- return false;
- if (!this.identityServerUserName.equals(that.identityServerUserName))
- return false;
- }
-
- boolean this_present_identityServerPasswordToken = true && this.isSetIdentityServerPasswordToken();
- boolean that_present_identityServerPasswordToken = true && that.isSetIdentityServerPasswordToken();
- if (this_present_identityServerPasswordToken || that_present_identityServerPasswordToken) {
- if (!(this_present_identityServerPasswordToken && that_present_identityServerPasswordToken))
- return false;
- if (!this.identityServerPasswordToken.equals(that.identityServerPasswordToken))
- return false;
- }
-
boolean this_present_declinedReason = true && this.isSetDeclinedReason();
boolean that_present_declinedReason = true && that.isSetDeclinedReason();
if (this_present_declinedReason || that_present_declinedReason) {
@@ -1229,24 +855,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
return false;
}
- boolean this_present_oauthClientId = true && this.isSetOauthClientId();
- boolean that_present_oauthClientId = true && that.isSetOauthClientId();
- if (this_present_oauthClientId || that_present_oauthClientId) {
- if (!(this_present_oauthClientId && that_present_oauthClientId))
- return false;
- if (!this.oauthClientId.equals(that.oauthClientId))
- return false;
- }
-
- boolean this_present_oauthClientSecret = true && this.isSetOauthClientSecret();
- boolean that_present_oauthClientSecret = true && that.isSetOauthClientSecret();
- if (this_present_oauthClientSecret || that_present_oauthClientSecret) {
- if (!(this_present_oauthClientSecret && that_present_oauthClientSecret))
- return false;
- if (!this.oauthClientSecret.equals(that.oauthClientSecret))
- return false;
- }
-
boolean this_present_requestCreationTime = true && this.isSetRequestCreationTime();
boolean that_present_requestCreationTime = true && that.isSetRequestCreationTime();
if (this_present_requestCreationTime || that_present_requestCreationTime) {
@@ -1317,46 +925,11 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
if (present_reviewProposalDescription)
list.add(reviewProposalDescription);
- boolean present_tenantAdminFirstName = true && (isSetTenantAdminFirstName());
- list.add(present_tenantAdminFirstName);
- if (present_tenantAdminFirstName)
- list.add(tenantAdminFirstName);
-
- boolean present_tenantAdminLastName = true && (isSetTenantAdminLastName());
- list.add(present_tenantAdminLastName);
- if (present_tenantAdminLastName)
- list.add(tenantAdminLastName);
-
- boolean present_tenantAdminEmail = true && (isSetTenantAdminEmail());
- list.add(present_tenantAdminEmail);
- if (present_tenantAdminEmail)
- list.add(tenantAdminEmail);
-
- boolean present_identityServerUserName = true && (isSetIdentityServerUserName());
- list.add(present_identityServerUserName);
- if (present_identityServerUserName)
- list.add(identityServerUserName);
-
- boolean present_identityServerPasswordToken = true && (isSetIdentityServerPasswordToken());
- list.add(present_identityServerPasswordToken);
- if (present_identityServerPasswordToken)
- list.add(identityServerPasswordToken);
-
boolean present_declinedReason = true && (isSetDeclinedReason());
list.add(present_declinedReason);
if (present_declinedReason)
list.add(declinedReason);
- boolean present_oauthClientId = true && (isSetOauthClientId());
- list.add(present_oauthClientId);
- if (present_oauthClientId)
- list.add(oauthClientId);
-
- boolean present_oauthClientSecret = true && (isSetOauthClientSecret());
- list.add(present_oauthClientSecret);
- if (present_oauthClientSecret)
- list.add(oauthClientSecret);
-
boolean present_requestCreationTime = true && (isSetRequestCreationTime());
list.add(present_requestCreationTime);
if (present_requestCreationTime)
@@ -1468,56 +1041,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetTenantAdminFirstName()).compareTo(other.isSetTenantAdminFirstName());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetTenantAdminFirstName()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tenantAdminFirstName, other.tenantAdminFirstName);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetTenantAdminLastName()).compareTo(other.isSetTenantAdminLastName());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetTenantAdminLastName()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tenantAdminLastName, other.tenantAdminLastName);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetTenantAdminEmail()).compareTo(other.isSetTenantAdminEmail());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetTenantAdminEmail()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tenantAdminEmail, other.tenantAdminEmail);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetIdentityServerUserName()).compareTo(other.isSetIdentityServerUserName());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetIdentityServerUserName()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.identityServerUserName, other.identityServerUserName);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetIdentityServerPasswordToken()).compareTo(other.isSetIdentityServerPasswordToken());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetIdentityServerPasswordToken()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.identityServerPasswordToken, other.identityServerPasswordToken);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
lastComparison = Boolean.valueOf(isSetDeclinedReason()).compareTo(other.isSetDeclinedReason());
if (lastComparison != 0) {
return lastComparison;
@@ -1528,26 +1051,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetOauthClientId()).compareTo(other.isSetOauthClientId());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetOauthClientId()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.oauthClientId, other.oauthClientId);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetOauthClientSecret()).compareTo(other.isSetOauthClientSecret());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetOauthClientSecret()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.oauthClientSecret, other.oauthClientSecret);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
lastComparison = Boolean.valueOf(isSetRequestCreationTime()).compareTo(other.isSetRequestCreationTime());
if (lastComparison != 0) {
return lastComparison;
@@ -1673,56 +1176,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
}
first = false;
}
- if (isSetTenantAdminFirstName()) {
- if (!first) sb.append(", ");
- sb.append("tenantAdminFirstName:");
- if (this.tenantAdminFirstName == null) {
- sb.append("null");
- } else {
- sb.append(this.tenantAdminFirstName);
- }
- first = false;
- }
- if (isSetTenantAdminLastName()) {
- if (!first) sb.append(", ");
- sb.append("tenantAdminLastName:");
- if (this.tenantAdminLastName == null) {
- sb.append("null");
- } else {
- sb.append(this.tenantAdminLastName);
- }
- first = false;
- }
- if (isSetTenantAdminEmail()) {
- if (!first) sb.append(", ");
- sb.append("tenantAdminEmail:");
- if (this.tenantAdminEmail == null) {
- sb.append("null");
- } else {
- sb.append(this.tenantAdminEmail);
- }
- first = false;
- }
- if (isSetIdentityServerUserName()) {
- if (!first) sb.append(", ");
- sb.append("identityServerUserName:");
- if (this.identityServerUserName == null) {
- sb.append("null");
- } else {
- sb.append(this.identityServerUserName);
- }
- first = false;
- }
- if (isSetIdentityServerPasswordToken()) {
- if (!first) sb.append(", ");
- sb.append("identityServerPasswordToken:");
- if (this.identityServerPasswordToken == null) {
- sb.append("null");
- } else {
- sb.append(this.identityServerPasswordToken);
- }
- first = false;
- }
if (isSetDeclinedReason()) {
if (!first) sb.append(", ");
sb.append("declinedReason:");
@@ -1733,26 +1186,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
}
first = false;
}
- if (isSetOauthClientId()) {
- if (!first) sb.append(", ");
- sb.append("oauthClientId:");
- if (this.oauthClientId == null) {
- sb.append("null");
- } else {
- sb.append(this.oauthClientId);
- }
- first = false;
- }
- if (isSetOauthClientSecret()) {
- if (!first) sb.append(", ");
- sb.append("oauthClientSecret:");
- if (this.oauthClientSecret == null) {
- sb.append("null");
- } else {
- sb.append(this.oauthClientSecret);
- }
- first = false;
- }
if (isSetRequestCreationTime()) {
if (!first) sb.append(", ");
sb.append("requestCreationTime:");
@@ -1894,46 +1327,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 10: // TENANT_ADMIN_FIRST_NAME
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.tenantAdminFirstName = iprot.readString();
- struct.setTenantAdminFirstNameIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 11: // TENANT_ADMIN_LAST_NAME
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.tenantAdminLastName = iprot.readString();
- struct.setTenantAdminLastNameIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 12: // TENANT_ADMIN_EMAIL
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.tenantAdminEmail = iprot.readString();
- struct.setTenantAdminEmailIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 13: // IDENTITY_SERVER_USER_NAME
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.identityServerUserName = iprot.readString();
- struct.setIdentityServerUserNameIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 14: // IDENTITY_SERVER_PASSWORD_TOKEN
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.identityServerPasswordToken = iprot.readString();
- struct.setIdentityServerPasswordTokenIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
case 15: // DECLINED_REASON
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.declinedReason = iprot.readString();
@@ -1942,22 +1335,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 16: // OAUTH_CLIENT_ID
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.oauthClientId = iprot.readString();
- struct.setOauthClientIdIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 17: // OAUTH_CLIENT_SECRET
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.oauthClientSecret = iprot.readString();
- struct.setOauthClientSecretIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
case 18: // REQUEST_CREATION_TIME
if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
struct.requestCreationTime = iprot.readI64();
@@ -2046,41 +1423,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
oprot.writeFieldEnd();
}
}
- if (struct.tenantAdminFirstName != null) {
- if (struct.isSetTenantAdminFirstName()) {
- oprot.writeFieldBegin(TENANT_ADMIN_FIRST_NAME_FIELD_DESC);
- oprot.writeString(struct.tenantAdminFirstName);
- oprot.writeFieldEnd();
- }
- }
- if (struct.tenantAdminLastName != null) {
- if (struct.isSetTenantAdminLastName()) {
- oprot.writeFieldBegin(TENANT_ADMIN_LAST_NAME_FIELD_DESC);
- oprot.writeString(struct.tenantAdminLastName);
- oprot.writeFieldEnd();
- }
- }
- if (struct.tenantAdminEmail != null) {
- if (struct.isSetTenantAdminEmail()) {
- oprot.writeFieldBegin(TENANT_ADMIN_EMAIL_FIELD_DESC);
- oprot.writeString(struct.tenantAdminEmail);
- oprot.writeFieldEnd();
- }
- }
- if (struct.identityServerUserName != null) {
- if (struct.isSetIdentityServerUserName()) {
- oprot.writeFieldBegin(IDENTITY_SERVER_USER_NAME_FIELD_DESC);
- oprot.writeString(struct.identityServerUserName);
- oprot.writeFieldEnd();
- }
- }
- if (struct.identityServerPasswordToken != null) {
- if (struct.isSetIdentityServerPasswordToken()) {
- oprot.writeFieldBegin(IDENTITY_SERVER_PASSWORD_TOKEN_FIELD_DESC);
- oprot.writeString(struct.identityServerPasswordToken);
- oprot.writeFieldEnd();
- }
- }
if (struct.declinedReason != null) {
if (struct.isSetDeclinedReason()) {
oprot.writeFieldBegin(DECLINED_REASON_FIELD_DESC);
@@ -2088,20 +1430,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
oprot.writeFieldEnd();
}
}
- if (struct.oauthClientId != null) {
- if (struct.isSetOauthClientId()) {
- oprot.writeFieldBegin(OAUTH_CLIENT_ID_FIELD_DESC);
- oprot.writeString(struct.oauthClientId);
- oprot.writeFieldEnd();
- }
- }
- if (struct.oauthClientSecret != null) {
- if (struct.isSetOauthClientSecret()) {
- oprot.writeFieldBegin(OAUTH_CLIENT_SECRET_FIELD_DESC);
- oprot.writeString(struct.oauthClientSecret);
- oprot.writeFieldEnd();
- }
- }
if (struct.isSetRequestCreationTime()) {
oprot.writeFieldBegin(REQUEST_CREATION_TIME_FIELD_DESC);
oprot.writeI64(struct.requestCreationTime);
@@ -2155,37 +1483,16 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
if (struct.isSetReviewProposalDescription()) {
optionals.set(6);
}
- if (struct.isSetTenantAdminFirstName()) {
- optionals.set(7);
- }
- if (struct.isSetTenantAdminLastName()) {
- optionals.set(8);
- }
- if (struct.isSetTenantAdminEmail()) {
- optionals.set(9);
- }
- if (struct.isSetIdentityServerUserName()) {
- optionals.set(10);
- }
- if (struct.isSetIdentityServerPasswordToken()) {
- optionals.set(11);
- }
if (struct.isSetDeclinedReason()) {
- optionals.set(12);
- }
- if (struct.isSetOauthClientId()) {
- optionals.set(13);
- }
- if (struct.isSetOauthClientSecret()) {
- optionals.set(14);
+ optionals.set(7);
}
if (struct.isSetRequestCreationTime()) {
- optionals.set(15);
+ optionals.set(8);
}
if (struct.isSetRequesterUsername()) {
- optionals.set(16);
+ optionals.set(9);
}
- oprot.writeBitSet(optionals, 17);
+ oprot.writeBitSet(optionals, 10);
if (struct.isSetTenantName()) {
oprot.writeString(struct.tenantName);
}
@@ -2207,30 +1514,9 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
if (struct.isSetReviewProposalDescription()) {
oprot.writeString(struct.reviewProposalDescription);
}
- if (struct.isSetTenantAdminFirstName()) {
- oprot.writeString(struct.tenantAdminFirstName);
- }
- if (struct.isSetTenantAdminLastName()) {
- oprot.writeString(struct.tenantAdminLastName);
- }
- if (struct.isSetTenantAdminEmail()) {
- oprot.writeString(struct.tenantAdminEmail);
- }
- if (struct.isSetIdentityServerUserName()) {
- oprot.writeString(struct.identityServerUserName);
- }
- if (struct.isSetIdentityServerPasswordToken()) {
- oprot.writeString(struct.identityServerPasswordToken);
- }
if (struct.isSetDeclinedReason()) {
oprot.writeString(struct.declinedReason);
}
- if (struct.isSetOauthClientId()) {
- oprot.writeString(struct.oauthClientId);
- }
- if (struct.isSetOauthClientSecret()) {
- oprot.writeString(struct.oauthClientSecret);
- }
if (struct.isSetRequestCreationTime()) {
oprot.writeI64(struct.requestCreationTime);
}
@@ -2246,7 +1532,7 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
struct.setTenantIdIsSet(true);
struct.tenantApprovalStatus = org.apache.airavata.model.tenant.TenantApprovalStatus.findByValue(iprot.readI32());
struct.setTenantApprovalStatusIsSet(true);
- BitSet incoming = iprot.readBitSet(17);
+ BitSet incoming = iprot.readBitSet(10);
if (incoming.get(0)) {
struct.tenantName = iprot.readString();
struct.setTenantNameIsSet(true);
@@ -2276,42 +1562,14 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
struct.setReviewProposalDescriptionIsSet(true);
}
if (incoming.get(7)) {
- struct.tenantAdminFirstName = iprot.readString();
- struct.setTenantAdminFirstNameIsSet(true);
- }
- if (incoming.get(8)) {
- struct.tenantAdminLastName = iprot.readString();
- struct.setTenantAdminLastNameIsSet(true);
- }
- if (incoming.get(9)) {
- struct.tenantAdminEmail = iprot.readString();
- struct.setTenantAdminEmailIsSet(true);
- }
- if (incoming.get(10)) {
- struct.identityServerUserName = iprot.readString();
- struct.setIdentityServerUserNameIsSet(true);
- }
- if (incoming.get(11)) {
- struct.identityServerPasswordToken = iprot.readString();
- struct.setIdentityServerPasswordTokenIsSet(true);
- }
- if (incoming.get(12)) {
struct.declinedReason = iprot.readString();
struct.setDeclinedReasonIsSet(true);
}
- if (incoming.get(13)) {
- struct.oauthClientId = iprot.readString();
- struct.setOauthClientIdIsSet(true);
- }
- if (incoming.get(14)) {
- struct.oauthClientSecret = iprot.readString();
- struct.setOauthClientSecretIsSet(true);
- }
- if (incoming.get(15)) {
+ if (incoming.get(8)) {
struct.requestCreationTime = iprot.readI64();
struct.setRequestCreationTimeIsSet(true);
}
- if (incoming.get(16)) {
+ if (incoming.get(9)) {
struct.requesterUsername = iprot.readString();
struct.setRequesterUsernameIsSet(true);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/GatewayApprovalStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/GatewayApprovalStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/GatewayApprovalStatus.java
index 3f83cf1..3bfc653 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/GatewayApprovalStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/GatewayApprovalStatus.java
@@ -24,6 +24,10 @@
package org.apache.airavata.model.workspace;
+import java.util.Map;
+import java.util.HashMap;
+import org.apache.thrift.TEnum;
+
public enum GatewayApprovalStatus implements org.apache.thrift.TEnum {
REQUESTED(0),
APPROVED(1),
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
index 66a4481..0a34ac6 100644
--- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
+++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
@@ -3436,7 +3436,7 @@ service Airavata {
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
-bool createGroup(1: required security_model.AuthzToken authzToken, 2: required group_manager_model.GroupModel groupModel)
+string createGroup(1: required security_model.AuthzToken authzToken, 2: required group_manager_model.GroupModel groupModel)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase,
@@ -3448,7 +3448,7 @@ bool createGroup(1: required security_model.AuthzToken authzToken, 2: required g
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
- bool deleteGroup(1: required security_model.AuthzToken authzToken, 2: required string groupId, 3: required string ownerId, 4: required string gatewayId)
+ bool deleteGroup(1: required security_model.AuthzToken authzToken, 2: required string groupId, 3: required string ownerId)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase,
@@ -3460,7 +3460,7 @@ bool createGroup(1: required security_model.AuthzToken authzToken, 2: required g
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
- list<group_manager_model.GroupModel> getAllGroupsUserBelongs(1: required security_model.AuthzToken authzToken, 2: required string userName, 3: required string gatewayId)
+ list<group_manager_model.GroupModel> getAllGroupsUserBelongs(1: required security_model.AuthzToken authzToken, 2: required string userName)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase,