http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py index 7b319f6..2a17da1 100644 --- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py @@ -8,6 +8,7 @@ from thrift.Thrift import TType, TMessageType, TException, TApplicationException import apache.airavata.model.commons.ttypes +import apache.airavata.model.appcatalog.parallelism.ttypes import apache.airavata.model.data.movement.ttypes @@ -287,6 +288,7 @@ class ResourceJobManager: - pushMonitoringEndpoint - jobManagerBinPath - jobManagerCommands + - parallalisimPrefix """ thrift_spec = ( @@ -296,14 +298,16 @@ class ResourceJobManager: (3, TType.STRING, 'pushMonitoringEndpoint', None, None, ), # 3 (4, TType.STRING, 'jobManagerBinPath', None, None, ), # 4 (5, TType.MAP, 'jobManagerCommands', (TType.I32,None,TType.STRING,None), None, ), # 5 + (6, TType.MAP, 'parallalisimPrefix', (TType.I32,None,TType.STRING,None), None, ), # 6 ) - def __init__(self, resourceJobManagerId=thrift_spec[1][4], resourceJobManagerType=None, pushMonitoringEndpoint=None, jobManagerBinPath=None, jobManagerCommands=None,): + def __init__(self, resourceJobManagerId=thrift_spec[1][4], resourceJobManagerType=None, pushMonitoringEndpoint=None, jobManagerBinPath=None, jobManagerCommands=None, parallalisimPrefix=None,): self.resourceJobManagerId = resourceJobManagerId self.resourceJobManagerType = resourceJobManagerType self.pushMonitoringEndpoint = pushMonitoringEndpoint self.jobManagerBinPath = jobManagerBinPath self.jobManagerCommands = jobManagerCommands + self.parallalisimPrefix = parallalisimPrefix 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: @@ -345,6 +349,17 @@ class ResourceJobManager: iprot.readMapEnd() else: iprot.skip(ftype) + elif fid == 6: + if ftype == TType.MAP: + self.parallalisimPrefix = {} + (_ktype8, _vtype9, _size7 ) = iprot.readMapBegin() + for _i11 in xrange(_size7): + _key12 = iprot.readI32() + _val13 = iprot.readString() + self.parallalisimPrefix[_key12] = _val13 + iprot.readMapEnd() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -374,9 +389,17 @@ class ResourceJobManager: if self.jobManagerCommands is not None: oprot.writeFieldBegin('jobManagerCommands', TType.MAP, 5) oprot.writeMapBegin(TType.I32, TType.STRING, len(self.jobManagerCommands)) - for kiter7,viter8 in self.jobManagerCommands.items(): - oprot.writeI32(kiter7) - oprot.writeString(viter8) + for kiter14,viter15 in self.jobManagerCommands.items(): + oprot.writeI32(kiter14) + oprot.writeString(viter15) + oprot.writeMapEnd() + oprot.writeFieldEnd() + if self.parallalisimPrefix is not None: + oprot.writeFieldBegin('parallalisimPrefix', TType.MAP, 6) + oprot.writeMapBegin(TType.I32, TType.STRING, len(self.parallalisimPrefix)) + for kiter16,viter17 in self.parallalisimPrefix.items(): + oprot.writeI32(kiter16) + oprot.writeString(viter17) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -397,6 +420,7 @@ class ResourceJobManager: value = (value * 31) ^ hash(self.pushMonitoringEndpoint) value = (value * 31) ^ hash(self.jobManagerBinPath) value = (value * 31) ^ hash(self.jobManagerCommands) + value = (value * 31) ^ hash(self.parallalisimPrefix) return value def __repr__(self): @@ -756,10 +780,10 @@ class SSHJobSubmission: elif fid == 7: if ftype == TType.LIST: self.batchQueueEmailSenders = [] - (_etype12, _size9) = iprot.readListBegin() - for _i13 in xrange(_size9): - _elem14 = iprot.readString() - self.batchQueueEmailSenders.append(_elem14) + (_etype21, _size18) = iprot.readListBegin() + for _i22 in xrange(_size18): + _elem23 = iprot.readString() + self.batchQueueEmailSenders.append(_elem23) iprot.readListEnd() else: iprot.skip(ftype) @@ -800,8 +824,8 @@ class SSHJobSubmission: if self.batchQueueEmailSenders is not None: oprot.writeFieldBegin('batchQueueEmailSenders', TType.LIST, 7) oprot.writeListBegin(TType.STRING, len(self.batchQueueEmailSenders)) - for iter15 in self.batchQueueEmailSenders: - oprot.writeString(iter15) + for iter24 in self.batchQueueEmailSenders: + oprot.writeString(iter24) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -881,10 +905,10 @@ class GlobusJobSubmission: elif fid == 3: if ftype == TType.LIST: self.globusGateKeeperEndPoint = [] - (_etype19, _size16) = iprot.readListBegin() - for _i20 in xrange(_size16): - _elem21 = iprot.readString() - self.globusGateKeeperEndPoint.append(_elem21) + (_etype28, _size25) = iprot.readListBegin() + for _i29 in xrange(_size25): + _elem30 = iprot.readString() + self.globusGateKeeperEndPoint.append(_elem30) iprot.readListEnd() else: iprot.skip(ftype) @@ -909,8 +933,8 @@ class GlobusJobSubmission: if self.globusGateKeeperEndPoint is not None: oprot.writeFieldBegin('globusGateKeeperEndPoint', TType.LIST, 3) oprot.writeListBegin(TType.STRING, len(self.globusGateKeeperEndPoint)) - for iter22 in self.globusGateKeeperEndPoint: - oprot.writeString(iter22) + for iter31 in self.globusGateKeeperEndPoint: + oprot.writeString(iter31) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -1401,20 +1425,20 @@ class ComputeResourceDescription: elif fid == 3: if ftype == TType.LIST: self.hostAliases = [] - (_etype26, _size23) = iprot.readListBegin() - for _i27 in xrange(_size23): - _elem28 = iprot.readString() - self.hostAliases.append(_elem28) + (_etype35, _size32) = iprot.readListBegin() + for _i36 in xrange(_size32): + _elem37 = iprot.readString() + self.hostAliases.append(_elem37) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 4: if ftype == TType.LIST: self.ipAddresses = [] - (_etype32, _size29) = iprot.readListBegin() - for _i33 in xrange(_size29): - _elem34 = iprot.readString() - self.ipAddresses.append(_elem34) + (_etype41, _size38) = iprot.readListBegin() + for _i42 in xrange(_size38): + _elem43 = iprot.readString() + self.ipAddresses.append(_elem43) iprot.readListEnd() else: iprot.skip(ftype) @@ -1431,44 +1455,44 @@ class ComputeResourceDescription: elif fid == 7: if ftype == TType.LIST: self.batchQueues = [] - (_etype38, _size35) = iprot.readListBegin() - for _i39 in xrange(_size35): - _elem40 = BatchQueue() - _elem40.read(iprot) - self.batchQueues.append(_elem40) + (_etype47, _size44) = iprot.readListBegin() + for _i48 in xrange(_size44): + _elem49 = BatchQueue() + _elem49.read(iprot) + self.batchQueues.append(_elem49) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 8: if ftype == TType.MAP: self.fileSystems = {} - (_ktype42, _vtype43, _size41 ) = iprot.readMapBegin() - for _i45 in xrange(_size41): - _key46 = iprot.readI32() - _val47 = iprot.readString() - self.fileSystems[_key46] = _val47 + (_ktype51, _vtype52, _size50 ) = iprot.readMapBegin() + for _i54 in xrange(_size50): + _key55 = iprot.readI32() + _val56 = iprot.readString() + self.fileSystems[_key55] = _val56 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 9: if ftype == TType.LIST: self.jobSubmissionInterfaces = [] - (_etype51, _size48) = iprot.readListBegin() - for _i52 in xrange(_size48): - _elem53 = JobSubmissionInterface() - _elem53.read(iprot) - self.jobSubmissionInterfaces.append(_elem53) + (_etype60, _size57) = iprot.readListBegin() + for _i61 in xrange(_size57): + _elem62 = JobSubmissionInterface() + _elem62.read(iprot) + self.jobSubmissionInterfaces.append(_elem62) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 10: if ftype == TType.LIST: self.dataMovementInterfaces = [] - (_etype57, _size54) = iprot.readListBegin() - for _i58 in xrange(_size54): - _elem59 = apache.airavata.model.data.movement.ttypes.DataMovementInterface() - _elem59.read(iprot) - self.dataMovementInterfaces.append(_elem59) + (_etype66, _size63) = iprot.readListBegin() + for _i67 in xrange(_size63): + _elem68 = apache.airavata.model.data.movement.ttypes.DataMovementInterface() + _elem68.read(iprot) + self.dataMovementInterfaces.append(_elem68) iprot.readListEnd() else: iprot.skip(ftype) @@ -1513,15 +1537,15 @@ class ComputeResourceDescription: if self.hostAliases is not None: oprot.writeFieldBegin('hostAliases', TType.LIST, 3) oprot.writeListBegin(TType.STRING, len(self.hostAliases)) - for iter60 in self.hostAliases: - oprot.writeString(iter60) + for iter69 in self.hostAliases: + oprot.writeString(iter69) oprot.writeListEnd() oprot.writeFieldEnd() if self.ipAddresses is not None: oprot.writeFieldBegin('ipAddresses', TType.LIST, 4) oprot.writeListBegin(TType.STRING, len(self.ipAddresses)) - for iter61 in self.ipAddresses: - oprot.writeString(iter61) + for iter70 in self.ipAddresses: + oprot.writeString(iter70) oprot.writeListEnd() oprot.writeFieldEnd() if self.resourceDescription is not None: @@ -1535,30 +1559,30 @@ class ComputeResourceDescription: if self.batchQueues is not None: oprot.writeFieldBegin('batchQueues', TType.LIST, 7) oprot.writeListBegin(TType.STRUCT, len(self.batchQueues)) - for iter62 in self.batchQueues: - iter62.write(oprot) + for iter71 in self.batchQueues: + iter71.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.fileSystems is not None: oprot.writeFieldBegin('fileSystems', TType.MAP, 8) oprot.writeMapBegin(TType.I32, TType.STRING, len(self.fileSystems)) - for kiter63,viter64 in self.fileSystems.items(): - oprot.writeI32(kiter63) - oprot.writeString(viter64) + for kiter72,viter73 in self.fileSystems.items(): + oprot.writeI32(kiter72) + oprot.writeString(viter73) oprot.writeMapEnd() oprot.writeFieldEnd() if self.jobSubmissionInterfaces is not None: oprot.writeFieldBegin('jobSubmissionInterfaces', TType.LIST, 9) oprot.writeListBegin(TType.STRUCT, len(self.jobSubmissionInterfaces)) - for iter65 in self.jobSubmissionInterfaces: - iter65.write(oprot) + for iter74 in self.jobSubmissionInterfaces: + iter74.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.dataMovementInterfaces is not None: oprot.writeFieldBegin('dataMovementInterfaces', TType.LIST, 10) oprot.writeListBegin(TType.STRUCT, len(self.dataMovementInterfaces)) - for iter66 in self.dataMovementInterfaces: - iter66.write(oprot) + for iter75 in self.dataMovementInterfaces: + iter75.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.maxMemoryPerNode is not None:
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/__init__.py ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/__init__.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/__init__.py new file mode 100644 index 0000000..adefd8e --- /dev/null +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/__init__.py @@ -0,0 +1 @@ +__all__ = ['ttypes', 'constants'] http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/constants.py ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/constants.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/constants.py new file mode 100644 index 0000000..4a6492b --- /dev/null +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/constants.py @@ -0,0 +1,11 @@ +# +# Autogenerated by Thrift Compiler (0.9.3) +# +# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING +# +# options string: py +# + +from thrift.Thrift import TType, TMessageType, TException, TApplicationException +from ttypes import * + http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/ttypes.py ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/ttypes.py new file mode 100644 index 0000000..485d97e --- /dev/null +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/ttypes.py @@ -0,0 +1,60 @@ +# +# Autogenerated by Thrift Compiler (0.9.3) +# +# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING +# +# options string: py +# + +from thrift.Thrift import TType, TMessageType, TException, TApplicationException + +from thrift.transport import TTransport +from thrift.protocol import TBinaryProtocol, TProtocol +try: + from thrift.protocol import fastbinary +except: + fastbinary = None + + +class ApplicationParallelismType: + """ + Enumeration of application parallelism supported by Airavata + + SERIAL: + Single processor applications without any parallelization. + + MPI: + Messaging Passing Interface. + + OPENMP: + Shared Memory Implementtaion. + + OPENMP_MPI: + Hybrid Applications. + + """ + SERIAL = 0 + MPI = 1 + OPENMP = 2 + OPENMP_MPI = 3 + CCM = 4 + CRAY_MPI = 5 + + _VALUES_TO_NAMES = { + 0: "SERIAL", + 1: "MPI", + 2: "OPENMP", + 3: "OPENMP_MPI", + 4: "CCM", + 5: "CRAY_MPI", + } + + _NAMES_TO_VALUES = { + "SERIAL": 0, + "MPI": 1, + "OPENMP": 2, + "OPENMP_MPI": 3, + "CCM": 4, + "CRAY_MPI": 5, + } + http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java index f3d6395..bbaa688 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26") public class ComponentStatus implements org.apache.thrift.TBase<ComponentStatus, ComponentStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentStatus"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java index 681e161..73572af 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26") public class EdgeModel implements org.apache.thrift.TBase<EdgeModel, EdgeModel._Fields>, java.io.Serializable, Cloneable, Comparable<EdgeModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EdgeModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java index 30a7001..f05059a 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26") public class NodeModel implements org.apache.thrift.TBase<NodeModel, NodeModel._Fields>, java.io.Serializable, Cloneable, Comparable<NodeModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NodeModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java index 586b3f9..634024e 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26") public class PortModel implements org.apache.thrift.TBase<PortModel, PortModel._Fields>, java.io.Serializable, Cloneable, Comparable<PortModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PortModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java index 180ed8a..3418efb 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26") public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, WorkflowModel._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java index 4cbb384..951c083 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26") public class WorkflowStatus implements org.apache.thrift.TBase<WorkflowStatus, WorkflowStatus._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowStatus"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java index 8ad556e..ac05cc6 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java @@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory; * assigns to the environment variable "NAME" the value * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26") public class ApplicationDeploymentDescription implements org.apache.thrift.TBase<ApplicationDeploymentDescription, ApplicationDeploymentDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationDeploymentDescription> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationDeploymentDescription"); @@ -104,7 +104,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase private String appModuleId; // required private String computeHostId; // required private String executablePath; // required - private ApplicationParallelismType parallelism; // required + private org.apache.airavata.model.parallelism.ApplicationParallelismType parallelism; // required private String appDeploymentDescription; // optional private List<CommandObject> moduleLoadCmds; // optional private List<SetEnvPaths> libPrependPaths; // optional @@ -121,7 +121,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase EXECUTABLE_PATH((short)4, "executablePath"), /** * - * @see ApplicationParallelismType + * @see org.apache.airavata.model.parallelism.ApplicationParallelismType */ PARALLELISM((short)5, "parallelism"), APP_DEPLOYMENT_DESCRIPTION((short)6, "appDeploymentDescription"), @@ -222,7 +222,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase tmpMap.put(_Fields.EXECUTABLE_PATH, new org.apache.thrift.meta_data.FieldMetaData("executablePath", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.PARALLELISM, new org.apache.thrift.meta_data.FieldMetaData("parallelism", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ApplicationParallelismType.class))); + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.parallelism.ApplicationParallelismType.class))); tmpMap.put(_Fields.APP_DEPLOYMENT_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("appDeploymentDescription", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.MODULE_LOAD_CMDS, new org.apache.thrift.meta_data.FieldMetaData("moduleLoadCmds", org.apache.thrift.TFieldRequirementType.OPTIONAL, @@ -250,7 +250,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase public ApplicationDeploymentDescription() { this.appDeploymentId = "DO_NOT_SET_AT_CLIENTS"; - this.parallelism = org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType.SERIAL; + this.parallelism = org.apache.airavata.model.parallelism.ApplicationParallelismType.SERIAL; } @@ -259,7 +259,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase String appModuleId, String computeHostId, String executablePath, - ApplicationParallelismType parallelism) + org.apache.airavata.model.parallelism.ApplicationParallelismType parallelism) { this(); this.appDeploymentId = appDeploymentId; @@ -346,7 +346,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase this.appModuleId = null; this.computeHostId = null; this.executablePath = null; - this.parallelism = org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType.SERIAL; + this.parallelism = org.apache.airavata.model.parallelism.ApplicationParallelismType.SERIAL; this.appDeploymentDescription = null; this.moduleLoadCmds = null; @@ -451,17 +451,17 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase /** * - * @see ApplicationParallelismType + * @see org.apache.airavata.model.parallelism.ApplicationParallelismType */ - public ApplicationParallelismType getParallelism() { + public org.apache.airavata.model.parallelism.ApplicationParallelismType getParallelism() { return this.parallelism; } /** * - * @see ApplicationParallelismType + * @see org.apache.airavata.model.parallelism.ApplicationParallelismType */ - public void setParallelism(ApplicationParallelismType parallelism) { + public void setParallelism(org.apache.airavata.model.parallelism.ApplicationParallelismType parallelism) { this.parallelism = parallelism; } @@ -769,7 +769,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase if (value == null) { unsetParallelism(); } else { - setParallelism((ApplicationParallelismType)value); + setParallelism((org.apache.airavata.model.parallelism.ApplicationParallelismType)value); } break; @@ -1454,7 +1454,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase break; case 5: // PARALLELISM if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.parallelism = org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType.findByValue(iprot.readI32()); + struct.parallelism = org.apache.airavata.model.parallelism.ApplicationParallelismType.findByValue(iprot.readI32()); struct.setParallelismIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -1826,7 +1826,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase struct.setComputeHostIdIsSet(true); struct.executablePath = iprot.readString(); struct.setExecutablePathIsSet(true); - struct.parallelism = org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType.findByValue(iprot.readI32()); + struct.parallelism = org.apache.airavata.model.parallelism.ApplicationParallelismType.findByValue(iprot.readI32()); struct.setParallelismIsSet(true); BitSet incoming = iprot.readBitSet(7); if (incoming.get(0)) { http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java index 22e4a62..9107fdf 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java @@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory; * Descriprion of the Module * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26") public class ApplicationModule implements org.apache.thrift.TBase<ApplicationModule, ApplicationModule._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationModule> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationModule"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java index 27185f4..0c11f03 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * commandOrder: * Order of the command in the multiple command situation */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26") public class CommandObject implements org.apache.thrift.TBase<CommandObject, CommandObject._Fields>, java.io.Serializable, Cloneable, Comparable<CommandObject> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CommandObject"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java index 90abf0b..fa826f8 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java @@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory; * envPathOrder: * The order of the setting of the env variables when there are multiple env variables */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26") public class SetEnvPaths implements org.apache.thrift.TBase<SetEnvPaths, SetEnvPaths._Fields>, java.io.Serializable, Cloneable, Comparable<SetEnvPaths> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SetEnvPaths"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java index a968715..f74db79 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java @@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory; * Outputs generated from the application * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26") public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<ApplicationInterfaceDescription, ApplicationInterfaceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationInterfaceDescription> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationInterfaceDescription"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java index 43e2084..d3361e6 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java @@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory; * maxRunTime: * Maximum allowed run time in hours. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26") public class BatchQueue implements org.apache.thrift.TBase<BatchQueue, BatchQueue._Fields>, java.io.Serializable, Cloneable, Comparable<BatchQueue> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BatchQueue"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java index ffb8e4b..430fb96 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; * * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26") public class CloudJobSubmission implements org.apache.thrift.TBase<CloudJobSubmission, CloudJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<CloudJobSubmission> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CloudJobSubmission"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java index 91fc6ef..49bee61 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java @@ -80,7 +80,7 @@ import org.slf4j.LoggerFactory; * Map of file systems type and the path. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26") public class ComputeResourceDescription implements org.apache.thrift.TBase<ComputeResourceDescription, ComputeResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourceDescription> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputeResourceDescription"); @@ -1565,13 +1565,13 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu case 3: // HOST_ALIASES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list26 = iprot.readListBegin(); - struct.hostAliases = new ArrayList<String>(_list26.size); - String _elem27; - for (int _i28 = 0; _i28 < _list26.size; ++_i28) + org.apache.thrift.protocol.TList _list36 = iprot.readListBegin(); + struct.hostAliases = new ArrayList<String>(_list36.size); + String _elem37; + for (int _i38 = 0; _i38 < _list36.size; ++_i38) { - _elem27 = iprot.readString(); - struct.hostAliases.add(_elem27); + _elem37 = iprot.readString(); + struct.hostAliases.add(_elem37); } iprot.readListEnd(); } @@ -1583,13 +1583,13 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu case 4: // IP_ADDRESSES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list29 = iprot.readListBegin(); - struct.ipAddresses = new ArrayList<String>(_list29.size); - String _elem30; - for (int _i31 = 0; _i31 < _list29.size; ++_i31) + org.apache.thrift.protocol.TList _list39 = iprot.readListBegin(); + struct.ipAddresses = new ArrayList<String>(_list39.size); + String _elem40; + for (int _i41 = 0; _i41 < _list39.size; ++_i41) { - _elem30 = iprot.readString(); - struct.ipAddresses.add(_elem30); + _elem40 = iprot.readString(); + struct.ipAddresses.add(_elem40); } iprot.readListEnd(); } @@ -1617,14 +1617,14 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu case 7: // BATCH_QUEUES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list32 = iprot.readListBegin(); - struct.batchQueues = new ArrayList<BatchQueue>(_list32.size); - BatchQueue _elem33; - for (int _i34 = 0; _i34 < _list32.size; ++_i34) + org.apache.thrift.protocol.TList _list42 = iprot.readListBegin(); + struct.batchQueues = new ArrayList<BatchQueue>(_list42.size); + BatchQueue _elem43; + for (int _i44 = 0; _i44 < _list42.size; ++_i44) { - _elem33 = new BatchQueue(); - _elem33.read(iprot); - struct.batchQueues.add(_elem33); + _elem43 = new BatchQueue(); + _elem43.read(iprot); + struct.batchQueues.add(_elem43); } iprot.readListEnd(); } @@ -1636,15 +1636,15 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu case 8: // FILE_SYSTEMS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map35 = iprot.readMapBegin(); - struct.fileSystems = new HashMap<FileSystems,String>(2*_map35.size); - FileSystems _key36; - String _val37; - for (int _i38 = 0; _i38 < _map35.size; ++_i38) + org.apache.thrift.protocol.TMap _map45 = iprot.readMapBegin(); + struct.fileSystems = new HashMap<FileSystems,String>(2*_map45.size); + FileSystems _key46; + String _val47; + for (int _i48 = 0; _i48 < _map45.size; ++_i48) { - _key36 = org.apache.airavata.model.appcatalog.computeresource.FileSystems.findByValue(iprot.readI32()); - _val37 = iprot.readString(); - struct.fileSystems.put(_key36, _val37); + _key46 = org.apache.airavata.model.appcatalog.computeresource.FileSystems.findByValue(iprot.readI32()); + _val47 = iprot.readString(); + struct.fileSystems.put(_key46, _val47); } iprot.readMapEnd(); } @@ -1656,14 +1656,14 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu case 9: // JOB_SUBMISSION_INTERFACES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list39 = iprot.readListBegin(); - struct.jobSubmissionInterfaces = new ArrayList<JobSubmissionInterface>(_list39.size); - JobSubmissionInterface _elem40; - for (int _i41 = 0; _i41 < _list39.size; ++_i41) + org.apache.thrift.protocol.TList _list49 = iprot.readListBegin(); + struct.jobSubmissionInterfaces = new ArrayList<JobSubmissionInterface>(_list49.size); + JobSubmissionInterface _elem50; + for (int _i51 = 0; _i51 < _list49.size; ++_i51) { - _elem40 = new JobSubmissionInterface(); - _elem40.read(iprot); - struct.jobSubmissionInterfaces.add(_elem40); + _elem50 = new JobSubmissionInterface(); + _elem50.read(iprot); + struct.jobSubmissionInterfaces.add(_elem50); } iprot.readListEnd(); } @@ -1675,14 +1675,14 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu case 10: // DATA_MOVEMENT_INTERFACES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list42 = iprot.readListBegin(); - struct.dataMovementInterfaces = new ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(_list42.size); - org.apache.airavata.model.data.movement.DataMovementInterface _elem43; - for (int _i44 = 0; _i44 < _list42.size; ++_i44) + org.apache.thrift.protocol.TList _list52 = iprot.readListBegin(); + struct.dataMovementInterfaces = new ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(_list52.size); + org.apache.airavata.model.data.movement.DataMovementInterface _elem53; + for (int _i54 = 0; _i54 < _list52.size; ++_i54) { - _elem43 = new org.apache.airavata.model.data.movement.DataMovementInterface(); - _elem43.read(iprot); - struct.dataMovementInterfaces.add(_elem43); + _elem53 = new org.apache.airavata.model.data.movement.DataMovementInterface(); + _elem53.read(iprot); + struct.dataMovementInterfaces.add(_elem53); } iprot.readListEnd(); } @@ -1751,9 +1751,9 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu oprot.writeFieldBegin(HOST_ALIASES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.hostAliases.size())); - for (String _iter45 : struct.hostAliases) + for (String _iter55 : struct.hostAliases) { - oprot.writeString(_iter45); + oprot.writeString(_iter55); } oprot.writeListEnd(); } @@ -1765,9 +1765,9 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu oprot.writeFieldBegin(IP_ADDRESSES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.ipAddresses.size())); - for (String _iter46 : struct.ipAddresses) + for (String _iter56 : struct.ipAddresses) { - oprot.writeString(_iter46); + oprot.writeString(_iter56); } oprot.writeListEnd(); } @@ -1791,9 +1791,9 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu oprot.writeFieldBegin(BATCH_QUEUES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.batchQueues.size())); - for (BatchQueue _iter47 : struct.batchQueues) + for (BatchQueue _iter57 : struct.batchQueues) { - _iter47.write(oprot); + _iter57.write(oprot); } oprot.writeListEnd(); } @@ -1805,10 +1805,10 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu oprot.writeFieldBegin(FILE_SYSTEMS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, struct.fileSystems.size())); - for (Map.Entry<FileSystems, String> _iter48 : struct.fileSystems.entrySet()) + for (Map.Entry<FileSystems, String> _iter58 : struct.fileSystems.entrySet()) { - oprot.writeI32(_iter48.getKey().getValue()); - oprot.writeString(_iter48.getValue()); + oprot.writeI32(_iter58.getKey().getValue()); + oprot.writeString(_iter58.getValue()); } oprot.writeMapEnd(); } @@ -1820,9 +1820,9 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu oprot.writeFieldBegin(JOB_SUBMISSION_INTERFACES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.jobSubmissionInterfaces.size())); - for (JobSubmissionInterface _iter49 : struct.jobSubmissionInterfaces) + for (JobSubmissionInterface _iter59 : struct.jobSubmissionInterfaces) { - _iter49.write(oprot); + _iter59.write(oprot); } oprot.writeListEnd(); } @@ -1834,9 +1834,9 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu oprot.writeFieldBegin(DATA_MOVEMENT_INTERFACES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.dataMovementInterfaces.size())); - for (org.apache.airavata.model.data.movement.DataMovementInterface _iter50 : struct.dataMovementInterfaces) + for (org.apache.airavata.model.data.movement.DataMovementInterface _iter60 : struct.dataMovementInterfaces) { - _iter50.write(oprot); + _iter60.write(oprot); } oprot.writeListEnd(); } @@ -1927,18 +1927,18 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu if (struct.isSetHostAliases()) { { oprot.writeI32(struct.hostAliases.size()); - for (String _iter51 : struct.hostAliases) + for (String _iter61 : struct.hostAliases) { - oprot.writeString(_iter51); + oprot.writeString(_iter61); } } } if (struct.isSetIpAddresses()) { { oprot.writeI32(struct.ipAddresses.size()); - for (String _iter52 : struct.ipAddresses) + for (String _iter62 : struct.ipAddresses) { - oprot.writeString(_iter52); + oprot.writeString(_iter62); } } } @@ -1951,37 +1951,37 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu if (struct.isSetBatchQueues()) { { oprot.writeI32(struct.batchQueues.size()); - for (BatchQueue _iter53 : struct.batchQueues) + for (BatchQueue _iter63 : struct.batchQueues) { - _iter53.write(oprot); + _iter63.write(oprot); } } } if (struct.isSetFileSystems()) { { oprot.writeI32(struct.fileSystems.size()); - for (Map.Entry<FileSystems, String> _iter54 : struct.fileSystems.entrySet()) + for (Map.Entry<FileSystems, String> _iter64 : struct.fileSystems.entrySet()) { - oprot.writeI32(_iter54.getKey().getValue()); - oprot.writeString(_iter54.getValue()); + oprot.writeI32(_iter64.getKey().getValue()); + oprot.writeString(_iter64.getValue()); } } } if (struct.isSetJobSubmissionInterfaces()) { { oprot.writeI32(struct.jobSubmissionInterfaces.size()); - for (JobSubmissionInterface _iter55 : struct.jobSubmissionInterfaces) + for (JobSubmissionInterface _iter65 : struct.jobSubmissionInterfaces) { - _iter55.write(oprot); + _iter65.write(oprot); } } } if (struct.isSetDataMovementInterfaces()) { { oprot.writeI32(struct.dataMovementInterfaces.size()); - for (org.apache.airavata.model.data.movement.DataMovementInterface _iter56 : struct.dataMovementInterfaces) + for (org.apache.airavata.model.data.movement.DataMovementInterface _iter66 : struct.dataMovementInterfaces) { - _iter56.write(oprot); + _iter66.write(oprot); } } } @@ -2009,26 +2009,26 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu BitSet incoming = iprot.readBitSet(12); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list57 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.hostAliases = new ArrayList<String>(_list57.size); - String _elem58; - for (int _i59 = 0; _i59 < _list57.size; ++_i59) + org.apache.thrift.protocol.TList _list67 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.hostAliases = new ArrayList<String>(_list67.size); + String _elem68; + for (int _i69 = 0; _i69 < _list67.size; ++_i69) { - _elem58 = iprot.readString(); - struct.hostAliases.add(_elem58); + _elem68 = iprot.readString(); + struct.hostAliases.add(_elem68); } } struct.setHostAliasesIsSet(true); } if (incoming.get(1)) { { - org.apache.thrift.protocol.TList _list60 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.ipAddresses = new ArrayList<String>(_list60.size); - String _elem61; - for (int _i62 = 0; _i62 < _list60.size; ++_i62) + org.apache.thrift.protocol.TList _list70 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.ipAddresses = new ArrayList<String>(_list70.size); + String _elem71; + for (int _i72 = 0; _i72 < _list70.size; ++_i72) { - _elem61 = iprot.readString(); - struct.ipAddresses.add(_elem61); + _elem71 = iprot.readString(); + struct.ipAddresses.add(_elem71); } } struct.setIpAddressesIsSet(true); @@ -2043,57 +2043,57 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu } if (incoming.get(4)) { { - org.apache.thrift.protocol.TList _list63 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.batchQueues = new ArrayList<BatchQueue>(_list63.size); - BatchQueue _elem64; - for (int _i65 = 0; _i65 < _list63.size; ++_i65) + org.apache.thrift.protocol.TList _list73 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.batchQueues = new ArrayList<BatchQueue>(_list73.size); + BatchQueue _elem74; + for (int _i75 = 0; _i75 < _list73.size; ++_i75) { - _elem64 = new BatchQueue(); - _elem64.read(iprot); - struct.batchQueues.add(_elem64); + _elem74 = new BatchQueue(); + _elem74.read(iprot); + struct.batchQueues.add(_elem74); } } struct.setBatchQueuesIsSet(true); } if (incoming.get(5)) { { - org.apache.thrift.protocol.TMap _map66 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.fileSystems = new HashMap<FileSystems,String>(2*_map66.size); - FileSystems _key67; - String _val68; - for (int _i69 = 0; _i69 < _map66.size; ++_i69) + org.apache.thrift.protocol.TMap _map76 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.fileSystems = new HashMap<FileSystems,String>(2*_map76.size); + FileSystems _key77; + String _val78; + for (int _i79 = 0; _i79 < _map76.size; ++_i79) { - _key67 = org.apache.airavata.model.appcatalog.computeresource.FileSystems.findByValue(iprot.readI32()); - _val68 = iprot.readString(); - struct.fileSystems.put(_key67, _val68); + _key77 = org.apache.airavata.model.appcatalog.computeresource.FileSystems.findByValue(iprot.readI32()); + _val78 = iprot.readString(); + struct.fileSystems.put(_key77, _val78); } } struct.setFileSystemsIsSet(true); } if (incoming.get(6)) { { - org.apache.thrift.protocol.TList _list70 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.jobSubmissionInterfaces = new ArrayList<JobSubmissionInterface>(_list70.size); - JobSubmissionInterface _elem71; - for (int _i72 = 0; _i72 < _list70.size; ++_i72) + org.apache.thrift.protocol.TList _list80 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.jobSubmissionInterfaces = new ArrayList<JobSubmissionInterface>(_list80.size); + JobSubmissionInterface _elem81; + for (int _i82 = 0; _i82 < _list80.size; ++_i82) { - _elem71 = new JobSubmissionInterface(); - _elem71.read(iprot); - struct.jobSubmissionInterfaces.add(_elem71); + _elem81 = new JobSubmissionInterface(); + _elem81.read(iprot); + struct.jobSubmissionInterfaces.add(_elem81); } } struct.setJobSubmissionInterfacesIsSet(true); } if (incoming.get(7)) { { - org.apache.thrift.protocol.TList _list73 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.dataMovementInterfaces = new ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(_list73.size); - org.apache.airavata.model.data.movement.DataMovementInterface _elem74; - for (int _i75 = 0; _i75 < _list73.size; ++_i75) + org.apache.thrift.protocol.TList _list83 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.dataMovementInterfaces = new ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(_list83.size); + org.apache.airavata.model.data.movement.DataMovementInterface _elem84; + for (int _i85 = 0; _i85 < _list83.size; ++_i85) { - _elem74 = new org.apache.airavata.model.data.movement.DataMovementInterface(); - _elem74.read(iprot); - struct.dataMovementInterfaces.add(_elem74); + _elem84 = new org.apache.airavata.model.data.movement.DataMovementInterface(); + _elem84.read(iprot); + struct.dataMovementInterfaces.add(_elem84); } } struct.setDataMovementInterfacesIsSet(true); http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java index 5d1f786..482c1b3 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java @@ -51,7 +51,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26") public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSubmission, GlobusJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<GlobusJobSubmission> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GlobusJobSubmission"); @@ -566,13 +566,13 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub case 3: // GLOBUS_GATE_KEEPER_END_POINT if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list18 = iprot.readListBegin(); - struct.globusGateKeeperEndPoint = new ArrayList<String>(_list18.size); - String _elem19; - for (int _i20 = 0; _i20 < _list18.size; ++_i20) + org.apache.thrift.protocol.TList _list28 = iprot.readListBegin(); + struct.globusGateKeeperEndPoint = new ArrayList<String>(_list28.size); + String _elem29; + for (int _i30 = 0; _i30 < _list28.size; ++_i30) { - _elem19 = iprot.readString(); - struct.globusGateKeeperEndPoint.add(_elem19); + _elem29 = iprot.readString(); + struct.globusGateKeeperEndPoint.add(_elem29); } iprot.readListEnd(); } @@ -609,9 +609,9 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub oprot.writeFieldBegin(GLOBUS_GATE_KEEPER_END_POINT_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.globusGateKeeperEndPoint.size())); - for (String _iter21 : struct.globusGateKeeperEndPoint) + for (String _iter31 : struct.globusGateKeeperEndPoint) { - oprot.writeString(_iter21); + oprot.writeString(_iter31); } oprot.writeListEnd(); } @@ -645,9 +645,9 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub if (struct.isSetGlobusGateKeeperEndPoint()) { { oprot.writeI32(struct.globusGateKeeperEndPoint.size()); - for (String _iter22 : struct.globusGateKeeperEndPoint) + for (String _iter32 : struct.globusGateKeeperEndPoint) { - oprot.writeString(_iter22); + oprot.writeString(_iter32); } } } @@ -663,13 +663,13 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list23 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.globusGateKeeperEndPoint = new ArrayList<String>(_list23.size); - String _elem24; - for (int _i25 = 0; _i25 < _list23.size; ++_i25) + org.apache.thrift.protocol.TList _list33 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.globusGateKeeperEndPoint = new ArrayList<String>(_list33.size); + String _elem34; + for (int _i35 = 0; _i35 < _list33.size; ++_i35) { - _elem24 = iprot.readString(); - struct.globusGateKeeperEndPoint.add(_elem24); + _elem34 = iprot.readString(); + struct.globusGateKeeperEndPoint.add(_elem34); } } struct.setGlobusGateKeeperEndPointIsSet(true); http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java index 9ee2d14..6cb0d20 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java @@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory; * Lower the numerical number, higher the priority * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26") public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmissionInterface, JobSubmissionInterface._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionInterface> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobSubmissionInterface"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java index a320fd6..0df794f 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * sshPort: * If a non-default port needs to used, specify it. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26") public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission, LOCALSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALSubmission> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALSubmission"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java index 4b4c67c..7f2fa4b 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java @@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory; * An enumeration of commonly used manager commands. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26") public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobManager, ResourceJobManager._Fields>, java.io.Serializable, Cloneable, Comparable<ResourceJobManager> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ResourceJobManager"); @@ -77,6 +77,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa private static final org.apache.thrift.protocol.TField PUSH_MONITORING_ENDPOINT_FIELD_DESC = new org.apache.thrift.protocol.TField("pushMonitoringEndpoint", org.apache.thrift.protocol.TType.STRING, (short)3); private static final org.apache.thrift.protocol.TField JOB_MANAGER_BIN_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("jobManagerBinPath", org.apache.thrift.protocol.TType.STRING, (short)4); private static final org.apache.thrift.protocol.TField JOB_MANAGER_COMMANDS_FIELD_DESC = new org.apache.thrift.protocol.TField("jobManagerCommands", org.apache.thrift.protocol.TType.MAP, (short)5); + private static final org.apache.thrift.protocol.TField PARALLALISIM_PREFIX_FIELD_DESC = new org.apache.thrift.protocol.TField("parallalisimPrefix", org.apache.thrift.protocol.TType.MAP, (short)6); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -89,6 +90,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa private String pushMonitoringEndpoint; // optional private String jobManagerBinPath; // optional private Map<JobManagerCommand,String> jobManagerCommands; // optional + private Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> parallalisimPrefix; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -100,7 +102,8 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa RESOURCE_JOB_MANAGER_TYPE((short)2, "resourceJobManagerType"), PUSH_MONITORING_ENDPOINT((short)3, "pushMonitoringEndpoint"), JOB_MANAGER_BIN_PATH((short)4, "jobManagerBinPath"), - JOB_MANAGER_COMMANDS((short)5, "jobManagerCommands"); + JOB_MANAGER_COMMANDS((short)5, "jobManagerCommands"), + PARALLALISIM_PREFIX((short)6, "parallalisimPrefix"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -125,6 +128,8 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa return JOB_MANAGER_BIN_PATH; case 5: // JOB_MANAGER_COMMANDS return JOB_MANAGER_COMMANDS; + case 6: // PARALLALISIM_PREFIX + return PARALLALISIM_PREFIX; default: return null; } @@ -165,7 +170,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa } // isset id assignments - private static final _Fields optionals[] = {_Fields.PUSH_MONITORING_ENDPOINT,_Fields.JOB_MANAGER_BIN_PATH,_Fields.JOB_MANAGER_COMMANDS}; + private static final _Fields optionals[] = {_Fields.PUSH_MONITORING_ENDPOINT,_Fields.JOB_MANAGER_BIN_PATH,_Fields.JOB_MANAGER_COMMANDS,_Fields.PARALLALISIM_PREFIX}; 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); @@ -181,6 +186,10 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, JobManagerCommand.class), new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); + tmpMap.put(_Fields.PARALLALISIM_PREFIX, new org.apache.thrift.meta_data.FieldMetaData("parallalisimPrefix", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.parallelism.ApplicationParallelismType.class), + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ResourceJobManager.class, metaDataMap); } @@ -230,6 +239,21 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa } this.jobManagerCommands = __this__jobManagerCommands; } + if (other.isSetParallalisimPrefix()) { + Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> __this__parallalisimPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(other.parallalisimPrefix.size()); + for (Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType, String> other_element : other.parallalisimPrefix.entrySet()) { + + org.apache.airavata.model.parallelism.ApplicationParallelismType other_element_key = other_element.getKey(); + String other_element_value = other_element.getValue(); + + org.apache.airavata.model.parallelism.ApplicationParallelismType __this__parallalisimPrefix_copy_key = other_element_key; + + String __this__parallalisimPrefix_copy_value = other_element_value; + + __this__parallalisimPrefix.put(__this__parallalisimPrefix_copy_key, __this__parallalisimPrefix_copy_value); + } + this.parallalisimPrefix = __this__parallalisimPrefix; + } } public ResourceJobManager deepCopy() { @@ -244,6 +268,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa this.pushMonitoringEndpoint = null; this.jobManagerBinPath = null; this.jobManagerCommands = null; + this.parallalisimPrefix = null; } public String getResourceJobManagerId() { @@ -380,6 +405,40 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa } } + public int getParallalisimPrefixSize() { + return (this.parallalisimPrefix == null) ? 0 : this.parallalisimPrefix.size(); + } + + public void putToParallalisimPrefix(org.apache.airavata.model.parallelism.ApplicationParallelismType key, String val) { + if (this.parallalisimPrefix == null) { + this.parallalisimPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(); + } + this.parallalisimPrefix.put(key, val); + } + + public Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> getParallalisimPrefix() { + return this.parallalisimPrefix; + } + + public void setParallalisimPrefix(Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> parallalisimPrefix) { + this.parallalisimPrefix = parallalisimPrefix; + } + + public void unsetParallalisimPrefix() { + this.parallalisimPrefix = null; + } + + /** Returns true if field parallalisimPrefix is set (has been assigned a value) and false otherwise */ + public boolean isSetParallalisimPrefix() { + return this.parallalisimPrefix != null; + } + + public void setParallalisimPrefixIsSet(boolean value) { + if (!value) { + this.parallalisimPrefix = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case RESOURCE_JOB_MANAGER_ID: @@ -422,6 +481,14 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa } break; + case PARALLALISIM_PREFIX: + if (value == null) { + unsetParallalisimPrefix(); + } else { + setParallalisimPrefix((Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>)value); + } + break; + } } @@ -442,6 +509,9 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa case JOB_MANAGER_COMMANDS: return getJobManagerCommands(); + case PARALLALISIM_PREFIX: + return getParallalisimPrefix(); + } throw new IllegalStateException(); } @@ -463,6 +533,8 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa return isSetJobManagerBinPath(); case JOB_MANAGER_COMMANDS: return isSetJobManagerCommands(); + case PARALLALISIM_PREFIX: + return isSetParallalisimPrefix(); } throw new IllegalStateException(); } @@ -525,6 +597,15 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa return false; } + boolean this_present_parallalisimPrefix = true && this.isSetParallalisimPrefix(); + boolean that_present_parallalisimPrefix = true && that.isSetParallalisimPrefix(); + if (this_present_parallalisimPrefix || that_present_parallalisimPrefix) { + if (!(this_present_parallalisimPrefix && that_present_parallalisimPrefix)) + return false; + if (!this.parallalisimPrefix.equals(that.parallalisimPrefix)) + return false; + } + return true; } @@ -557,6 +638,11 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa if (present_jobManagerCommands) list.add(jobManagerCommands); + boolean present_parallalisimPrefix = true && (isSetParallalisimPrefix()); + list.add(present_parallalisimPrefix); + if (present_parallalisimPrefix) + list.add(parallalisimPrefix); + return list.hashCode(); } @@ -618,6 +704,16 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa return lastComparison; } } + lastComparison = Boolean.valueOf(isSetParallalisimPrefix()).compareTo(other.isSetParallalisimPrefix()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetParallalisimPrefix()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.parallalisimPrefix, other.parallalisimPrefix); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -683,6 +779,16 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa } first = false; } + if (isSetParallalisimPrefix()) { + if (!first) sb.append(", "); + sb.append("parallalisimPrefix:"); + if (this.parallalisimPrefix == null) { + sb.append("null"); + } else { + sb.append(this.parallalisimPrefix); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -786,6 +892,26 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 6: // PARALLALISIM_PREFIX + if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { + { + org.apache.thrift.protocol.TMap _map4 = iprot.readMapBegin(); + struct.parallalisimPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(2*_map4.size); + org.apache.airavata.model.parallelism.ApplicationParallelismType _key5; + String _val6; + for (int _i7 = 0; _i7 < _map4.size; ++_i7) + { + _key5 = org.apache.airavata.model.parallelism.ApplicationParallelismType.findByValue(iprot.readI32()); + _val6 = iprot.readString(); + struct.parallalisimPrefix.put(_key5, _val6); + } + iprot.readMapEnd(); + } + struct.setParallalisimPrefixIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -828,10 +954,25 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa oprot.writeFieldBegin(JOB_MANAGER_COMMANDS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, struct.jobManagerCommands.size())); - for (Map.Entry<JobManagerCommand, String> _iter4 : struct.jobManagerCommands.entrySet()) + for (Map.Entry<JobManagerCommand, String> _iter8 : struct.jobManagerCommands.entrySet()) { - oprot.writeI32(_iter4.getKey().getValue()); - oprot.writeString(_iter4.getValue()); + oprot.writeI32(_iter8.getKey().getValue()); + oprot.writeString(_iter8.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + } + if (struct.parallalisimPrefix != null) { + if (struct.isSetParallalisimPrefix()) { + oprot.writeFieldBegin(PARALLALISIM_PREFIX_FIELD_DESC); + { + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, struct.parallalisimPrefix.size())); + for (Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType, String> _iter9 : struct.parallalisimPrefix.entrySet()) + { + oprot.writeI32(_iter9.getKey().getValue()); + oprot.writeString(_iter9.getValue()); } oprot.writeMapEnd(); } @@ -867,7 +1008,10 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa if (struct.isSetJobManagerCommands()) { optionals.set(2); } - oprot.writeBitSet(optionals, 3); + if (struct.isSetParallalisimPrefix()) { + optionals.set(3); + } + oprot.writeBitSet(optionals, 4); if (struct.isSetPushMonitoringEndpoint()) { oprot.writeString(struct.pushMonitoringEndpoint); } @@ -877,10 +1021,20 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa if (struct.isSetJobManagerCommands()) { { oprot.writeI32(struct.jobManagerCommands.size()); - for (Map.Entry<JobManagerCommand, String> _iter5 : struct.jobManagerCommands.entrySet()) + for (Map.Entry<JobManagerCommand, String> _iter10 : struct.jobManagerCommands.entrySet()) { - oprot.writeI32(_iter5.getKey().getValue()); - oprot.writeString(_iter5.getValue()); + oprot.writeI32(_iter10.getKey().getValue()); + oprot.writeString(_iter10.getValue()); + } + } + } + if (struct.isSetParallalisimPrefix()) { + { + oprot.writeI32(struct.parallalisimPrefix.size()); + for (Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType, String> _iter11 : struct.parallalisimPrefix.entrySet()) + { + oprot.writeI32(_iter11.getKey().getValue()); + oprot.writeString(_iter11.getValue()); } } } @@ -893,7 +1047,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa struct.setResourceJobManagerIdIsSet(true); struct.resourceJobManagerType = org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType.findByValue(iprot.readI32()); struct.setResourceJobManagerTypeIsSet(true); - BitSet incoming = iprot.readBitSet(3); + BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.pushMonitoringEndpoint = iprot.readString(); struct.setPushMonitoringEndpointIsSet(true); @@ -904,19 +1058,34 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa } if (incoming.get(2)) { { - org.apache.thrift.protocol.TMap _map6 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.jobManagerCommands = new HashMap<JobManagerCommand,String>(2*_map6.size); - JobManagerCommand _key7; - String _val8; - for (int _i9 = 0; _i9 < _map6.size; ++_i9) + org.apache.thrift.protocol.TMap _map12 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.jobManagerCommands = new HashMap<JobManagerCommand,String>(2*_map12.size); + JobManagerCommand _key13; + String _val14; + for (int _i15 = 0; _i15 < _map12.size; ++_i15) { - _key7 = org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand.findByValue(iprot.readI32()); - _val8 = iprot.readString(); - struct.jobManagerCommands.put(_key7, _val8); + _key13 = org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand.findByValue(iprot.readI32()); + _val14 = iprot.readString(); + struct.jobManagerCommands.put(_key13, _val14); } } struct.setJobManagerCommandsIsSet(true); } + if (incoming.get(3)) { + { + org.apache.thrift.protocol.TMap _map16 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.parallalisimPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(2*_map16.size); + org.apache.airavata.model.parallelism.ApplicationParallelismType _key17; + String _val18; + for (int _i19 = 0; _i19 < _map16.size; ++_i19) + { + _key17 = org.apache.airavata.model.parallelism.ApplicationParallelismType.findByValue(iprot.readI32()); + _val18 = iprot.readString(); + struct.parallalisimPrefix.put(_key17, _val18); + } + } + struct.setParallalisimPrefixIsSet(true); + } } }
