You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2017/05/15 05:31:52 UTC
[1/3] airavata git commit: making database level changes for
supporting custom node/cpu/walltime configurations
Repository: airavata
Updated Branches:
refs/heads/develop 58ea1bfe7 -> 56bc4bee2
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/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 36f1d9d..f3f6042 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
@@ -96,7 +96,8 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
private static final org.apache.thrift.protocol.TField DEFAULT_QUEUE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("defaultQueueName", org.apache.thrift.protocol.TType.STRING, (short)13);
private static final org.apache.thrift.protocol.TField DEFAULT_NODE_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("defaultNodeCount", org.apache.thrift.protocol.TType.I32, (short)14);
private static final org.apache.thrift.protocol.TField DEFAULT_CPUCOUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("defaultCPUCount", org.apache.thrift.protocol.TType.I32, (short)15);
- private static final org.apache.thrift.protocol.TField EDITABLE_BY_USER_FIELD_DESC = new org.apache.thrift.protocol.TField("editableByUser", org.apache.thrift.protocol.TType.BOOL, (short)16);
+ private static final org.apache.thrift.protocol.TField DEFAULT_WALLTIME_FIELD_DESC = new org.apache.thrift.protocol.TField("defaultWalltime", org.apache.thrift.protocol.TType.I32, (short)16);
+ private static final org.apache.thrift.protocol.TField EDITABLE_BY_USER_FIELD_DESC = new org.apache.thrift.protocol.TField("editableByUser", org.apache.thrift.protocol.TType.BOOL, (short)17);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -119,6 +120,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
private String defaultQueueName; // optional
private int defaultNodeCount; // optional
private int defaultCPUCount; // optional
+ private int defaultWalltime; // optional
private boolean editableByUser; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -142,7 +144,8 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
DEFAULT_QUEUE_NAME((short)13, "defaultQueueName"),
DEFAULT_NODE_COUNT((short)14, "defaultNodeCount"),
DEFAULT_CPUCOUNT((short)15, "defaultCPUCount"),
- EDITABLE_BY_USER((short)16, "editableByUser");
+ DEFAULT_WALLTIME((short)16, "defaultWalltime"),
+ EDITABLE_BY_USER((short)17, "editableByUser");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -187,7 +190,9 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
return DEFAULT_NODE_COUNT;
case 15: // DEFAULT_CPUCOUNT
return DEFAULT_CPUCOUNT;
- case 16: // EDITABLE_BY_USER
+ case 16: // DEFAULT_WALLTIME
+ return DEFAULT_WALLTIME;
+ case 17: // EDITABLE_BY_USER
return EDITABLE_BY_USER;
default:
return null;
@@ -231,9 +236,10 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
// isset id assignments
private static final int __DEFAULTNODECOUNT_ISSET_ID = 0;
private static final int __DEFAULTCPUCOUNT_ISSET_ID = 1;
- private static final int __EDITABLEBYUSER_ISSET_ID = 2;
+ private static final int __DEFAULTWALLTIME_ISSET_ID = 2;
+ private static final int __EDITABLEBYUSER_ISSET_ID = 3;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.APP_DEPLOYMENT_DESCRIPTION,_Fields.MODULE_LOAD_CMDS,_Fields.LIB_PREPEND_PATHS,_Fields.LIB_APPEND_PATHS,_Fields.SET_ENVIRONMENT,_Fields.PRE_JOB_COMMANDS,_Fields.POST_JOB_COMMANDS,_Fields.DEFAULT_QUEUE_NAME,_Fields.DEFAULT_NODE_COUNT,_Fields.DEFAULT_CPUCOUNT,_Fields.EDITABLE_BY_USER};
+ private static final _Fields optionals[] = {_Fields.APP_DEPLOYMENT_DESCRIPTION,_Fields.MODULE_LOAD_CMDS,_Fields.LIB_PREPEND_PATHS,_Fields.LIB_APPEND_PATHS,_Fields.SET_ENVIRONMENT,_Fields.PRE_JOB_COMMANDS,_Fields.POST_JOB_COMMANDS,_Fields.DEFAULT_QUEUE_NAME,_Fields.DEFAULT_NODE_COUNT,_Fields.DEFAULT_CPUCOUNT,_Fields.DEFAULT_WALLTIME,_Fields.EDITABLE_BY_USER};
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);
@@ -273,6 +279,8 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
tmpMap.put(_Fields.DEFAULT_CPUCOUNT, new org.apache.thrift.meta_data.FieldMetaData("defaultCPUCount", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+ tmpMap.put(_Fields.DEFAULT_WALLTIME, new org.apache.thrift.meta_data.FieldMetaData("defaultWalltime", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
tmpMap.put(_Fields.EDITABLE_BY_USER, new org.apache.thrift.meta_data.FieldMetaData("editableByUser", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -371,6 +379,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
}
this.defaultNodeCount = other.defaultNodeCount;
this.defaultCPUCount = other.defaultCPUCount;
+ this.defaultWalltime = other.defaultWalltime;
this.editableByUser = other.editableByUser;
}
@@ -399,6 +408,8 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
this.defaultNodeCount = 0;
setDefaultCPUCountIsSet(false);
this.defaultCPUCount = 0;
+ setDefaultWalltimeIsSet(false);
+ this.defaultWalltime = 0;
setEditableByUserIsSet(false);
this.editableByUser = false;
}
@@ -844,6 +855,28 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DEFAULTCPUCOUNT_ISSET_ID, value);
}
+ public int getDefaultWalltime() {
+ return this.defaultWalltime;
+ }
+
+ public void setDefaultWalltime(int defaultWalltime) {
+ this.defaultWalltime = defaultWalltime;
+ setDefaultWalltimeIsSet(true);
+ }
+
+ public void unsetDefaultWalltime() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DEFAULTWALLTIME_ISSET_ID);
+ }
+
+ /** Returns true if field defaultWalltime is set (has been assigned a value) and false otherwise */
+ public boolean isSetDefaultWalltime() {
+ return EncodingUtils.testBit(__isset_bitfield, __DEFAULTWALLTIME_ISSET_ID);
+ }
+
+ public void setDefaultWalltimeIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DEFAULTWALLTIME_ISSET_ID, value);
+ }
+
public boolean isEditableByUser() {
return this.editableByUser;
}
@@ -988,6 +1021,14 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
}
break;
+ case DEFAULT_WALLTIME:
+ if (value == null) {
+ unsetDefaultWalltime();
+ } else {
+ setDefaultWalltime((Integer)value);
+ }
+ break;
+
case EDITABLE_BY_USER:
if (value == null) {
unsetEditableByUser();
@@ -1046,6 +1087,9 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
case DEFAULT_CPUCOUNT:
return getDefaultCPUCount();
+ case DEFAULT_WALLTIME:
+ return getDefaultWalltime();
+
case EDITABLE_BY_USER:
return isEditableByUser();
@@ -1090,6 +1134,8 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
return isSetDefaultNodeCount();
case DEFAULT_CPUCOUNT:
return isSetDefaultCPUCount();
+ case DEFAULT_WALLTIME:
+ return isSetDefaultWalltime();
case EDITABLE_BY_USER:
return isSetEditableByUser();
}
@@ -1244,6 +1290,15 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
return false;
}
+ boolean this_present_defaultWalltime = true && this.isSetDefaultWalltime();
+ boolean that_present_defaultWalltime = true && that.isSetDefaultWalltime();
+ if (this_present_defaultWalltime || that_present_defaultWalltime) {
+ if (!(this_present_defaultWalltime && that_present_defaultWalltime))
+ return false;
+ if (this.defaultWalltime != that.defaultWalltime)
+ return false;
+ }
+
boolean this_present_editableByUser = true && this.isSetEditableByUser();
boolean that_present_editableByUser = true && that.isSetEditableByUser();
if (this_present_editableByUser || that_present_editableByUser) {
@@ -1335,6 +1390,11 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
if (present_defaultCPUCount)
list.add(defaultCPUCount);
+ boolean present_defaultWalltime = true && (isSetDefaultWalltime());
+ list.add(present_defaultWalltime);
+ if (present_defaultWalltime)
+ list.add(defaultWalltime);
+
boolean present_editableByUser = true && (isSetEditableByUser());
list.add(present_editableByUser);
if (present_editableByUser)
@@ -1501,6 +1561,16 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetDefaultWalltime()).compareTo(other.isSetDefaultWalltime());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetDefaultWalltime()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.defaultWalltime, other.defaultWalltime);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
lastComparison = Boolean.valueOf(isSetEditableByUser()).compareTo(other.isSetEditableByUser());
if (lastComparison != 0) {
return lastComparison;
@@ -1662,6 +1732,12 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
sb.append(this.defaultCPUCount);
first = false;
}
+ if (isSetDefaultWalltime()) {
+ if (!first) sb.append(", ");
+ sb.append("defaultWalltime:");
+ sb.append(this.defaultWalltime);
+ first = false;
+ }
if (isSetEditableByUser()) {
if (!first) sb.append(", ");
sb.append("editableByUser:");
@@ -1919,7 +1995,15 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 16: // EDITABLE_BY_USER
+ case 16: // DEFAULT_WALLTIME
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.defaultWalltime = iprot.readI32();
+ struct.setDefaultWalltimeIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 17: // EDITABLE_BY_USER
if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
struct.editableByUser = iprot.readBool();
struct.setEditableByUserIsSet(true);
@@ -2073,6 +2157,11 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
oprot.writeI32(struct.defaultCPUCount);
oprot.writeFieldEnd();
}
+ if (struct.isSetDefaultWalltime()) {
+ oprot.writeFieldBegin(DEFAULT_WALLTIME_FIELD_DESC);
+ oprot.writeI32(struct.defaultWalltime);
+ oprot.writeFieldEnd();
+ }
if (struct.isSetEditableByUser()) {
oprot.writeFieldBegin(EDITABLE_BY_USER_FIELD_DESC);
oprot.writeBool(struct.editableByUser);
@@ -2131,10 +2220,13 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
if (struct.isSetDefaultCPUCount()) {
optionals.set(9);
}
- if (struct.isSetEditableByUser()) {
+ if (struct.isSetDefaultWalltime()) {
optionals.set(10);
}
- oprot.writeBitSet(optionals, 11);
+ if (struct.isSetEditableByUser()) {
+ optionals.set(11);
+ }
+ oprot.writeBitSet(optionals, 12);
if (struct.isSetAppDeploymentDescription()) {
oprot.writeString(struct.appDeploymentDescription);
}
@@ -2201,6 +2293,9 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
if (struct.isSetDefaultCPUCount()) {
oprot.writeI32(struct.defaultCPUCount);
}
+ if (struct.isSetDefaultWalltime()) {
+ oprot.writeI32(struct.defaultWalltime);
+ }
if (struct.isSetEditableByUser()) {
oprot.writeBool(struct.editableByUser);
}
@@ -2219,7 +2314,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
struct.setExecutablePathIsSet(true);
struct.parallelism = org.apache.airavata.model.parallelism.ApplicationParallelismType.findByValue(iprot.readI32());
struct.setParallelismIsSet(true);
- BitSet incoming = iprot.readBitSet(11);
+ BitSet incoming = iprot.readBitSet(12);
if (incoming.get(0)) {
struct.appDeploymentDescription = iprot.readString();
struct.setAppDeploymentDescriptionIsSet(true);
@@ -2321,6 +2416,10 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
struct.setDefaultCPUCountIsSet(true);
}
if (incoming.get(10)) {
+ struct.defaultWalltime = iprot.readI32();
+ struct.setDefaultWalltimeIsSet(true);
+ }
+ if (incoming.get(11)) {
struct.editableByUser = iprot.readBool();
struct.setEditableByUserIsSet(true);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/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 c1dd4f9..b10f8a8 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
@@ -98,6 +98,10 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
private static final org.apache.thrift.protocol.TField GATEWAY_USAGE_REPORTING_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayUsageReporting", org.apache.thrift.protocol.TType.BOOL, (short)12);
private static final org.apache.thrift.protocol.TField GATEWAY_USAGE_MODULE_LOAD_COMMAND_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayUsageModuleLoadCommand", org.apache.thrift.protocol.TType.STRING, (short)13);
private static final org.apache.thrift.protocol.TField GATEWAY_USAGE_EXECUTABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayUsageExecutable", org.apache.thrift.protocol.TType.STRING, (short)14);
+ private static final org.apache.thrift.protocol.TField CPUS_PER_NODE_FIELD_DESC = new org.apache.thrift.protocol.TField("cpusPerNode", org.apache.thrift.protocol.TType.I32, (short)15);
+ private static final org.apache.thrift.protocol.TField DEFAULT_NODE_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("defaultNodeCount", org.apache.thrift.protocol.TType.I32, (short)16);
+ private static final org.apache.thrift.protocol.TField DEFAULT_CPUCOUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("defaultCPUCount", org.apache.thrift.protocol.TType.I32, (short)17);
+ private static final org.apache.thrift.protocol.TField DEFAULT_WALLLTIME_FIELD_DESC = new org.apache.thrift.protocol.TField("defaultWallltime", org.apache.thrift.protocol.TType.I32, (short)18);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -119,6 +123,10 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
private boolean gatewayUsageReporting; // optional
private String gatewayUsageModuleLoadCommand; // optional
private String gatewayUsageExecutable; // optional
+ private int cpusPerNode; // optional
+ private int defaultNodeCount; // optional
+ private int defaultCPUCount; // optional
+ private int defaultWallltime; // 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 {
@@ -135,7 +143,11 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
MAX_MEMORY_PER_NODE((short)11, "maxMemoryPerNode"),
GATEWAY_USAGE_REPORTING((short)12, "gatewayUsageReporting"),
GATEWAY_USAGE_MODULE_LOAD_COMMAND((short)13, "gatewayUsageModuleLoadCommand"),
- GATEWAY_USAGE_EXECUTABLE((short)14, "gatewayUsageExecutable");
+ GATEWAY_USAGE_EXECUTABLE((short)14, "gatewayUsageExecutable"),
+ CPUS_PER_NODE((short)15, "cpusPerNode"),
+ DEFAULT_NODE_COUNT((short)16, "defaultNodeCount"),
+ DEFAULT_CPUCOUNT((short)17, "defaultCPUCount"),
+ DEFAULT_WALLLTIME((short)18, "defaultWallltime");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -178,6 +190,14 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
return GATEWAY_USAGE_MODULE_LOAD_COMMAND;
case 14: // GATEWAY_USAGE_EXECUTABLE
return GATEWAY_USAGE_EXECUTABLE;
+ case 15: // CPUS_PER_NODE
+ return CPUS_PER_NODE;
+ case 16: // DEFAULT_NODE_COUNT
+ return DEFAULT_NODE_COUNT;
+ case 17: // DEFAULT_CPUCOUNT
+ return DEFAULT_CPUCOUNT;
+ case 18: // DEFAULT_WALLLTIME
+ return DEFAULT_WALLLTIME;
default:
return null;
}
@@ -221,8 +241,12 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
private static final int __ENABLED_ISSET_ID = 0;
private static final int __MAXMEMORYPERNODE_ISSET_ID = 1;
private static final int __GATEWAYUSAGEREPORTING_ISSET_ID = 2;
+ private static final int __CPUSPERNODE_ISSET_ID = 3;
+ private static final int __DEFAULTNODECOUNT_ISSET_ID = 4;
+ private static final int __DEFAULTCPUCOUNT_ISSET_ID = 5;
+ private static final int __DEFAULTWALLLTIME_ISSET_ID = 6;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.HOST_ALIASES,_Fields.IP_ADDRESSES,_Fields.RESOURCE_DESCRIPTION,_Fields.ENABLED,_Fields.BATCH_QUEUES,_Fields.FILE_SYSTEMS,_Fields.JOB_SUBMISSION_INTERFACES,_Fields.DATA_MOVEMENT_INTERFACES,_Fields.MAX_MEMORY_PER_NODE,_Fields.GATEWAY_USAGE_REPORTING,_Fields.GATEWAY_USAGE_MODULE_LOAD_COMMAND,_Fields.GATEWAY_USAGE_EXECUTABLE};
+ private static final _Fields optionals[] = {_Fields.HOST_ALIASES,_Fields.IP_ADDRESSES,_Fields.RESOURCE_DESCRIPTION,_Fields.ENABLED,_Fields.BATCH_QUEUES,_Fields.FILE_SYSTEMS,_Fields.JOB_SUBMISSION_INTERFACES,_Fields.DATA_MOVEMENT_INTERFACES,_Fields.MAX_MEMORY_PER_NODE,_Fields.GATEWAY_USAGE_REPORTING,_Fields.GATEWAY_USAGE_MODULE_LOAD_COMMAND,_Fields.GATEWAY_USAGE_EXECUTABLE,_Fields.CPUS_PER_NODE,_Fields.DEFAULT_NODE_COUNT,_Fields.DEFAULT_CPUCOUNT,_Fields.DEFAULT_WALLLTIME};
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);
@@ -261,6 +285,14 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.GATEWAY_USAGE_EXECUTABLE, new org.apache.thrift.meta_data.FieldMetaData("gatewayUsageExecutable", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.CPUS_PER_NODE, new org.apache.thrift.meta_data.FieldMetaData("cpusPerNode", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+ tmpMap.put(_Fields.DEFAULT_NODE_COUNT, new org.apache.thrift.meta_data.FieldMetaData("defaultNodeCount", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+ tmpMap.put(_Fields.DEFAULT_CPUCOUNT, new org.apache.thrift.meta_data.FieldMetaData("defaultCPUCount", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+ tmpMap.put(_Fields.DEFAULT_WALLLTIME, new org.apache.thrift.meta_data.FieldMetaData("defaultWallltime", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ComputeResourceDescription.class, metaDataMap);
}
@@ -346,6 +378,10 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
if (other.isSetGatewayUsageExecutable()) {
this.gatewayUsageExecutable = other.gatewayUsageExecutable;
}
+ this.cpusPerNode = other.cpusPerNode;
+ this.defaultNodeCount = other.defaultNodeCount;
+ this.defaultCPUCount = other.defaultCPUCount;
+ this.defaultWallltime = other.defaultWallltime;
}
public ComputeResourceDescription deepCopy() {
@@ -372,6 +408,14 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
this.gatewayUsageReporting = false;
this.gatewayUsageModuleLoadCommand = null;
this.gatewayUsageExecutable = null;
+ setCpusPerNodeIsSet(false);
+ this.cpusPerNode = 0;
+ setDefaultNodeCountIsSet(false);
+ this.defaultNodeCount = 0;
+ setDefaultCPUCountIsSet(false);
+ this.defaultCPUCount = 0;
+ setDefaultWallltimeIsSet(false);
+ this.defaultWallltime = 0;
}
public String getComputeResourceId() {
@@ -779,6 +823,94 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
}
}
+ public int getCpusPerNode() {
+ return this.cpusPerNode;
+ }
+
+ public void setCpusPerNode(int cpusPerNode) {
+ this.cpusPerNode = cpusPerNode;
+ setCpusPerNodeIsSet(true);
+ }
+
+ public void unsetCpusPerNode() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CPUSPERNODE_ISSET_ID);
+ }
+
+ /** Returns true if field cpusPerNode is set (has been assigned a value) and false otherwise */
+ public boolean isSetCpusPerNode() {
+ return EncodingUtils.testBit(__isset_bitfield, __CPUSPERNODE_ISSET_ID);
+ }
+
+ public void setCpusPerNodeIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CPUSPERNODE_ISSET_ID, value);
+ }
+
+ public int getDefaultNodeCount() {
+ return this.defaultNodeCount;
+ }
+
+ public void setDefaultNodeCount(int defaultNodeCount) {
+ this.defaultNodeCount = defaultNodeCount;
+ setDefaultNodeCountIsSet(true);
+ }
+
+ public void unsetDefaultNodeCount() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DEFAULTNODECOUNT_ISSET_ID);
+ }
+
+ /** Returns true if field defaultNodeCount is set (has been assigned a value) and false otherwise */
+ public boolean isSetDefaultNodeCount() {
+ return EncodingUtils.testBit(__isset_bitfield, __DEFAULTNODECOUNT_ISSET_ID);
+ }
+
+ public void setDefaultNodeCountIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DEFAULTNODECOUNT_ISSET_ID, value);
+ }
+
+ public int getDefaultCPUCount() {
+ return this.defaultCPUCount;
+ }
+
+ public void setDefaultCPUCount(int defaultCPUCount) {
+ this.defaultCPUCount = defaultCPUCount;
+ setDefaultCPUCountIsSet(true);
+ }
+
+ public void unsetDefaultCPUCount() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DEFAULTCPUCOUNT_ISSET_ID);
+ }
+
+ /** Returns true if field defaultCPUCount is set (has been assigned a value) and false otherwise */
+ public boolean isSetDefaultCPUCount() {
+ return EncodingUtils.testBit(__isset_bitfield, __DEFAULTCPUCOUNT_ISSET_ID);
+ }
+
+ public void setDefaultCPUCountIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DEFAULTCPUCOUNT_ISSET_ID, value);
+ }
+
+ public int getDefaultWallltime() {
+ return this.defaultWallltime;
+ }
+
+ public void setDefaultWallltime(int defaultWallltime) {
+ this.defaultWallltime = defaultWallltime;
+ setDefaultWallltimeIsSet(true);
+ }
+
+ public void unsetDefaultWallltime() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DEFAULTWALLLTIME_ISSET_ID);
+ }
+
+ /** Returns true if field defaultWallltime is set (has been assigned a value) and false otherwise */
+ public boolean isSetDefaultWallltime() {
+ return EncodingUtils.testBit(__isset_bitfield, __DEFAULTWALLLTIME_ISSET_ID);
+ }
+
+ public void setDefaultWallltimeIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DEFAULTWALLLTIME_ISSET_ID, value);
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case COMPUTE_RESOURCE_ID:
@@ -893,6 +1025,38 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
}
break;
+ case CPUS_PER_NODE:
+ if (value == null) {
+ unsetCpusPerNode();
+ } else {
+ setCpusPerNode((Integer)value);
+ }
+ break;
+
+ case DEFAULT_NODE_COUNT:
+ if (value == null) {
+ unsetDefaultNodeCount();
+ } else {
+ setDefaultNodeCount((Integer)value);
+ }
+ break;
+
+ case DEFAULT_CPUCOUNT:
+ if (value == null) {
+ unsetDefaultCPUCount();
+ } else {
+ setDefaultCPUCount((Integer)value);
+ }
+ break;
+
+ case DEFAULT_WALLLTIME:
+ if (value == null) {
+ unsetDefaultWallltime();
+ } else {
+ setDefaultWallltime((Integer)value);
+ }
+ break;
+
}
}
@@ -940,6 +1104,18 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
case GATEWAY_USAGE_EXECUTABLE:
return getGatewayUsageExecutable();
+ case CPUS_PER_NODE:
+ return getCpusPerNode();
+
+ case DEFAULT_NODE_COUNT:
+ return getDefaultNodeCount();
+
+ case DEFAULT_CPUCOUNT:
+ return getDefaultCPUCount();
+
+ case DEFAULT_WALLLTIME:
+ return getDefaultWallltime();
+
}
throw new IllegalStateException();
}
@@ -979,6 +1155,14 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
return isSetGatewayUsageModuleLoadCommand();
case GATEWAY_USAGE_EXECUTABLE:
return isSetGatewayUsageExecutable();
+ case CPUS_PER_NODE:
+ return isSetCpusPerNode();
+ case DEFAULT_NODE_COUNT:
+ return isSetDefaultNodeCount();
+ case DEFAULT_CPUCOUNT:
+ return isSetDefaultCPUCount();
+ case DEFAULT_WALLLTIME:
+ return isSetDefaultWallltime();
}
throw new IllegalStateException();
}
@@ -1122,6 +1306,42 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
return false;
}
+ boolean this_present_cpusPerNode = true && this.isSetCpusPerNode();
+ boolean that_present_cpusPerNode = true && that.isSetCpusPerNode();
+ if (this_present_cpusPerNode || that_present_cpusPerNode) {
+ if (!(this_present_cpusPerNode && that_present_cpusPerNode))
+ return false;
+ if (this.cpusPerNode != that.cpusPerNode)
+ return false;
+ }
+
+ boolean this_present_defaultNodeCount = true && this.isSetDefaultNodeCount();
+ boolean that_present_defaultNodeCount = true && that.isSetDefaultNodeCount();
+ if (this_present_defaultNodeCount || that_present_defaultNodeCount) {
+ if (!(this_present_defaultNodeCount && that_present_defaultNodeCount))
+ return false;
+ if (this.defaultNodeCount != that.defaultNodeCount)
+ return false;
+ }
+
+ boolean this_present_defaultCPUCount = true && this.isSetDefaultCPUCount();
+ boolean that_present_defaultCPUCount = true && that.isSetDefaultCPUCount();
+ if (this_present_defaultCPUCount || that_present_defaultCPUCount) {
+ if (!(this_present_defaultCPUCount && that_present_defaultCPUCount))
+ return false;
+ if (this.defaultCPUCount != that.defaultCPUCount)
+ return false;
+ }
+
+ boolean this_present_defaultWallltime = true && this.isSetDefaultWallltime();
+ boolean that_present_defaultWallltime = true && that.isSetDefaultWallltime();
+ if (this_present_defaultWallltime || that_present_defaultWallltime) {
+ if (!(this_present_defaultWallltime && that_present_defaultWallltime))
+ return false;
+ if (this.defaultWallltime != that.defaultWallltime)
+ return false;
+ }
+
return true;
}
@@ -1199,6 +1419,26 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
if (present_gatewayUsageExecutable)
list.add(gatewayUsageExecutable);
+ boolean present_cpusPerNode = true && (isSetCpusPerNode());
+ list.add(present_cpusPerNode);
+ if (present_cpusPerNode)
+ list.add(cpusPerNode);
+
+ boolean present_defaultNodeCount = true && (isSetDefaultNodeCount());
+ list.add(present_defaultNodeCount);
+ if (present_defaultNodeCount)
+ list.add(defaultNodeCount);
+
+ boolean present_defaultCPUCount = true && (isSetDefaultCPUCount());
+ list.add(present_defaultCPUCount);
+ if (present_defaultCPUCount)
+ list.add(defaultCPUCount);
+
+ boolean present_defaultWallltime = true && (isSetDefaultWallltime());
+ list.add(present_defaultWallltime);
+ if (present_defaultWallltime)
+ list.add(defaultWallltime);
+
return list.hashCode();
}
@@ -1350,6 +1590,46 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetCpusPerNode()).compareTo(other.isSetCpusPerNode());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetCpusPerNode()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cpusPerNode, other.cpusPerNode);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetDefaultNodeCount()).compareTo(other.isSetDefaultNodeCount());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetDefaultNodeCount()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.defaultNodeCount, other.defaultNodeCount);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetDefaultCPUCount()).compareTo(other.isSetDefaultCPUCount());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetDefaultCPUCount()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.defaultCPUCount, other.defaultCPUCount);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetDefaultWallltime()).compareTo(other.isSetDefaultWallltime());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetDefaultWallltime()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.defaultWallltime, other.defaultWallltime);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -1493,6 +1773,30 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
}
first = false;
}
+ if (isSetCpusPerNode()) {
+ if (!first) sb.append(", ");
+ sb.append("cpusPerNode:");
+ sb.append(this.cpusPerNode);
+ first = false;
+ }
+ if (isSetDefaultNodeCount()) {
+ if (!first) sb.append(", ");
+ sb.append("defaultNodeCount:");
+ sb.append(this.defaultNodeCount);
+ first = false;
+ }
+ if (isSetDefaultCPUCount()) {
+ if (!first) sb.append(", ");
+ sb.append("defaultCPUCount:");
+ sb.append(this.defaultCPUCount);
+ first = false;
+ }
+ if (isSetDefaultWallltime()) {
+ if (!first) sb.append(", ");
+ sb.append("defaultWallltime:");
+ sb.append(this.defaultWallltime);
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -1723,6 +2027,38 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 15: // CPUS_PER_NODE
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.cpusPerNode = iprot.readI32();
+ struct.setCpusPerNodeIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 16: // DEFAULT_NODE_COUNT
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.defaultNodeCount = iprot.readI32();
+ struct.setDefaultNodeCountIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 17: // DEFAULT_CPUCOUNT
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.defaultCPUCount = iprot.readI32();
+ struct.setDefaultCPUCountIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 18: // DEFAULT_WALLLTIME
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.defaultWallltime = iprot.readI32();
+ struct.setDefaultWallltimeIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -1867,6 +2203,26 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
oprot.writeFieldEnd();
}
}
+ if (struct.isSetCpusPerNode()) {
+ oprot.writeFieldBegin(CPUS_PER_NODE_FIELD_DESC);
+ oprot.writeI32(struct.cpusPerNode);
+ oprot.writeFieldEnd();
+ }
+ if (struct.isSetDefaultNodeCount()) {
+ oprot.writeFieldBegin(DEFAULT_NODE_COUNT_FIELD_DESC);
+ oprot.writeI32(struct.defaultNodeCount);
+ oprot.writeFieldEnd();
+ }
+ if (struct.isSetDefaultCPUCount()) {
+ oprot.writeFieldBegin(DEFAULT_CPUCOUNT_FIELD_DESC);
+ oprot.writeI32(struct.defaultCPUCount);
+ oprot.writeFieldEnd();
+ }
+ if (struct.isSetDefaultWallltime()) {
+ oprot.writeFieldBegin(DEFAULT_WALLLTIME_FIELD_DESC);
+ oprot.writeI32(struct.defaultWallltime);
+ oprot.writeFieldEnd();
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -1923,7 +2279,19 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
if (struct.isSetGatewayUsageExecutable()) {
optionals.set(11);
}
- oprot.writeBitSet(optionals, 12);
+ if (struct.isSetCpusPerNode()) {
+ optionals.set(12);
+ }
+ if (struct.isSetDefaultNodeCount()) {
+ optionals.set(13);
+ }
+ if (struct.isSetDefaultCPUCount()) {
+ optionals.set(14);
+ }
+ if (struct.isSetDefaultWallltime()) {
+ optionals.set(15);
+ }
+ oprot.writeBitSet(optionals, 16);
if (struct.isSetHostAliases()) {
{
oprot.writeI32(struct.hostAliases.size());
@@ -1997,6 +2365,18 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
if (struct.isSetGatewayUsageExecutable()) {
oprot.writeString(struct.gatewayUsageExecutable);
}
+ if (struct.isSetCpusPerNode()) {
+ oprot.writeI32(struct.cpusPerNode);
+ }
+ if (struct.isSetDefaultNodeCount()) {
+ oprot.writeI32(struct.defaultNodeCount);
+ }
+ if (struct.isSetDefaultCPUCount()) {
+ oprot.writeI32(struct.defaultCPUCount);
+ }
+ if (struct.isSetDefaultWallltime()) {
+ oprot.writeI32(struct.defaultWallltime);
+ }
}
@Override
@@ -2006,7 +2386,7 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
struct.setComputeResourceIdIsSet(true);
struct.hostName = iprot.readString();
struct.setHostNameIsSet(true);
- BitSet incoming = iprot.readBitSet(12);
+ BitSet incoming = iprot.readBitSet(16);
if (incoming.get(0)) {
{
org.apache.thrift.protocol.TList _list67 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
@@ -2114,6 +2494,22 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
struct.gatewayUsageExecutable = iprot.readString();
struct.setGatewayUsageExecutableIsSet(true);
}
+ if (incoming.get(12)) {
+ struct.cpusPerNode = iprot.readI32();
+ struct.setCpusPerNodeIsSet(true);
+ }
+ if (incoming.get(13)) {
+ struct.defaultNodeCount = iprot.readI32();
+ struct.setDefaultNodeCountIsSet(true);
+ }
+ if (incoming.get(14)) {
+ struct.defaultCPUCount = iprot.readI32();
+ struct.setDefaultCPUCountIsSet(true);
+ }
+ if (incoming.get(15)) {
+ struct.defaultWallltime = iprot.readI32();
+ struct.setDefaultWallltimeIsSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ApplicationDeployment.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ApplicationDeployment.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ApplicationDeployment.java
index 571011a..6e6f6fa 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ApplicationDeployment.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ApplicationDeployment.java
@@ -47,6 +47,8 @@ public class ApplicationDeployment implements Serializable {
private int defaultNodeCount;
@Column(name = "DEFAULT_CPU_COUNT")
private int defaultCPUCount;
+ @Column(name = "DEFAULT_WALLTIME")
+ private int defaultWalltime;
@Column(name = "EDITABLE_BY_USER")
private boolean editableByUser;
@@ -176,6 +178,14 @@ public class ApplicationDeployment implements Serializable {
this.defaultCPUCount = defaultCPUCount;
}
+ public int getDefaultWalltime() {
+ return defaultWalltime;
+ }
+
+ public void setDefaultWalltime(int defaultWalltime) {
+ this.defaultWalltime = defaultWalltime;
+ }
+
public boolean isEditableByUser() {
return editableByUser;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResource.java
index c4a02e3..0ea0cea 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResource.java
@@ -61,6 +61,18 @@ public class ComputeResource implements Serializable {
@Column(name = "GATEWAY_USAGE_EXECUTABLE")
private String gatewayUsageExec;
+ @Column(name = "CPUS_PER_NODE")
+ private Integer cpusPerNode;
+
+ @Column(name = "DEFAULT_NODE_COUNT")
+ private Integer defaultNodeCount;
+
+ @Column(name = "DEFAULT_CPU_COUNT")
+ private Integer defaultCPUCount;
+
+ @Column(name = "DEFAULT_WALLTIME")
+ private Integer defaultWalltime;
+
public Timestamp getCreationTime() {
return creationTime;
}
@@ -140,4 +152,36 @@ public class ComputeResource implements Serializable {
public void setGatewayUsageExec(String gatewayUsageExec) {
this.gatewayUsageExec = gatewayUsageExec;
}
+
+ public Integer getCpusPerNode() {
+ return cpusPerNode;
+ }
+
+ public void setCpusPerNode(Integer cpusPerNode) {
+ this.cpusPerNode = cpusPerNode;
+ }
+
+ public Integer getDefaultNodeCount() {
+ return defaultNodeCount;
+ }
+
+ public void setDefaultNodeCount(Integer defaultNodeCount) {
+ this.defaultNodeCount = defaultNodeCount;
+ }
+
+ public Integer getDefaultCPUCount() {
+ return defaultCPUCount;
+ }
+
+ public void setDefaultCPUCount(Integer defaultCPUCount) {
+ this.defaultCPUCount = defaultCPUCount;
+ }
+
+ public Integer getDefaultWalltime() {
+ return defaultWalltime;
+ }
+
+ public void setDefaultWalltime(Integer defaultWalltime) {
+ this.defaultWalltime = defaultWalltime;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppDeploymentResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppDeploymentResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppDeploymentResource.java
index 54d75b7..889341b 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppDeploymentResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppDeploymentResource.java
@@ -49,6 +49,7 @@ public class AppDeploymentResource extends AppCatAbstractResource {
private String defaultQueueName;
private int defaultNodeCount;
private int defaultCPUCount;
+ private int defaultWalltime;
private boolean editableByUser;
private ComputeResourceResource hostResource;
private AppModuleResource moduleResource;
@@ -167,6 +168,14 @@ public class AppDeploymentResource extends AppCatAbstractResource {
this.editableByUser = editableByUser;
}
+ public int getDefaultWalltime() {
+ return defaultWalltime;
+ }
+
+ public void setDefaultWalltime(int defaultWalltime) {
+ this.defaultWalltime = defaultWalltime;
+ }
+
@Override
public void remove(Object identifier) throws AppCatalogException {
EntityManager em = null;
@@ -460,6 +469,7 @@ public class AppDeploymentResource extends AppCatAbstractResource {
existingDeployment.setDefaultQueueName(defaultQueueName);
existingDeployment.setDefaultCPUCount(defaultCPUCount);
existingDeployment.setDefaultNodeCount(defaultNodeCount);
+ existingDeployment.setDefaultWalltime(defaultWalltime);
existingDeployment.setEditableByUser(editableByUser);
existingDeployment.setUpdateTime(AiravataUtils.getCurrentTimestamp());
em.merge(existingDeployment);
@@ -477,6 +487,7 @@ public class AppDeploymentResource extends AppCatAbstractResource {
deployment.setDefaultQueueName(defaultQueueName);
deployment.setDefaultCPUCount(defaultCPUCount);
deployment.setDefaultNodeCount(defaultNodeCount);
+ deployment.setDefaultWalltime(defaultWalltime);
deployment.setEditableByUser(editableByUser);
deployment.setCreationTime(AiravataUtils.getCurrentTimestamp());
em.persist(deployment);
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ComputeResourceResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ComputeResourceResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ComputeResourceResource.java
index 7fd2e46..fd96ad5 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ComputeResourceResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ComputeResourceResource.java
@@ -43,6 +43,10 @@ public class ComputeResourceResource extends AppCatAbstractResource {
private Timestamp createdTime;
private Timestamp updatedTime;
private int maxMemoryPerNode;
+ private int cpusPerNode;
+ private int defaultNodeCount;
+ private int defaultCPUCount;
+ private int defaultWalltime;
private boolean enabled;
private boolean gatewayUsageReporting;
private String gatewayUsageModLoadCMD;
@@ -79,7 +83,39 @@ public class ComputeResourceResource extends AppCatAbstractResource {
this.enabled = enabled;
}
- @Override
+ public int getCpusPerNode() {
+ return cpusPerNode;
+ }
+
+ public void setCpusPerNode(int cpusPerNode) {
+ this.cpusPerNode = cpusPerNode;
+ }
+
+ public int getDefaultNodeCount() {
+ return defaultNodeCount;
+ }
+
+ public void setDefaultNodeCount(int defaultNodeCount) {
+ this.defaultNodeCount = defaultNodeCount;
+ }
+
+ public int getDefaultCPUCount() {
+ return defaultCPUCount;
+ }
+
+ public void setDefaultCPUCount(int defaultCPUCount) {
+ this.defaultCPUCount = defaultCPUCount;
+ }
+
+ public int getDefaultWalltime() {
+ return defaultWalltime;
+ }
+
+ public void setDefaultWalltime(int defaultWalltime) {
+ this.defaultWalltime = defaultWalltime;
+ }
+
+ @Override
public void remove(Object identifier) throws AppCatalogException {
EntityManager em = null;
try {
@@ -339,6 +375,10 @@ public class ComputeResourceResource extends AppCatAbstractResource {
computeResource.setHostName(getHostName());
computeResource.setEnabled(isEnabled());
computeResource.setMaxMemoryPerNode(getMaxMemoryPerNode());
+ computeResource.setCpusPerNode(cpusPerNode);
+ computeResource.setDefaultNodeCount(defaultNodeCount);
+ computeResource.setDefaultCPUCount(defaultCPUCount);
+ computeResource.setDefaultWalltime(defaultWalltime);
computeResource.setGatewayUsageReporting(gatewayUsageReporting);
computeResource.setGatewayUsageModLoadCMD(gatewayUsageModLoadCMD);
computeResource.setGatewayUsageExec(gatewayUsageExec);
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql b/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
index 1f744ee..8014ccf 100644
--- a/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
+++ b/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
@@ -27,6 +27,10 @@ CREATE TABLE COMPUTE_RESOURCE
CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
MAX_MEMORY_NODE INTEGER,
+ CPUS_PER_NODE INTEGER,
+ DEFAULT_NODE_COUNT INTEGER,
+ DEFAULT_CPU_COUNT INTEGER,
+ DEFAULT_WALLTIME INTEGER,
ENABLED SMALLINT,
GATEWAY_USAGE_REPORTING SMALLINT,
GATEWAY_USAGE_MODULE_LOAD_CMD VARCHAR(500),
@@ -209,6 +213,7 @@ CREATE TABLE APPLICATION_DEPLOYMENT
DEFAULT_QUEUE_NAME VARCHAR(255),
DEFAULT_NODE_COUNT INTEGER,
DEFAULT_CPU_COUNT INTEGER,
+ DEFAULT_WALLTIME INTEGER,
EDITABLE_BY_USER BOOLEAN,
PRIMARY KEY(DEPLOYMENT_ID),
FOREIGN KEY (COMPUTE_HOSTID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE,
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
index 12a1953..5de9ebf 100644
--- a/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
@@ -26,6 +26,10 @@ CREATE TABLE COMPUTE_RESOURCE
CREATION_TIME TIMESTAMP DEFAULT NOW(),
UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
MAX_MEMORY_NODE INTEGER,
+ CPUS_PER_NODE INTEGER,
+ DEFAULT_NODE_COUNT INTEGER,
+ DEFAULT_CPU_COUNT INTEGER,
+ DEFAULT_WALLTIME INTEGER,
ENABLED SMALLINT,
GATEWAY_USAGE_REPORTING SMALLINT,
GATEWAY_USAGE_MODULE_LOAD_CMD VARCHAR(500),
@@ -216,6 +220,7 @@ CREATE TABLE APPLICATION_DEPLOYMENT
DEFAULT_QUEUE_NAME VARCHAR(255),
DEFAULT_NODE_COUNT INTEGER,
DEFAULT_CPU_COUNT INTEGER,
+ DEFAULT_WALLTIME INTEGER,
EDITABLE_BY_USER TINYINT(1),
PRIMARY KEY(DEPLOYMENT_ID),
FOREIGN KEY (COMPUTE_HOSTID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE,
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/thrift-interface-descriptions/data-models/app-catalog-models/application_deployment_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/app-catalog-models/application_deployment_model.thrift b/thrift-interface-descriptions/data-models/app-catalog-models/application_deployment_model.thrift
index 7dcf1fe..b28f310 100644
--- a/thrift-interface-descriptions/data-models/app-catalog-models/application_deployment_model.thrift
+++ b/thrift-interface-descriptions/data-models/app-catalog-models/application_deployment_model.thrift
@@ -129,5 +129,6 @@ struct ApplicationDeploymentDescription {
13: optional string defaultQueueName,
14: optional i32 defaultNodeCount,
15: optional i32 defaultCPUCount,
- 16: optional bool editableByUser
+ 16: optional i32 defaultWalltime,
+ 17: optional bool editableByUser,
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift b/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift
index 076e5c1..aaa3dbe 100644
--- a/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift
+++ b/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift
@@ -357,5 +357,9 @@ struct ComputeResourceDescription {
11: optional i32 maxMemoryPerNode,
12: optional bool gatewayUsageReporting,
13: optional string gatewayUsageModuleLoadCommand,
- 14: optional string gatewayUsageExecutable
+ 14: optional string gatewayUsageExecutable,
+ 15: optional i32 cpusPerNode,
+ 16: optional i32 defaultNodeCount,
+ 17: optional i32 defaultCPUCount,
+ 18: optional i32 defaultWallltime,
}
[2/3] airavata git commit: making database level changes for
supporting custom node/cpu/walltime configurations
Posted by sc...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
index 23df7a4..9c20f39 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
@@ -4206,74 +4206,7 @@ interface AiravataIf {
public function getAllUserProfilesInGateway(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId, $offset, $limit);
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $userName
- * @param string $gatewayId
- * @return \Airavata\Model\User\UserProfile * A structure holding the user profile and its child models.
- * *
- * * Notes:
- * * The model does not include passwords as it is assumed an external identity provider is used to authenticate user.
- * * References:
- * * NSF Demographic Information - http://www.nsf.gov/pubs/2000/00form1225/00form1225.doc
- * * LDAP Schema - https://tools.ietf.org/html/rfc4519
- * * SCIM 2.0 - https://tools.ietf.org/html/rfc7643
- * *
- * * userModelVersion:
- * * Version number of profile
- * *
- * * airavataInternalUserId:
- * * internal to Airavata, not intended to be used outside of the Airavata platform or possibly by gateways
- * * (that is, never shown to users), never reassigned, REQUIRED
- * *
- * * userId:
- * * Externally assertable unique identifier. SAML (primarly in higher education, academic) tends to keep
- * * user name less opaque. OpenID Connect maintains them to be opaque.
- * *
- * * firstName, middleName, lastName:
- * * First and Last names as assertede by the user
- * *
- * * namePrefix, nameSuffix:
- * * prefix and suffix to the users name as asserted by the user
- * *
- * * emails:
- * * Email identifier are Verified, REQUIRED and MULTIVALUED
- * *
- * * userName:
- * * Name-based identifiers can be multivalues. To keep it simple, Airavata will make it a string.
- * * In the future these can be enumerated as:
- * * Official name (as asserted possibly by some external identity provider)
- * * Prefered name (as asserted or suggested by user directly)
- * * Components:
- * * givenName
- * * surname (familyName)
- * * displayName (often asserted by user to handle things like middle names, suffix, prefix, and the like)
- * *
- * * orcidId: ORCID ID - http://orcid.org/about/what-is-orcid)
- * *
- * * phones: Telephone MULTIVALUED
- * *
- * * country: Country of Residance
- * *
- * * nationality Countries of citizenship
- * *
- * * comments:
- * * Free-form information (treated as opaque by Airavata and simply passed to resource).
- * *
- * * labeledURI:
- * * Google Scholar, Web of Science, ACS, e.t.c
- * *
- * * timeZone:
- * * User’s preferred timezone - IANA Timezone Databases - http://www.iana.org/time-zones.
- * *
- *
- * @throws \Airavata\API\Error\InvalidRequestException
- * @throws \Airavata\API\Error\AiravataClientException
- * @throws \Airavata\API\Error\AiravataSystemException
- * @throws \Airavata\API\Error\AuthorizationException
- */
- public function getUserProfileByName(\Airavata\Model\Security\AuthzToken $authzToken, $userName, $gatewayId);
- /**
- * @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $userName
+ * @param string $userId
* @param string $gatewayId
* @return bool
* @throws \Airavata\API\Error\InvalidRequestException
@@ -4281,7 +4214,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function doesUserProfileExist(\Airavata\Model\Security\AuthzToken $authzToken, $userName, $gatewayId);
+ public function doesUserProfileExist(\Airavata\Model\Security\AuthzToken $authzToken, $userId, $gatewayId);
}
class AiravataClient implements \Airavata\API\AiravataIf {
@@ -15565,82 +15498,17 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getAllUserProfilesInGateway failed: unknown result");
}
- public function getUserProfileByName(\Airavata\Model\Security\AuthzToken $authzToken, $userName, $gatewayId)
- {
- $this->send_getUserProfileByName($authzToken, $userName, $gatewayId);
- return $this->recv_getUserProfileByName();
- }
-
- public function send_getUserProfileByName(\Airavata\Model\Security\AuthzToken $authzToken, $userName, $gatewayId)
- {
- $args = new \Airavata\API\Airavata_getUserProfileByName_args();
- $args->authzToken = $authzToken;
- $args->userName = $userName;
- $args->gatewayId = $gatewayId;
- $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
- if ($bin_accel)
- {
- thrift_protocol_write_binary($this->output_, 'getUserProfileByName', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
- }
- else
- {
- $this->output_->writeMessageBegin('getUserProfileByName', TMessageType::CALL, $this->seqid_);
- $args->write($this->output_);
- $this->output_->writeMessageEnd();
- $this->output_->getTransport()->flush();
- }
- }
-
- public function recv_getUserProfileByName()
- {
- $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
- if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getUserProfileByName_result', $this->input_->isStrictRead());
- else
- {
- $rseqid = 0;
- $fname = null;
- $mtype = 0;
-
- $this->input_->readMessageBegin($fname, $mtype, $rseqid);
- if ($mtype == TMessageType::EXCEPTION) {
- $x = new TApplicationException();
- $x->read($this->input_);
- $this->input_->readMessageEnd();
- throw $x;
- }
- $result = new \Airavata\API\Airavata_getUserProfileByName_result();
- $result->read($this->input_);
- $this->input_->readMessageEnd();
- }
- if ($result->success !== null) {
- return $result->success;
- }
- if ($result->ire !== null) {
- throw $result->ire;
- }
- if ($result->ace !== null) {
- throw $result->ace;
- }
- if ($result->ase !== null) {
- throw $result->ase;
- }
- if ($result->ae !== null) {
- throw $result->ae;
- }
- throw new \Exception("getUserProfileByName failed: unknown result");
- }
-
- public function doesUserProfileExist(\Airavata\Model\Security\AuthzToken $authzToken, $userName, $gatewayId)
+ public function doesUserProfileExist(\Airavata\Model\Security\AuthzToken $authzToken, $userId, $gatewayId)
{
- $this->send_doesUserProfileExist($authzToken, $userName, $gatewayId);
+ $this->send_doesUserProfileExist($authzToken, $userId, $gatewayId);
return $this->recv_doesUserProfileExist();
}
- public function send_doesUserProfileExist(\Airavata\Model\Security\AuthzToken $authzToken, $userName, $gatewayId)
+ public function send_doesUserProfileExist(\Airavata\Model\Security\AuthzToken $authzToken, $userId, $gatewayId)
{
$args = new \Airavata\API\Airavata_doesUserProfileExist_args();
$args->authzToken = $authzToken;
- $args->userName = $userName;
+ $args->userId = $userId;
$args->gatewayId = $gatewayId;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
@@ -69065,312 +68933,6 @@ class Airavata_getAllUserProfilesInGateway_result {
}
-class Airavata_getUserProfileByName_args {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\Security\AuthzToken
- */
- public $authzToken = null;
- /**
- * @var string
- */
- public $userName = null;
- /**
- * @var string
- */
- public $gatewayId = null;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 1 => array(
- 'var' => 'authzToken',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\Security\AuthzToken',
- ),
- 2 => array(
- 'var' => 'userName',
- 'type' => TType::STRING,
- ),
- 3 => array(
- 'var' => 'gatewayId',
- 'type' => TType::STRING,
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['authzToken'])) {
- $this->authzToken = $vals['authzToken'];
- }
- if (isset($vals['userName'])) {
- $this->userName = $vals['userName'];
- }
- if (isset($vals['gatewayId'])) {
- $this->gatewayId = $vals['gatewayId'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_getUserProfileByName_args';
- }
-
- public function read($input)
- {
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
- {
- $xfer += $input->readFieldBegin($fname, $ftype, $fid);
- if ($ftype == TType::STOP) {
- break;
- }
- switch ($fid)
- {
- case 1:
- if ($ftype == TType::STRUCT) {
- $this->authzToken = new \Airavata\Model\Security\AuthzToken();
- $xfer += $this->authzToken->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- default:
- $xfer += $input->skip($ftype);
- break;
- }
- $xfer += $input->readFieldEnd();
- }
- $xfer += $input->readStructEnd();
- return $xfer;
- }
-
- public function write($output) {
- $xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getUserProfileByName_args');
- if ($this->authzToken !== null) {
- if (!is_object($this->authzToken)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('authzToken', TType::STRUCT, 1);
- $xfer += $this->authzToken->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->userName !== null) {
- $xfer += $output->writeFieldBegin('userName', TType::STRING, 2);
- $xfer += $output->writeString($this->userName);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 3);
- $xfer += $output->writeString($this->gatewayId);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-class Airavata_getUserProfileByName_result {
- static $_TSPEC;
-
- /**
- * @var \Airavata\Model\User\UserProfile
- */
- public $success = null;
- /**
- * @var \Airavata\API\Error\InvalidRequestException
- */
- public $ire = null;
- /**
- * @var \Airavata\API\Error\AiravataClientException
- */
- public $ace = null;
- /**
- * @var \Airavata\API\Error\AiravataSystemException
- */
- public $ase = null;
- /**
- * @var \Airavata\API\Error\AuthorizationException
- */
- public $ae = null;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 0 => array(
- 'var' => 'success',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\User\UserProfile',
- ),
- 1 => array(
- 'var' => 'ire',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\InvalidRequestException',
- ),
- 2 => array(
- 'var' => 'ace',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AiravataClientException',
- ),
- 3 => array(
- 'var' => 'ase',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AiravataSystemException',
- ),
- 4 => array(
- 'var' => 'ae',
- 'type' => TType::STRUCT,
- 'class' => '\Airavata\API\Error\AuthorizationException',
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['success'])) {
- $this->success = $vals['success'];
- }
- if (isset($vals['ire'])) {
- $this->ire = $vals['ire'];
- }
- if (isset($vals['ace'])) {
- $this->ace = $vals['ace'];
- }
- if (isset($vals['ase'])) {
- $this->ase = $vals['ase'];
- }
- if (isset($vals['ae'])) {
- $this->ae = $vals['ae'];
- }
- }
- }
-
- public function getName() {
- return 'Airavata_getUserProfileByName_result';
- }
-
- public function read($input)
- {
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
- {
- $xfer += $input->readFieldBegin($fname, $ftype, $fid);
- if ($ftype == TType::STOP) {
- break;
- }
- switch ($fid)
- {
- case 0:
- if ($ftype == TType::STRUCT) {
- $this->success = new \Airavata\Model\User\UserProfile();
- $xfer += $this->success->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 1:
- if ($ftype == TType::STRUCT) {
- $this->ire = new \Airavata\API\Error\InvalidRequestException();
- $xfer += $this->ire->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::STRUCT) {
- $this->ace = new \Airavata\API\Error\AiravataClientException();
- $xfer += $this->ace->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRUCT) {
- $this->ase = new \Airavata\API\Error\AiravataSystemException();
- $xfer += $this->ase->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::STRUCT) {
- $this->ae = new \Airavata\API\Error\AuthorizationException();
- $xfer += $this->ae->read($input);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- default:
- $xfer += $input->skip($ftype);
- break;
- }
- $xfer += $input->readFieldEnd();
- }
- $xfer += $input->readStructEnd();
- return $xfer;
- }
-
- public function write($output) {
- $xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getUserProfileByName_result');
- if ($this->success !== null) {
- if (!is_object($this->success)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('success', TType::STRUCT, 0);
- $xfer += $this->success->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ire !== null) {
- $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
- $xfer += $this->ire->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ace !== null) {
- $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 2);
- $xfer += $this->ace->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ase !== null) {
- $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 3);
- $xfer += $this->ase->write($output);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->ae !== null) {
- $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 4);
- $xfer += $this->ae->write($output);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
class Airavata_doesUserProfileExist_args {
static $_TSPEC;
@@ -69381,7 +68943,7 @@ class Airavata_doesUserProfileExist_args {
/**
* @var string
*/
- public $userName = null;
+ public $userId = null;
/**
* @var string
*/
@@ -69396,7 +68958,7 @@ class Airavata_doesUserProfileExist_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'userName',
+ 'var' => 'userId',
'type' => TType::STRING,
),
3 => array(
@@ -69409,8 +68971,8 @@ class Airavata_doesUserProfileExist_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['userName'])) {
- $this->userName = $vals['userName'];
+ if (isset($vals['userId'])) {
+ $this->userId = $vals['userId'];
}
if (isset($vals['gatewayId'])) {
$this->gatewayId = $vals['gatewayId'];
@@ -69447,7 +69009,7 @@ class Airavata_doesUserProfileExist_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userName);
+ $xfer += $input->readString($this->userId);
} else {
$xfer += $input->skip($ftype);
}
@@ -69480,9 +69042,9 @@ class Airavata_doesUserProfileExist_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->userName !== null) {
- $xfer += $output->writeFieldBegin('userName', TType::STRING, 2);
- $xfer += $output->writeString($this->userName);
+ if ($this->userId !== null) {
+ $xfer += $output->writeFieldBegin('userId', TType::STRING, 2);
+ $xfer += $output->writeString($this->userId);
$xfer += $output->writeFieldEnd();
}
if ($this->gatewayId !== null) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
index 03d1121..abcb322 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
@@ -506,6 +506,10 @@ class ApplicationDeploymentDescription {
*/
public $defaultCPUCount = null;
/**
+ * @var int
+ */
+ public $defaultWalltime = null;
+ /**
* @var bool
*/
public $editableByUser = null;
@@ -604,6 +608,10 @@ class ApplicationDeploymentDescription {
'type' => TType::I32,
),
16 => array(
+ 'var' => 'defaultWalltime',
+ 'type' => TType::I32,
+ ),
+ 17 => array(
'var' => 'editableByUser',
'type' => TType::BOOL,
),
@@ -655,6 +663,9 @@ class ApplicationDeploymentDescription {
if (isset($vals['defaultCPUCount'])) {
$this->defaultCPUCount = $vals['defaultCPUCount'];
}
+ if (isset($vals['defaultWalltime'])) {
+ $this->defaultWalltime = $vals['defaultWalltime'];
+ }
if (isset($vals['editableByUser'])) {
$this->editableByUser = $vals['editableByUser'];
}
@@ -852,6 +863,13 @@ class ApplicationDeploymentDescription {
}
break;
case 16:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->defaultWalltime);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 17:
if ($ftype == TType::BOOL) {
$xfer += $input->readBool($this->editableByUser);
} else {
@@ -1018,8 +1036,13 @@ class ApplicationDeploymentDescription {
$xfer += $output->writeI32($this->defaultCPUCount);
$xfer += $output->writeFieldEnd();
}
+ if ($this->defaultWalltime !== null) {
+ $xfer += $output->writeFieldBegin('defaultWalltime', TType::I32, 16);
+ $xfer += $output->writeI32($this->defaultWalltime);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->editableByUser !== null) {
- $xfer += $output->writeFieldBegin('editableByUser', TType::BOOL, 16);
+ $xfer += $output->writeFieldBegin('editableByUser', TType::BOOL, 17);
$xfer += $output->writeBool($this->editableByUser);
$xfer += $output->writeFieldEnd();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
index 86e6c5d..e250c65 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
@@ -1885,6 +1885,22 @@ class ComputeResourceDescription {
* @var string
*/
public $gatewayUsageExecutable = null;
+ /**
+ * @var int
+ */
+ public $cpusPerNode = null;
+ /**
+ * @var int
+ */
+ public $defaultNodeCount = null;
+ /**
+ * @var int
+ */
+ public $defaultCPUCount = null;
+ /**
+ * @var int
+ */
+ public $defaultWallltime = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -1976,6 +1992,22 @@ class ComputeResourceDescription {
'var' => 'gatewayUsageExecutable',
'type' => TType::STRING,
),
+ 15 => array(
+ 'var' => 'cpusPerNode',
+ 'type' => TType::I32,
+ ),
+ 16 => array(
+ 'var' => 'defaultNodeCount',
+ 'type' => TType::I32,
+ ),
+ 17 => array(
+ 'var' => 'defaultCPUCount',
+ 'type' => TType::I32,
+ ),
+ 18 => array(
+ 'var' => 'defaultWallltime',
+ 'type' => TType::I32,
+ ),
);
}
if (is_array($vals)) {
@@ -2021,6 +2053,18 @@ class ComputeResourceDescription {
if (isset($vals['gatewayUsageExecutable'])) {
$this->gatewayUsageExecutable = $vals['gatewayUsageExecutable'];
}
+ if (isset($vals['cpusPerNode'])) {
+ $this->cpusPerNode = $vals['cpusPerNode'];
+ }
+ if (isset($vals['defaultNodeCount'])) {
+ $this->defaultNodeCount = $vals['defaultNodeCount'];
+ }
+ if (isset($vals['defaultCPUCount'])) {
+ $this->defaultCPUCount = $vals['defaultCPUCount'];
+ }
+ if (isset($vals['defaultWallltime'])) {
+ $this->defaultWallltime = $vals['defaultWallltime'];
+ }
}
}
@@ -2207,6 +2251,34 @@ class ComputeResourceDescription {
$xfer += $input->skip($ftype);
}
break;
+ case 15:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->cpusPerNode);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 16:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->defaultNodeCount);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 17:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->defaultCPUCount);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 18:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->defaultWallltime);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -2363,6 +2435,26 @@ class ComputeResourceDescription {
$xfer += $output->writeString($this->gatewayUsageExecutable);
$xfer += $output->writeFieldEnd();
}
+ if ($this->cpusPerNode !== null) {
+ $xfer += $output->writeFieldBegin('cpusPerNode', TType::I32, 15);
+ $xfer += $output->writeI32($this->cpusPerNode);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->defaultNodeCount !== null) {
+ $xfer += $output->writeFieldBegin('defaultNodeCount', TType::I32, 16);
+ $xfer += $output->writeI32($this->defaultNodeCount);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->defaultCPUCount !== null) {
+ $xfer += $output->writeFieldBegin('defaultCPUCount', TType::I32, 17);
+ $xfer += $output->writeI32($this->defaultCPUCount);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->defaultWallltime !== null) {
+ $xfer += $output->writeFieldBegin('defaultWallltime', TType::I32, 18);
+ $xfer += $output->writeI32($this->defaultWallltime);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
index 1ebd5db..493b615 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/User/Types.php
@@ -499,10 +499,6 @@ class UserProfile {
/**
* @var string
*/
- public $userName = null;
- /**
- * @var string
- */
public $orcidId = null;
/**
* @var string[]
@@ -609,14 +605,10 @@ class UserProfile {
'type' => TType::STRING,
),
11 => array(
- 'var' => 'userName',
- 'type' => TType::STRING,
- ),
- 12 => array(
'var' => 'orcidId',
'type' => TType::STRING,
),
- 13 => array(
+ 12 => array(
'var' => 'phones',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -624,11 +616,11 @@ class UserProfile {
'type' => TType::STRING,
),
),
- 14 => array(
+ 13 => array(
'var' => 'country',
'type' => TType::STRING,
),
- 15 => array(
+ 14 => array(
'var' => 'nationality',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -636,35 +628,35 @@ class UserProfile {
'type' => TType::STRING,
),
),
- 16 => array(
+ 15 => array(
'var' => 'homeOrganization',
'type' => TType::STRING,
),
- 17 => array(
+ 16 => array(
'var' => 'orginationAffiliation',
'type' => TType::STRING,
),
- 18 => array(
+ 17 => array(
'var' => 'creationTime',
'type' => TType::I64,
),
- 19 => array(
+ 18 => array(
'var' => 'lastAccessTime',
'type' => TType::I64,
),
- 20 => array(
+ 19 => array(
'var' => 'validUntil',
'type' => TType::I64,
),
- 21 => array(
+ 20 => array(
'var' => 'State',
'type' => TType::I32,
),
- 22 => array(
+ 21 => array(
'var' => 'comments',
'type' => TType::STRING,
),
- 23 => array(
+ 22 => array(
'var' => 'labeledURI',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -672,15 +664,15 @@ class UserProfile {
'type' => TType::STRING,
),
),
- 24 => array(
+ 23 => array(
'var' => 'gpgKey',
'type' => TType::STRING,
),
- 25 => array(
+ 24 => array(
'var' => 'timeZone',
'type' => TType::STRING,
),
- 26 => array(
+ 25 => array(
'var' => 'nsfDemographics',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\User\NSFDemographics',
@@ -718,9 +710,6 @@ class UserProfile {
if (isset($vals['nameSuffix'])) {
$this->nameSuffix = $vals['nameSuffix'];
}
- if (isset($vals['userName'])) {
- $this->userName = $vals['userName'];
- }
if (isset($vals['orcidId'])) {
$this->orcidId = $vals['orcidId'];
}
@@ -870,19 +859,12 @@ class UserProfile {
break;
case 11:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->userName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 12:
- if ($ftype == TType::STRING) {
$xfer += $input->readString($this->orcidId);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 13:
+ case 12:
if ($ftype == TType::LST) {
$this->phones = array();
$_size27 = 0;
@@ -899,14 +881,14 @@ class UserProfile {
$xfer += $input->skip($ftype);
}
break;
- case 14:
+ case 13:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->country);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 15:
+ case 14:
if ($ftype == TType::LST) {
$this->nationality = array();
$_size33 = 0;
@@ -923,56 +905,56 @@ class UserProfile {
$xfer += $input->skip($ftype);
}
break;
- case 16:
+ case 15:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->homeOrganization);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 17:
+ case 16:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->orginationAffiliation);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 18:
+ case 17:
if ($ftype == TType::I64) {
$xfer += $input->readI64($this->creationTime);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 19:
+ case 18:
if ($ftype == TType::I64) {
$xfer += $input->readI64($this->lastAccessTime);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 20:
+ case 19:
if ($ftype == TType::I64) {
$xfer += $input->readI64($this->validUntil);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 21:
+ case 20:
if ($ftype == TType::I32) {
$xfer += $input->readI32($this->State);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 22:
+ case 21:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->comments);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 23:
+ case 22:
if ($ftype == TType::LST) {
$this->labeledURI = array();
$_size39 = 0;
@@ -989,21 +971,21 @@ class UserProfile {
$xfer += $input->skip($ftype);
}
break;
- case 24:
+ case 23:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->gpgKey);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 25:
+ case 24:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->timeZone);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 26:
+ case 25:
if ($ftype == TType::STRUCT) {
$this->nsfDemographics = new \Airavata\Model\User\NSFDemographics();
$xfer += $this->nsfDemographics->read($input);
@@ -1086,13 +1068,8 @@ class UserProfile {
$xfer += $output->writeString($this->nameSuffix);
$xfer += $output->writeFieldEnd();
}
- if ($this->userName !== null) {
- $xfer += $output->writeFieldBegin('userName', TType::STRING, 11);
- $xfer += $output->writeString($this->userName);
- $xfer += $output->writeFieldEnd();
- }
if ($this->orcidId !== null) {
- $xfer += $output->writeFieldBegin('orcidId', TType::STRING, 12);
+ $xfer += $output->writeFieldBegin('orcidId', TType::STRING, 11);
$xfer += $output->writeString($this->orcidId);
$xfer += $output->writeFieldEnd();
}
@@ -1100,7 +1077,7 @@ class UserProfile {
if (!is_array($this->phones)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('phones', TType::LST, 13);
+ $xfer += $output->writeFieldBegin('phones', TType::LST, 12);
{
$output->writeListBegin(TType::STRING, count($this->phones));
{
@@ -1114,7 +1091,7 @@ class UserProfile {
$xfer += $output->writeFieldEnd();
}
if ($this->country !== null) {
- $xfer += $output->writeFieldBegin('country', TType::STRING, 14);
+ $xfer += $output->writeFieldBegin('country', TType::STRING, 13);
$xfer += $output->writeString($this->country);
$xfer += $output->writeFieldEnd();
}
@@ -1122,7 +1099,7 @@ class UserProfile {
if (!is_array($this->nationality)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('nationality', TType::LST, 15);
+ $xfer += $output->writeFieldBegin('nationality', TType::LST, 14);
{
$output->writeListBegin(TType::STRING, count($this->nationality));
{
@@ -1136,37 +1113,37 @@ class UserProfile {
$xfer += $output->writeFieldEnd();
}
if ($this->homeOrganization !== null) {
- $xfer += $output->writeFieldBegin('homeOrganization', TType::STRING, 16);
+ $xfer += $output->writeFieldBegin('homeOrganization', TType::STRING, 15);
$xfer += $output->writeString($this->homeOrganization);
$xfer += $output->writeFieldEnd();
}
if ($this->orginationAffiliation !== null) {
- $xfer += $output->writeFieldBegin('orginationAffiliation', TType::STRING, 17);
+ $xfer += $output->writeFieldBegin('orginationAffiliation', TType::STRING, 16);
$xfer += $output->writeString($this->orginationAffiliation);
$xfer += $output->writeFieldEnd();
}
if ($this->creationTime !== null) {
- $xfer += $output->writeFieldBegin('creationTime', TType::I64, 18);
+ $xfer += $output->writeFieldBegin('creationTime', TType::I64, 17);
$xfer += $output->writeI64($this->creationTime);
$xfer += $output->writeFieldEnd();
}
if ($this->lastAccessTime !== null) {
- $xfer += $output->writeFieldBegin('lastAccessTime', TType::I64, 19);
+ $xfer += $output->writeFieldBegin('lastAccessTime', TType::I64, 18);
$xfer += $output->writeI64($this->lastAccessTime);
$xfer += $output->writeFieldEnd();
}
if ($this->validUntil !== null) {
- $xfer += $output->writeFieldBegin('validUntil', TType::I64, 20);
+ $xfer += $output->writeFieldBegin('validUntil', TType::I64, 19);
$xfer += $output->writeI64($this->validUntil);
$xfer += $output->writeFieldEnd();
}
if ($this->State !== null) {
- $xfer += $output->writeFieldBegin('State', TType::I32, 21);
+ $xfer += $output->writeFieldBegin('State', TType::I32, 20);
$xfer += $output->writeI32($this->State);
$xfer += $output->writeFieldEnd();
}
if ($this->comments !== null) {
- $xfer += $output->writeFieldBegin('comments', TType::STRING, 22);
+ $xfer += $output->writeFieldBegin('comments', TType::STRING, 21);
$xfer += $output->writeString($this->comments);
$xfer += $output->writeFieldEnd();
}
@@ -1174,7 +1151,7 @@ class UserProfile {
if (!is_array($this->labeledURI)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('labeledURI', TType::LST, 23);
+ $xfer += $output->writeFieldBegin('labeledURI', TType::LST, 22);
{
$output->writeListBegin(TType::STRING, count($this->labeledURI));
{
@@ -1188,12 +1165,12 @@ class UserProfile {
$xfer += $output->writeFieldEnd();
}
if ($this->gpgKey !== null) {
- $xfer += $output->writeFieldBegin('gpgKey', TType::STRING, 24);
+ $xfer += $output->writeFieldBegin('gpgKey', TType::STRING, 23);
$xfer += $output->writeString($this->gpgKey);
$xfer += $output->writeFieldEnd();
}
if ($this->timeZone !== null) {
- $xfer += $output->writeFieldBegin('timeZone', TType::STRING, 25);
+ $xfer += $output->writeFieldBegin('timeZone', TType::STRING, 24);
$xfer += $output->writeString($this->timeZone);
$xfer += $output->writeFieldEnd();
}
@@ -1201,7 +1178,7 @@ class UserProfile {
if (!is_object($this->nsfDemographics)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('nsfDemographics', TType::STRUCT, 26);
+ $xfer += $output->writeFieldBegin('nsfDemographics', TType::STRUCT, 25);
$xfer += $this->nsfDemographics->write($output);
$xfer += $output->writeFieldEnd();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Types.php
index 0e8e23c..19d9d61 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Types.php
@@ -15,4 +15,17 @@ use Thrift\Protocol\TBinaryProtocolAccelerated;
use Thrift\Exception\TApplicationException;
+final class Constant extends \Thrift\Type\TConstant {
+ static protected $TENANT_PROFILE_CPI_VERSION;
+ static protected $TENANT_PROFILE_CPI_NAME;
+
+ static protected function init_TENANT_PROFILE_CPI_VERSION() {
+ return "0.17";
+ }
+
+ static protected function init_TENANT_PROFILE_CPI_NAME() {
+ return "TenantProfileService";
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
index 622df08..96f0e6f 100755
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
@@ -198,8 +198,7 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
print(' UserProfile getUserProfileById(AuthzToken authzToken, string userId, string gatewayId)')
print(' bool deleteUserProfile(AuthzToken authzToken, string userId)')
print(' getAllUserProfilesInGateway(AuthzToken authzToken, string gatewayId, i32 offset, i32 limit)')
- print(' UserProfile getUserProfileByName(AuthzToken authzToken, string userName, string gatewayId)')
- print(' bool doesUserProfileExist(AuthzToken authzToken, string userName, string gatewayId)')
+ print(' bool doesUserProfileExist(AuthzToken authzToken, string userId, string gatewayId)')
print('')
sys.exit(0)
@@ -1300,12 +1299,6 @@ elif cmd == 'getAllUserProfilesInGateway':
sys.exit(1)
pp.pprint(client.getAllUserProfilesInGateway(eval(args[0]),args[1],eval(args[2]),eval(args[3]),))
-elif cmd == 'getUserProfileByName':
- if len(args) != 3:
- print('getUserProfileByName requires 3 args')
- sys.exit(1)
- pp.pprint(client.getUserProfileByName(eval(args[0]),args[1],args[2],))
-
elif cmd == 'doesUserProfileExist':
if len(args) != 3:
print('doesUserProfileExist requires 3 args')
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
index 6712bf7..e195f71 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
@@ -3499,20 +3499,11 @@ class Iface:
"""
pass
- def getUserProfileByName(self, authzToken, userName, gatewayId):
+ def doesUserProfileExist(self, authzToken, userId, gatewayId):
"""
Parameters:
- authzToken
- - userName
- - gatewayId
- """
- pass
-
- def doesUserProfileExist(self, authzToken, userName, gatewayId):
- """
- Parameters:
- - authzToken
- - userName
+ - userId
- gatewayId
"""
pass
@@ -12884,64 +12875,21 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllUserProfilesInGateway failed: unknown result")
- def getUserProfileByName(self, authzToken, userName, gatewayId):
- """
- Parameters:
- - authzToken
- - userName
- - gatewayId
- """
- self.send_getUserProfileByName(authzToken, userName, gatewayId)
- return self.recv_getUserProfileByName()
-
- def send_getUserProfileByName(self, authzToken, userName, gatewayId):
- self._oprot.writeMessageBegin('getUserProfileByName', TMessageType.CALL, self._seqid)
- args = getUserProfileByName_args()
- args.authzToken = authzToken
- args.userName = userName
- args.gatewayId = gatewayId
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_getUserProfileByName(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = getUserProfileByName_result()
- result.read(iprot)
- iprot.readMessageEnd()
- if result.success is not None:
- return result.success
- if result.ire is not None:
- raise result.ire
- if result.ace is not None:
- raise result.ace
- if result.ase is not None:
- raise result.ase
- if result.ae is not None:
- raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getUserProfileByName failed: unknown result")
-
- def doesUserProfileExist(self, authzToken, userName, gatewayId):
+ def doesUserProfileExist(self, authzToken, userId, gatewayId):
"""
Parameters:
- authzToken
- - userName
+ - userId
- gatewayId
"""
- self.send_doesUserProfileExist(authzToken, userName, gatewayId)
+ self.send_doesUserProfileExist(authzToken, userId, gatewayId)
return self.recv_doesUserProfileExist()
- def send_doesUserProfileExist(self, authzToken, userName, gatewayId):
+ def send_doesUserProfileExist(self, authzToken, userId, gatewayId):
self._oprot.writeMessageBegin('doesUserProfileExist', TMessageType.CALL, self._seqid)
args = doesUserProfileExist_args()
args.authzToken = authzToken
- args.userName = userName
+ args.userId = userId
args.gatewayId = gatewayId
args.write(self._oprot)
self._oprot.writeMessageEnd()
@@ -13149,7 +13097,6 @@ class Processor(Iface, TProcessor):
self._processMap["getUserProfileById"] = Processor.process_getUserProfileById
self._processMap["deleteUserProfile"] = Processor.process_deleteUserProfile
self._processMap["getAllUserProfilesInGateway"] = Processor.process_getAllUserProfilesInGateway
- self._processMap["getUserProfileByName"] = Processor.process_getUserProfileByName
self._processMap["doesUserProfileExist"] = Processor.process_doesUserProfileExist
def process(self, iprot, oprot):
@@ -18576,44 +18523,13 @@ class Processor(Iface, TProcessor):
oprot.writeMessageEnd()
oprot.trans.flush()
- def process_getUserProfileByName(self, seqid, iprot, oprot):
- args = getUserProfileByName_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = getUserProfileByName_result()
- try:
- result.success = self._handler.getUserProfileByName(args.authzToken, args.userName, args.gatewayId)
- msg_type = TMessageType.REPLY
- except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
- raise
- except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
- msg_type = TMessageType.REPLY
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException as ace:
- msg_type = TMessageType.REPLY
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
- msg_type = TMessageType.REPLY
- result.ase = ase
- except apache.airavata.api.error.ttypes.AuthorizationException as ae:
- msg_type = TMessageType.REPLY
- result.ae = ae
- except Exception as ex:
- msg_type = TMessageType.EXCEPTION
- logging.exception(ex)
- result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
- oprot.writeMessageBegin("getUserProfileByName", msg_type, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
def process_doesUserProfileExist(self, seqid, iprot, oprot):
args = doesUserProfileExist_args()
args.read(iprot)
iprot.readMessageEnd()
result = doesUserProfileExist_result()
try:
- result.success = self._handler.doesUserProfileExist(args.authzToken, args.userName, args.gatewayId)
+ result.success = self._handler.doesUserProfileExist(args.authzToken, args.userId, args.gatewayId)
msg_type = TMessageType.REPLY
except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
raise
@@ -56540,243 +56456,24 @@ class getAllUserProfilesInGateway_result:
def __ne__(self, other):
return not (self == other)
-class getUserProfileByName_args:
- """
- Attributes:
- - authzToken
- - userName
- - gatewayId
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'userName', None, None, ), # 2
- (3, TType.STRING, 'gatewayId', None, None, ), # 3
- )
-
- def __init__(self, authzToken=None, userName=None, gatewayId=None,):
- self.authzToken = authzToken
- self.userName = userName
- self.gatewayId = gatewayId
-
- 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 == 1:
- if ftype == TType.STRUCT:
- self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
- self.authzToken.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRING:
- self.userName = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRING:
- self.gatewayId = 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('getUserProfileByName_args')
- if self.authzToken is not None:
- oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
- self.authzToken.write(oprot)
- oprot.writeFieldEnd()
- if self.userName is not None:
- oprot.writeFieldBegin('userName', TType.STRING, 2)
- oprot.writeString(self.userName)
- oprot.writeFieldEnd()
- if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 3)
- oprot.writeString(self.gatewayId)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- if self.authzToken is None:
- raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.userName is None:
- raise TProtocol.TProtocolException(message='Required field userName is unset!')
- if self.gatewayId is None:
- raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.userName)
- value = (value * 31) ^ hash(self.gatewayId)
- 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 getUserProfileByName_result:
- """
- Attributes:
- - success
- - ire
- - ace
- - ase
- - ae
- """
-
- thrift_spec = (
- (0, TType.STRUCT, 'success', (apache.airavata.model.user.ttypes.UserProfile, apache.airavata.model.user.ttypes.UserProfile.thrift_spec), None, ), # 0
- (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
- (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
- (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
- )
-
- def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
- self.success = success
- self.ire = ire
- self.ace = ace
- self.ase = ase
- self.ae = ae
-
- def read(self, iprot):
- if iprot.__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 == 0:
- if ftype == TType.STRUCT:
- self.success = apache.airavata.model.user.ttypes.UserProfile()
- self.success.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 1:
- if ftype == TType.STRUCT:
- self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
- self.ace.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
- self.ase.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.STRUCT:
- self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
- self.ae.read(iprot)
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot.__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('getUserProfileByName_result')
- if self.success is not None:
- oprot.writeFieldBegin('success', TType.STRUCT, 0)
- self.success.write(oprot)
- oprot.writeFieldEnd()
- if self.ire is not None:
- oprot.writeFieldBegin('ire', TType.STRUCT, 1)
- self.ire.write(oprot)
- oprot.writeFieldEnd()
- if self.ace is not None:
- oprot.writeFieldBegin('ace', TType.STRUCT, 2)
- self.ace.write(oprot)
- oprot.writeFieldEnd()
- if self.ase is not None:
- oprot.writeFieldBegin('ase', TType.STRUCT, 3)
- self.ase.write(oprot)
- oprot.writeFieldEnd()
- if self.ae is not None:
- oprot.writeFieldBegin('ae', TType.STRUCT, 4)
- self.ae.write(oprot)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.success)
- value = (value * 31) ^ hash(self.ire)
- value = (value * 31) ^ hash(self.ace)
- value = (value * 31) ^ hash(self.ase)
- value = (value * 31) ^ hash(self.ae)
- 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 doesUserProfileExist_args:
"""
Attributes:
- authzToken
- - userName
+ - userId
- gatewayId
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'userName', None, None, ), # 2
+ (2, TType.STRING, 'userId', None, None, ), # 2
(3, TType.STRING, 'gatewayId', None, None, ), # 3
)
- def __init__(self, authzToken=None, userName=None, gatewayId=None,):
+ def __init__(self, authzToken=None, userId=None, gatewayId=None,):
self.authzToken = authzToken
- self.userName = userName
+ self.userId = userId
self.gatewayId = gatewayId
def read(self, iprot):
@@ -56796,7 +56493,7 @@ class doesUserProfileExist_args:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.userName = iprot.readString()
+ self.userId = iprot.readString()
else:
iprot.skip(ftype)
elif fid == 3:
@@ -56818,9 +56515,9 @@ class doesUserProfileExist_args:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.userName is not None:
- oprot.writeFieldBegin('userName', TType.STRING, 2)
- oprot.writeString(self.userName)
+ if self.userId is not None:
+ oprot.writeFieldBegin('userId', TType.STRING, 2)
+ oprot.writeString(self.userId)
oprot.writeFieldEnd()
if self.gatewayId is not None:
oprot.writeFieldBegin('gatewayId', TType.STRING, 3)
@@ -56832,8 +56529,8 @@ class doesUserProfileExist_args:
def validate(self):
if self.authzToken is None:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.userName is None:
- raise TProtocol.TProtocolException(message='Required field userName is unset!')
+ if self.userId is None:
+ raise TProtocol.TProtocolException(message='Required field userId is unset!')
if self.gatewayId is None:
raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
return
@@ -56842,7 +56539,7 @@ class doesUserProfileExist_args:
def __hash__(self):
value = 17
value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.userName)
+ value = (value * 31) ^ hash(self.userId)
value = (value * 31) ^ hash(self.gatewayId)
return value
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appdeployment/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appdeployment/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appdeployment/ttypes.py
index 12dfca0..fd2e305 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appdeployment/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appdeployment/ttypes.py
@@ -379,6 +379,7 @@ class ApplicationDeploymentDescription:
- defaultQueueName
- defaultNodeCount
- defaultCPUCount
+ - defaultWalltime
- editableByUser
"""
@@ -399,10 +400,11 @@ class ApplicationDeploymentDescription:
(13, TType.STRING, 'defaultQueueName', None, None, ), # 13
(14, TType.I32, 'defaultNodeCount', None, None, ), # 14
(15, TType.I32, 'defaultCPUCount', None, None, ), # 15
- (16, TType.BOOL, 'editableByUser', None, None, ), # 16
+ (16, TType.I32, 'defaultWalltime', None, None, ), # 16
+ (17, TType.BOOL, 'editableByUser', None, None, ), # 17
)
- def __init__(self, appDeploymentId=thrift_spec[1][4], appModuleId=None, computeHostId=None, executablePath=None, parallelism=thrift_spec[5][4], appDeploymentDescription=None, moduleLoadCmds=None, libPrependPaths=None, libAppendPaths=None, setEnvironment=None, preJobCommands=None, postJobCommands=None, defaultQueueName=None, defaultNodeCount=None, defaultCPUCount=None, editableByUser=None,):
+ def __init__(self, appDeploymentId=thrift_spec[1][4], appModuleId=None, computeHostId=None, executablePath=None, parallelism=thrift_spec[5][4], appDeploymentDescription=None, moduleLoadCmds=None, libPrependPaths=None, libAppendPaths=None, setEnvironment=None, preJobCommands=None, postJobCommands=None, defaultQueueName=None, defaultNodeCount=None, defaultCPUCount=None, defaultWalltime=None, editableByUser=None,):
self.appDeploymentId = appDeploymentId
self.appModuleId = appModuleId
self.computeHostId = computeHostId
@@ -418,6 +420,7 @@ class ApplicationDeploymentDescription:
self.defaultQueueName = defaultQueueName
self.defaultNodeCount = defaultNodeCount
self.defaultCPUCount = defaultCPUCount
+ self.defaultWalltime = defaultWalltime
self.editableByUser = editableByUser
def read(self, iprot):
@@ -541,6 +544,11 @@ class ApplicationDeploymentDescription:
else:
iprot.skip(ftype)
elif fid == 16:
+ if ftype == TType.I32:
+ self.defaultWalltime = iprot.readI32()
+ else:
+ iprot.skip(ftype)
+ elif fid == 17:
if ftype == TType.BOOL:
self.editableByUser = iprot.readBool()
else:
@@ -633,8 +641,12 @@ class ApplicationDeploymentDescription:
oprot.writeFieldBegin('defaultCPUCount', TType.I32, 15)
oprot.writeI32(self.defaultCPUCount)
oprot.writeFieldEnd()
+ if self.defaultWalltime is not None:
+ oprot.writeFieldBegin('defaultWalltime', TType.I32, 16)
+ oprot.writeI32(self.defaultWalltime)
+ oprot.writeFieldEnd()
if self.editableByUser is not None:
- oprot.writeFieldBegin('editableByUser', TType.BOOL, 16)
+ oprot.writeFieldBegin('editableByUser', TType.BOOL, 17)
oprot.writeBool(self.editableByUser)
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -671,6 +683,7 @@ class ApplicationDeploymentDescription:
value = (value * 31) ^ hash(self.defaultQueueName)
value = (value * 31) ^ hash(self.defaultNodeCount)
value = (value * 31) ^ hash(self.defaultCPUCount)
+ value = (value * 31) ^ hash(self.defaultWalltime)
value = (value * 31) ^ hash(self.editableByUser)
return value
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/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 dfc0cca..b2fcc2e 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
@@ -1431,6 +1431,10 @@ class ComputeResourceDescription:
- gatewayUsageReporting
- gatewayUsageModuleLoadCommand
- gatewayUsageExecutable
+ - cpusPerNode
+ - defaultNodeCount
+ - defaultCPUCount
+ - defaultWallltime
"""
thrift_spec = (
@@ -1449,9 +1453,13 @@ class ComputeResourceDescription:
(12, TType.BOOL, 'gatewayUsageReporting', None, None, ), # 12
(13, TType.STRING, 'gatewayUsageModuleLoadCommand', None, None, ), # 13
(14, TType.STRING, 'gatewayUsageExecutable', None, None, ), # 14
+ (15, TType.I32, 'cpusPerNode', None, None, ), # 15
+ (16, TType.I32, 'defaultNodeCount', None, None, ), # 16
+ (17, TType.I32, 'defaultCPUCount', None, None, ), # 17
+ (18, TType.I32, 'defaultWallltime', None, None, ), # 18
)
- def __init__(self, computeResourceId=thrift_spec[1][4], hostName=None, hostAliases=None, ipAddresses=None, resourceDescription=None, enabled=None, batchQueues=None, fileSystems=None, jobSubmissionInterfaces=None, dataMovementInterfaces=None, maxMemoryPerNode=None, gatewayUsageReporting=None, gatewayUsageModuleLoadCommand=None, gatewayUsageExecutable=None,):
+ def __init__(self, computeResourceId=thrift_spec[1][4], hostName=None, hostAliases=None, ipAddresses=None, resourceDescription=None, enabled=None, batchQueues=None, fileSystems=None, jobSubmissionInterfaces=None, dataMovementInterfaces=None, maxMemoryPerNode=None, gatewayUsageReporting=None, gatewayUsageModuleLoadCommand=None, gatewayUsageExecutable=None, cpusPerNode=None, defaultNodeCount=None, defaultCPUCount=None, defaultWallltime=None,):
self.computeResourceId = computeResourceId
self.hostName = hostName
self.hostAliases = hostAliases
@@ -1466,6 +1474,10 @@ class ComputeResourceDescription:
self.gatewayUsageReporting = gatewayUsageReporting
self.gatewayUsageModuleLoadCommand = gatewayUsageModuleLoadCommand
self.gatewayUsageExecutable = gatewayUsageExecutable
+ self.cpusPerNode = cpusPerNode
+ self.defaultNodeCount = defaultNodeCount
+ self.defaultCPUCount = defaultCPUCount
+ self.defaultWallltime = defaultWallltime
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:
@@ -1580,6 +1592,26 @@ class ComputeResourceDescription:
self.gatewayUsageExecutable = iprot.readString()
else:
iprot.skip(ftype)
+ elif fid == 15:
+ if ftype == TType.I32:
+ self.cpusPerNode = iprot.readI32()
+ else:
+ iprot.skip(ftype)
+ elif fid == 16:
+ if ftype == TType.I32:
+ self.defaultNodeCount = iprot.readI32()
+ else:
+ iprot.skip(ftype)
+ elif fid == 17:
+ if ftype == TType.I32:
+ self.defaultCPUCount = iprot.readI32()
+ else:
+ iprot.skip(ftype)
+ elif fid == 18:
+ if ftype == TType.I32:
+ self.defaultWallltime = iprot.readI32()
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -1665,6 +1697,22 @@ class ComputeResourceDescription:
oprot.writeFieldBegin('gatewayUsageExecutable', TType.STRING, 14)
oprot.writeString(self.gatewayUsageExecutable)
oprot.writeFieldEnd()
+ if self.cpusPerNode is not None:
+ oprot.writeFieldBegin('cpusPerNode', TType.I32, 15)
+ oprot.writeI32(self.cpusPerNode)
+ oprot.writeFieldEnd()
+ if self.defaultNodeCount is not None:
+ oprot.writeFieldBegin('defaultNodeCount', TType.I32, 16)
+ oprot.writeI32(self.defaultNodeCount)
+ oprot.writeFieldEnd()
+ if self.defaultCPUCount is not None:
+ oprot.writeFieldBegin('defaultCPUCount', TType.I32, 17)
+ oprot.writeI32(self.defaultCPUCount)
+ oprot.writeFieldEnd()
+ if self.defaultWallltime is not None:
+ oprot.writeFieldBegin('defaultWallltime', TType.I32, 18)
+ oprot.writeI32(self.defaultWallltime)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -1692,6 +1740,10 @@ class ComputeResourceDescription:
value = (value * 31) ^ hash(self.gatewayUsageReporting)
value = (value * 31) ^ hash(self.gatewayUsageModuleLoadCommand)
value = (value * 31) ^ hash(self.gatewayUsageExecutable)
+ value = (value * 31) ^ hash(self.cpusPerNode)
+ value = (value * 31) ^ hash(self.defaultNodeCount)
+ value = (value * 31) ^ hash(self.defaultCPUCount)
+ value = (value * 31) ^ hash(self.defaultWallltime)
return value
def __repr__(self):
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
index 4dc61ae..14b8baa 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/user/ttypes.py
@@ -397,7 +397,6 @@ class UserProfile:
- middleName
- namePrefix
- nameSuffix
- - userName
- orcidId
- phones
- country
@@ -427,25 +426,24 @@ class UserProfile:
(8, TType.STRING, 'middleName', None, None, ), # 8
(9, TType.STRING, 'namePrefix', None, None, ), # 9
(10, TType.STRING, 'nameSuffix', None, None, ), # 10
- (11, TType.STRING, 'userName', None, None, ), # 11
- (12, TType.STRING, 'orcidId', None, None, ), # 12
- (13, TType.LIST, 'phones', (TType.STRING,None), None, ), # 13
- (14, TType.STRING, 'country', None, None, ), # 14
- (15, TType.LIST, 'nationality', (TType.STRING,None), None, ), # 15
- (16, TType.STRING, 'homeOrganization', None, None, ), # 16
- (17, TType.STRING, 'orginationAffiliation', None, None, ), # 17
- (18, TType.I64, 'creationTime', None, None, ), # 18
- (19, TType.I64, 'lastAccessTime', None, None, ), # 19
- (20, TType.I64, 'validUntil', None, None, ), # 20
- (21, TType.I32, 'State', None, None, ), # 21
- (22, TType.STRING, 'comments', None, None, ), # 22
- (23, TType.LIST, 'labeledURI', (TType.STRING,None), None, ), # 23
- (24, TType.STRING, 'gpgKey', None, None, ), # 24
- (25, TType.STRING, 'timeZone', None, None, ), # 25
- (26, TType.STRUCT, 'nsfDemographics', (NSFDemographics, NSFDemographics.thrift_spec), None, ), # 26
+ (11, TType.STRING, 'orcidId', None, None, ), # 11
+ (12, TType.LIST, 'phones', (TType.STRING,None), None, ), # 12
+ (13, TType.STRING, 'country', None, None, ), # 13
+ (14, TType.LIST, 'nationality', (TType.STRING,None), None, ), # 14
+ (15, TType.STRING, 'homeOrganization', None, None, ), # 15
+ (16, TType.STRING, 'orginationAffiliation', None, None, ), # 16
+ (17, TType.I64, 'creationTime', None, None, ), # 17
+ (18, TType.I64, 'lastAccessTime', None, None, ), # 18
+ (19, TType.I64, 'validUntil', None, None, ), # 19
+ (20, TType.I32, 'State', None, None, ), # 20
+ (21, TType.STRING, 'comments', None, None, ), # 21
+ (22, TType.LIST, 'labeledURI', (TType.STRING,None), None, ), # 22
+ (23, TType.STRING, 'gpgKey', None, None, ), # 23
+ (24, TType.STRING, 'timeZone', None, None, ), # 24
+ (25, TType.STRUCT, 'nsfDemographics', (NSFDemographics, NSFDemographics.thrift_spec), None, ), # 25
)
- def __init__(self, userModelVersion=thrift_spec[1][4], airavataInternalUserId=thrift_spec[2][4], userId=None, gatewayId=None, emails=None, firstName=None, lastName=None, middleName=None, namePrefix=None, nameSuffix=None, userName=None, orcidId=None, phones=None, country=None, nationality=None, homeOrganization=None, orginationAffiliation=None, creationTime=None, lastAccessTime=None, validUntil=None, State=None, comments=None, labeledURI=None, gpgKey=None, timeZone=None, nsfDemographics=None,):
+ def __init__(self, userModelVersion=thrift_spec[1][4], airavataInternalUserId=thrift_spec[2][4], userId=None, gatewayId=None, emails=None, firstName=None, lastName=None, middleName=None, namePrefix=None, nameSuffix=None, orcidId=None, phones=None, country=None, nationality=None, homeOrganization=None, orginationAffiliation=None, creationTime=None, lastAccessTime=None, validUntil=None, State=None, comments=None, labeledURI=None, gpgKey=None, timeZone=None, nsfDemographics=None,):
self.userModelVersion = userModelVersion
self.airavataInternalUserId = airavataInternalUserId
self.userId = userId
@@ -456,7 +454,6 @@ class UserProfile:
self.middleName = middleName
self.namePrefix = namePrefix
self.nameSuffix = nameSuffix
- self.userName = userName
self.orcidId = orcidId
self.phones = phones
self.country = country
@@ -539,15 +536,10 @@ class UserProfile:
iprot.skip(ftype)
elif fid == 11:
if ftype == TType.STRING:
- self.userName = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 12:
- if ftype == TType.STRING:
self.orcidId = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 13:
+ elif fid == 12:
if ftype == TType.LIST:
self.phones = []
(_etype30, _size27) = iprot.readListBegin()
@@ -557,12 +549,12 @@ class UserProfile:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 14:
+ elif fid == 13:
if ftype == TType.STRING:
self.country = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 15:
+ elif fid == 14:
if ftype == TType.LIST:
self.nationality = []
(_etype36, _size33) = iprot.readListBegin()
@@ -572,42 +564,42 @@ class UserProfile:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 16:
+ elif fid == 15:
if ftype == TType.STRING:
self.homeOrganization = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 17:
+ elif fid == 16:
if ftype == TType.STRING:
self.orginationAffiliation = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 18:
+ elif fid == 17:
if ftype == TType.I64:
self.creationTime = iprot.readI64()
else:
iprot.skip(ftype)
- elif fid == 19:
+ elif fid == 18:
if ftype == TType.I64:
self.lastAccessTime = iprot.readI64()
else:
iprot.skip(ftype)
- elif fid == 20:
+ elif fid == 19:
if ftype == TType.I64:
self.validUntil = iprot.readI64()
else:
iprot.skip(ftype)
- elif fid == 21:
+ elif fid == 20:
if ftype == TType.I32:
self.State = iprot.readI32()
else:
iprot.skip(ftype)
- elif fid == 22:
+ elif fid == 21:
if ftype == TType.STRING:
self.comments = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 23:
+ elif fid == 22:
if ftype == TType.LIST:
self.labeledURI = []
(_etype42, _size39) = iprot.readListBegin()
@@ -617,17 +609,17 @@ class UserProfile:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 24:
+ elif fid == 23:
if ftype == TType.STRING:
self.gpgKey = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 25:
+ elif fid == 24:
if ftype == TType.STRING:
self.timeZone = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 26:
+ elif fid == 25:
if ftype == TType.STRUCT:
self.nsfDemographics = NSFDemographics()
self.nsfDemographics.read(iprot)
@@ -686,77 +678,73 @@ class UserProfile:
oprot.writeFieldBegin('nameSuffix', TType.STRING, 10)
oprot.writeString(self.nameSuffix)
oprot.writeFieldEnd()
- if self.userName is not None:
- oprot.writeFieldBegin('userName', TType.STRING, 11)
- oprot.writeString(self.userName)
- oprot.writeFieldEnd()
if self.orcidId is not None:
- oprot.writeFieldBegin('orcidId', TType.STRING, 12)
+ oprot.writeFieldBegin('orcidId', TType.STRING, 11)
oprot.writeString(self.orcidId)
oprot.writeFieldEnd()
if self.phones is not None:
- oprot.writeFieldBegin('phones', TType.LIST, 13)
+ oprot.writeFieldBegin('phones', TType.LIST, 12)
oprot.writeListBegin(TType.STRING, len(self.phones))
for iter46 in self.phones:
oprot.writeString(iter46)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.country is not None:
- oprot.writeFieldBegin('country', TType.STRING, 14)
+ oprot.writeFieldBegin('country', TType.STRING, 13)
oprot.writeString(self.country)
oprot.writeFieldEnd()
if self.nationality is not None:
- oprot.writeFieldBegin('nationality', TType.LIST, 15)
+ oprot.writeFieldBegin('nationality', TType.LIST, 14)
oprot.writeListBegin(TType.STRING, len(self.nationality))
for iter47 in self.nationality:
oprot.writeString(iter47)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.homeOrganization is not None:
- oprot.writeFieldBegin('homeOrganization', TType.STRING, 16)
+ oprot.writeFieldBegin('homeOrganization', TType.STRING, 15)
oprot.writeString(self.homeOrganization)
oprot.writeFieldEnd()
if self.orginationAffiliation is not None:
- oprot.writeFieldBegin('orginationAffiliation', TType.STRING, 17)
+ oprot.writeFieldBegin('orginationAffiliation', TType.STRING, 16)
oprot.writeString(self.orginationAffiliation)
oprot.writeFieldEnd()
if self.creationTime is not None:
- oprot.writeFieldBegin('creationTime', TType.I64, 18)
+ oprot.writeFieldBegin('creationTime', TType.I64, 17)
oprot.writeI64(self.creationTime)
oprot.writeFieldEnd()
if self.lastAccessTime is not None:
- oprot.writeFieldBegin('lastAccessTime', TType.I64, 19)
+ oprot.writeFieldBegin('lastAccessTime', TType.I64, 18)
oprot.writeI64(self.lastAccessTime)
oprot.writeFieldEnd()
if self.validUntil is not None:
- oprot.writeFieldBegin('validUntil', TType.I64, 20)
+ oprot.writeFieldBegin('validUntil', TType.I64, 19)
oprot.writeI64(self.validUntil)
oprot.writeFieldEnd()
if self.State is not None:
- oprot.writeFieldBegin('State', TType.I32, 21)
+ oprot.writeFieldBegin('State', TType.I32, 20)
oprot.writeI32(self.State)
oprot.writeFieldEnd()
if self.comments is not None:
- oprot.writeFieldBegin('comments', TType.STRING, 22)
+ oprot.writeFieldBegin('comments', TType.STRING, 21)
oprot.writeString(self.comments)
oprot.writeFieldEnd()
if self.labeledURI is not None:
- oprot.writeFieldBegin('labeledURI', TType.LIST, 23)
+ oprot.writeFieldBegin('labeledURI', TType.LIST, 22)
oprot.writeListBegin(TType.STRING, len(self.labeledURI))
for iter48 in self.labeledURI:
oprot.writeString(iter48)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.gpgKey is not None:
- oprot.writeFieldBegin('gpgKey', TType.STRING, 24)
+ oprot.writeFieldBegin('gpgKey', TType.STRING, 23)
oprot.writeString(self.gpgKey)
oprot.writeFieldEnd()
if self.timeZone is not None:
- oprot.writeFieldBegin('timeZone', TType.STRING, 25)
+ oprot.writeFieldBegin('timeZone', TType.STRING, 24)
oprot.writeString(self.timeZone)
oprot.writeFieldEnd()
if self.nsfDemographics is not None:
- oprot.writeFieldBegin('nsfDemographics', TType.STRUCT, 26)
+ oprot.writeFieldBegin('nsfDemographics', TType.STRUCT, 25)
self.nsfDemographics.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -800,7 +788,6 @@ class UserProfile:
value = (value * 31) ^ hash(self.middleName)
value = (value * 31) ^ hash(self.namePrefix)
value = (value * 31) ^ hash(self.nameSuffix)
- value = (value * 31) ^ hash(self.userName)
value = (value * 31) ^ hash(self.orcidId)
value = (value * 31) ^ hash(self.phones)
value = (value * 31) ^ hash(self.country)
[3/3] airavata git commit: making database level changes for
supporting custom node/cpu/walltime configurations
Posted by sc...@apache.org.
making database level changes for supporting custom node/cpu/walltime configurations
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/56bc4bee
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/56bc4bee
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/56bc4bee
Branch: refs/heads/develop
Commit: 56bc4bee230fb3ba84d26d8965190c5ecfe1c66f
Parents: 58ea1bf
Author: scnakandala <su...@gmail.com>
Authored: Mon May 15 01:31:44 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Mon May 15 01:31:44 2017 -0400
----------------------------------------------------------------------
.../main/resources/lib/airavata/Airavata.cpp | 582 +------------------
.../src/main/resources/lib/airavata/Airavata.h | 192 +-----
.../lib/airavata/Airavata_server.skeleton.cpp | 7 +-
.../application_deployment_model_types.cpp | 24 +-
.../application_deployment_model_types.h | 12 +-
.../airavata/compute_resource_model_types.cpp | 88 +++
.../lib/airavata/compute_resource_model_types.h | 36 +-
.../lib/airavata/user_profile_model_types.cpp | 80 +--
.../lib/airavata/user_profile_model_types.h | 12 +-
.../resources/lib/Airavata/API/Airavata.php | 466 +--------------
.../Model/AppCatalog/AppDeployment/Types.php | 25 +-
.../Model/AppCatalog/ComputeResource/Types.php | 92 +++
.../resources/lib/Airavata/Model/User/Types.php | 109 ++--
.../src/main/resources/lib/Types.php | 13 +
.../lib/apache/airavata/api/Airavata-remote | 9 +-
.../lib/apache/airavata/api/Airavata.py | 341 +----------
.../model/appcatalog/appdeployment/ttypes.py | 19 +-
.../model/appcatalog/computeresource/ttypes.py | 54 +-
.../lib/apache/airavata/model/user/ttypes.py | 103 ++--
.../ApplicationDeploymentDescription.java | 117 +++-
.../ComputeResourceDescription.java | 404 ++++++++++++-
.../catalog/model/ApplicationDeployment.java | 10 +
.../core/app/catalog/model/ComputeResource.java | 44 ++
.../resources/AppDeploymentResource.java | 11 +
.../resources/ComputeResourceResource.java | 42 +-
.../src/main/resources/appcatalog-derby.sql | 5 +
.../src/main/resources/appcatalog-mysql.sql | 5 +
.../application_deployment_model.thrift | 3 +-
.../compute_resource_model.thrift | 6 +-
29 files changed, 1169 insertions(+), 1742 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
index 9e1f1da..32c0d51 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
@@ -54404,314 +54404,6 @@ uint32_t Airavata_getAllUserProfilesInGateway_presult::read(::apache::thrift::pr
}
-Airavata_getUserProfileByName_args::~Airavata_getUserProfileByName_args() throw() {
-}
-
-
-uint32_t Airavata_getUserProfileByName_args::read(::apache::thrift::protocol::TProtocol* iprot) {
-
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
-
- xfer += iprot->readStructBegin(fname);
-
- using ::apache::thrift::protocol::TProtocolException;
-
- bool isset_authzToken = false;
- bool isset_userName = false;
- bool isset_gatewayId = false;
-
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->authzToken.read(iprot);
- isset_authzToken = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->userName);
- isset_userName = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->gatewayId);
- isset_gatewayId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- if (!isset_authzToken)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_userName)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_gatewayId)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- return xfer;
-}
-
-uint32_t Airavata_getUserProfileByName_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
- uint32_t xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_getUserProfileByName_args");
-
- xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += this->authzToken.write(oprot);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2);
- xfer += oprot->writeString(this->userName);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString(this->gatewayId);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
-}
-
-
-Airavata_getUserProfileByName_pargs::~Airavata_getUserProfileByName_pargs() throw() {
-}
-
-
-uint32_t Airavata_getUserProfileByName_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
- uint32_t xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_getUserProfileByName_pargs");
-
- xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += (*(this->authzToken)).write(oprot);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2);
- xfer += oprot->writeString((*(this->userName)));
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString((*(this->gatewayId)));
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
-}
-
-
-Airavata_getUserProfileByName_result::~Airavata_getUserProfileByName_result() throw() {
-}
-
-
-uint32_t Airavata_getUserProfileByName_result::read(::apache::thrift::protocol::TProtocol* iprot) {
-
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
-
- xfer += iprot->readStructBegin(fname);
-
- using ::apache::thrift::protocol::TProtocolException;
-
-
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 0:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->success.read(iprot);
- this->__isset.success = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ire.read(iprot);
- this->__isset.ire = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ace.read(iprot);
- this->__isset.ace = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ase.read(iprot);
- this->__isset.ase = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ae.read(iprot);
- this->__isset.ae = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- return xfer;
-}
-
-uint32_t Airavata_getUserProfileByName_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
-
- uint32_t xfer = 0;
-
- xfer += oprot->writeStructBegin("Airavata_getUserProfileByName_result");
-
- if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
- xfer += this->success.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ire) {
- xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += this->ire.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ace) {
- xfer += oprot->writeFieldBegin("ace", ::apache::thrift::protocol::T_STRUCT, 2);
- xfer += this->ace.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ase) {
- xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 3);
- xfer += this->ase.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ae) {
- xfer += oprot->writeFieldBegin("ae", ::apache::thrift::protocol::T_STRUCT, 4);
- xfer += this->ae.write(oprot);
- xfer += oprot->writeFieldEnd();
- }
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
-}
-
-
-Airavata_getUserProfileByName_presult::~Airavata_getUserProfileByName_presult() throw() {
-}
-
-
-uint32_t Airavata_getUserProfileByName_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
-
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
-
- xfer += iprot->readStructBegin(fname);
-
- using ::apache::thrift::protocol::TProtocolException;
-
-
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 0:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += (*(this->success)).read(iprot);
- this->__isset.success = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ire.read(iprot);
- this->__isset.ire = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ace.read(iprot);
- this->__isset.ace = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ase.read(iprot);
- this->__isset.ase = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ae.read(iprot);
- this->__isset.ae = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- return xfer;
-}
-
-
Airavata_doesUserProfileExist_args::~Airavata_doesUserProfileExist_args() throw() {
}
@@ -54729,7 +54421,7 @@ uint32_t Airavata_doesUserProfileExist_args::read(::apache::thrift::protocol::TP
using ::apache::thrift::protocol::TProtocolException;
bool isset_authzToken = false;
- bool isset_userName = false;
+ bool isset_userId = false;
bool isset_gatewayId = false;
while (true)
@@ -54750,8 +54442,8 @@ uint32_t Airavata_doesUserProfileExist_args::read(::apache::thrift::protocol::TP
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->userName);
- isset_userName = true;
+ xfer += iprot->readString(this->userId);
+ isset_userId = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -54775,7 +54467,7 @@ uint32_t Airavata_doesUserProfileExist_args::read(::apache::thrift::protocol::TP
if (!isset_authzToken)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_userName)
+ if (!isset_userId)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_gatewayId)
throw TProtocolException(TProtocolException::INVALID_DATA);
@@ -54791,8 +54483,8 @@ uint32_t Airavata_doesUserProfileExist_args::write(::apache::thrift::protocol::T
xfer += this->authzToken.write(oprot);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2);
- xfer += oprot->writeString(this->userName);
+ xfer += oprot->writeFieldBegin("userId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString(this->userId);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3);
@@ -54818,8 +54510,8 @@ uint32_t Airavata_doesUserProfileExist_pargs::write(::apache::thrift::protocol::
xfer += (*(this->authzToken)).write(oprot);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 2);
- xfer += oprot->writeString((*(this->userName)));
+ xfer += oprot->writeFieldBegin("userId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString((*(this->userId)));
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3);
@@ -67491,92 +67183,20 @@ void AiravataClient::recv_getAllUserProfilesInGateway(std::vector< ::apache::air
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAllUserProfilesInGateway failed: unknown result");
}
-void AiravataClient::getUserProfileByName( ::apache::airavata::model::user::UserProfile& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId)
-{
- send_getUserProfileByName(authzToken, userName, gatewayId);
- recv_getUserProfileByName(_return);
-}
-
-void AiravataClient::send_getUserProfileByName(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId)
-{
- int32_t cseqid = 0;
- oprot_->writeMessageBegin("getUserProfileByName", ::apache::thrift::protocol::T_CALL, cseqid);
-
- Airavata_getUserProfileByName_pargs args;
- args.authzToken = &authzToken;
- args.userName = &userName;
- args.gatewayId = &gatewayId;
- args.write(oprot_);
-
- oprot_->writeMessageEnd();
- oprot_->getTransport()->writeEnd();
- oprot_->getTransport()->flush();
-}
-
-void AiravataClient::recv_getUserProfileByName( ::apache::airavata::model::user::UserProfile& _return)
+bool AiravataClient::doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId)
{
-
- int32_t rseqid = 0;
- std::string fname;
- ::apache::thrift::protocol::TMessageType mtype;
-
- iprot_->readMessageBegin(fname, mtype, rseqid);
- if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
- ::apache::thrift::TApplicationException x;
- x.read(iprot_);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- throw x;
- }
- if (mtype != ::apache::thrift::protocol::T_REPLY) {
- iprot_->skip(::apache::thrift::protocol::T_STRUCT);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- }
- if (fname.compare("getUserProfileByName") != 0) {
- iprot_->skip(::apache::thrift::protocol::T_STRUCT);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- }
- Airavata_getUserProfileByName_presult result;
- result.success = &_return;
- result.read(iprot_);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
-
- if (result.__isset.success) {
- // _return pointer has now been filled
- return;
- }
- if (result.__isset.ire) {
- throw result.ire;
- }
- if (result.__isset.ace) {
- throw result.ace;
- }
- if (result.__isset.ase) {
- throw result.ase;
- }
- if (result.__isset.ae) {
- throw result.ae;
- }
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getUserProfileByName failed: unknown result");
-}
-
-bool AiravataClient::doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId)
-{
- send_doesUserProfileExist(authzToken, userName, gatewayId);
+ send_doesUserProfileExist(authzToken, userId, gatewayId);
return recv_doesUserProfileExist();
}
-void AiravataClient::send_doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId)
+void AiravataClient::send_doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId)
{
int32_t cseqid = 0;
oprot_->writeMessageBegin("doesUserProfileExist", ::apache::thrift::protocol::T_CALL, cseqid);
Airavata_doesUserProfileExist_pargs args;
args.authzToken = &authzToken;
- args.userName = &userName;
+ args.userId = &userId;
args.gatewayId = &gatewayId;
args.write(oprot_);
@@ -79145,72 +78765,6 @@ void AiravataProcessor::process_getAllUserProfilesInGateway(int32_t seqid, ::apa
}
}
-void AiravataProcessor::process_getUserProfileByName(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
-{
- void* ctx = NULL;
- if (this->eventHandler_.get() != NULL) {
- ctx = this->eventHandler_->getContext("Airavata.getUserProfileByName", callContext);
- }
- ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "Airavata.getUserProfileByName");
-
- if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->preRead(ctx, "Airavata.getUserProfileByName");
- }
-
- Airavata_getUserProfileByName_args args;
- args.read(iprot);
- iprot->readMessageEnd();
- uint32_t bytes = iprot->getTransport()->readEnd();
-
- if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->postRead(ctx, "Airavata.getUserProfileByName", bytes);
- }
-
- Airavata_getUserProfileByName_result result;
- try {
- iface_->getUserProfileByName(result.success, args.authzToken, args.userName, args.gatewayId);
- result.__isset.success = true;
- } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
- result.ire = ire;
- result.__isset.ire = true;
- } catch ( ::apache::airavata::api::error::AiravataClientException &ace) {
- result.ace = ace;
- result.__isset.ace = true;
- } catch ( ::apache::airavata::api::error::AiravataSystemException &ase) {
- result.ase = ase;
- result.__isset.ase = true;
- } catch ( ::apache::airavata::api::error::AuthorizationException &ae) {
- result.ae = ae;
- result.__isset.ae = true;
- } catch (const std::exception& e) {
- if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->handlerError(ctx, "Airavata.getUserProfileByName");
- }
-
- ::apache::thrift::TApplicationException x(e.what());
- oprot->writeMessageBegin("getUserProfileByName", ::apache::thrift::protocol::T_EXCEPTION, seqid);
- x.write(oprot);
- oprot->writeMessageEnd();
- oprot->getTransport()->writeEnd();
- oprot->getTransport()->flush();
- return;
- }
-
- if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->preWrite(ctx, "Airavata.getUserProfileByName");
- }
-
- oprot->writeMessageBegin("getUserProfileByName", ::apache::thrift::protocol::T_REPLY, seqid);
- result.write(oprot);
- oprot->writeMessageEnd();
- bytes = oprot->getTransport()->writeEnd();
- oprot->getTransport()->flush();
-
- if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->postWrite(ctx, "Airavata.getUserProfileByName", bytes);
- }
-}
-
void AiravataProcessor::process_doesUserProfileExist(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
{
void* ctx = NULL;
@@ -79234,7 +78788,7 @@ void AiravataProcessor::process_doesUserProfileExist(int32_t seqid, ::apache::th
Airavata_doesUserProfileExist_result result;
try {
- result.success = iface_->doesUserProfileExist(args.authzToken, args.userName, args.gatewayId);
+ result.success = iface_->doesUserProfileExist(args.authzToken, args.userId, args.gatewayId);
result.__isset.success = true;
} catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
result.ire = ire;
@@ -96973,115 +96527,13 @@ void AiravataConcurrentClient::recv_getAllUserProfilesInGateway(std::vector< ::a
} // end while(true)
}
-void AiravataConcurrentClient::getUserProfileByName( ::apache::airavata::model::user::UserProfile& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId)
-{
- int32_t seqid = send_getUserProfileByName(authzToken, userName, gatewayId);
- recv_getUserProfileByName(_return, seqid);
-}
-
-int32_t AiravataConcurrentClient::send_getUserProfileByName(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId)
-{
- int32_t cseqid = this->sync_.generateSeqId();
- ::apache::thrift::async::TConcurrentSendSentry sentry(&this->sync_);
- oprot_->writeMessageBegin("getUserProfileByName", ::apache::thrift::protocol::T_CALL, cseqid);
-
- Airavata_getUserProfileByName_pargs args;
- args.authzToken = &authzToken;
- args.userName = &userName;
- args.gatewayId = &gatewayId;
- args.write(oprot_);
-
- oprot_->writeMessageEnd();
- oprot_->getTransport()->writeEnd();
- oprot_->getTransport()->flush();
-
- sentry.commit();
- return cseqid;
-}
-
-void AiravataConcurrentClient::recv_getUserProfileByName( ::apache::airavata::model::user::UserProfile& _return, const int32_t seqid)
-{
-
- int32_t rseqid = 0;
- std::string fname;
- ::apache::thrift::protocol::TMessageType mtype;
-
- // the read mutex gets dropped and reacquired as part of waitForWork()
- // The destructor of this sentry wakes up other clients
- ::apache::thrift::async::TConcurrentRecvSentry sentry(&this->sync_, seqid);
-
- while(true) {
- if(!this->sync_.getPending(fname, mtype, rseqid)) {
- iprot_->readMessageBegin(fname, mtype, rseqid);
- }
- if(seqid == rseqid) {
- if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
- ::apache::thrift::TApplicationException x;
- x.read(iprot_);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- sentry.commit();
- throw x;
- }
- if (mtype != ::apache::thrift::protocol::T_REPLY) {
- iprot_->skip(::apache::thrift::protocol::T_STRUCT);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- }
- if (fname.compare("getUserProfileByName") != 0) {
- iprot_->skip(::apache::thrift::protocol::T_STRUCT);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
-
- // in a bad state, don't commit
- using ::apache::thrift::protocol::TProtocolException;
- throw TProtocolException(TProtocolException::INVALID_DATA);
- }
- Airavata_getUserProfileByName_presult result;
- result.success = &_return;
- result.read(iprot_);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
-
- if (result.__isset.success) {
- // _return pointer has now been filled
- sentry.commit();
- return;
- }
- if (result.__isset.ire) {
- sentry.commit();
- throw result.ire;
- }
- if (result.__isset.ace) {
- sentry.commit();
- throw result.ace;
- }
- if (result.__isset.ase) {
- sentry.commit();
- throw result.ase;
- }
- if (result.__isset.ae) {
- sentry.commit();
- throw result.ae;
- }
- // in a bad state, don't commit
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getUserProfileByName failed: unknown result");
- }
- // seqid != rseqid
- this->sync_.updatePending(fname, mtype, rseqid);
-
- // this will temporarily unlock the readMutex, and let other clients get work done
- this->sync_.waitForWork(seqid);
- } // end while(true)
-}
-
-bool AiravataConcurrentClient::doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId)
+bool AiravataConcurrentClient::doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId)
{
- int32_t seqid = send_doesUserProfileExist(authzToken, userName, gatewayId);
+ int32_t seqid = send_doesUserProfileExist(authzToken, userId, gatewayId);
return recv_doesUserProfileExist(seqid);
}
-int32_t AiravataConcurrentClient::send_doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId)
+int32_t AiravataConcurrentClient::send_doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId)
{
int32_t cseqid = this->sync_.generateSeqId();
::apache::thrift::async::TConcurrentSendSentry sentry(&this->sync_);
@@ -97089,7 +96541,7 @@ int32_t AiravataConcurrentClient::send_doesUserProfileExist(const ::apache::air
Airavata_doesUserProfileExist_pargs args;
args.authzToken = &authzToken;
- args.userName = &userName;
+ args.userId = &userId;
args.gatewayId = &gatewayId;
args.write(oprot_);
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
index 1e19e96..7357df3 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
@@ -2978,8 +2978,7 @@ class AiravataIf {
virtual void getUserProfileById( ::apache::airavata::model::user::UserProfile& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId) = 0;
virtual bool deleteUserProfile(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId) = 0;
virtual void getAllUserProfilesInGateway(std::vector< ::apache::airavata::model::user::UserProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const int32_t offset, const int32_t limit) = 0;
- virtual void getUserProfileByName( ::apache::airavata::model::user::UserProfile& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) = 0;
- virtual bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) = 0;
+ virtual bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId) = 0;
};
class AiravataIfFactory {
@@ -3593,10 +3592,7 @@ class AiravataNull : virtual public AiravataIf {
void getAllUserProfilesInGateway(std::vector< ::apache::airavata::model::user::UserProfile> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const int32_t /* offset */, const int32_t /* limit */) {
return;
}
- void getUserProfileByName( ::apache::airavata::model::user::UserProfile& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* userName */, const std::string& /* gatewayId */) {
- return;
- }
- bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* userName */, const std::string& /* gatewayId */) {
+ bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* userId */, const std::string& /* gatewayId */) {
bool _return = false;
return _return;
}
@@ -28171,164 +28167,22 @@ class Airavata_getAllUserProfilesInGateway_presult {
};
-class Airavata_getUserProfileByName_args {
- public:
-
- Airavata_getUserProfileByName_args(const Airavata_getUserProfileByName_args&);
- Airavata_getUserProfileByName_args& operator=(const Airavata_getUserProfileByName_args&);
- Airavata_getUserProfileByName_args() : userName(), gatewayId() {
- }
-
- virtual ~Airavata_getUserProfileByName_args() throw();
- ::apache::airavata::model::security::AuthzToken authzToken;
- std::string userName;
- std::string gatewayId;
-
- void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
-
- void __set_userName(const std::string& val);
-
- void __set_gatewayId(const std::string& val);
-
- bool operator == (const Airavata_getUserProfileByName_args & rhs) const
- {
- if (!(authzToken == rhs.authzToken))
- return false;
- if (!(userName == rhs.userName))
- return false;
- if (!(gatewayId == rhs.gatewayId))
- return false;
- return true;
- }
- bool operator != (const Airavata_getUserProfileByName_args &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_getUserProfileByName_args & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-
-class Airavata_getUserProfileByName_pargs {
- public:
-
-
- virtual ~Airavata_getUserProfileByName_pargs() throw();
- const ::apache::airavata::model::security::AuthzToken* authzToken;
- const std::string* userName;
- const std::string* gatewayId;
-
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-typedef struct _Airavata_getUserProfileByName_result__isset {
- _Airavata_getUserProfileByName_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
- bool success :1;
- bool ire :1;
- bool ace :1;
- bool ase :1;
- bool ae :1;
-} _Airavata_getUserProfileByName_result__isset;
-
-class Airavata_getUserProfileByName_result {
- public:
-
- Airavata_getUserProfileByName_result(const Airavata_getUserProfileByName_result&);
- Airavata_getUserProfileByName_result& operator=(const Airavata_getUserProfileByName_result&);
- Airavata_getUserProfileByName_result() {
- }
-
- virtual ~Airavata_getUserProfileByName_result() throw();
- ::apache::airavata::model::user::UserProfile success;
- ::apache::airavata::api::error::InvalidRequestException ire;
- ::apache::airavata::api::error::AiravataClientException ace;
- ::apache::airavata::api::error::AiravataSystemException ase;
- ::apache::airavata::api::error::AuthorizationException ae;
-
- _Airavata_getUserProfileByName_result__isset __isset;
-
- void __set_success(const ::apache::airavata::model::user::UserProfile& val);
-
- void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
-
- void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val);
-
- void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val);
-
- void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
-
- bool operator == (const Airavata_getUserProfileByName_result & rhs) const
- {
- if (!(success == rhs.success))
- return false;
- if (!(ire == rhs.ire))
- return false;
- if (!(ace == rhs.ace))
- return false;
- if (!(ase == rhs.ase))
- return false;
- if (!(ae == rhs.ae))
- return false;
- return true;
- }
- bool operator != (const Airavata_getUserProfileByName_result &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_getUserProfileByName_result & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-typedef struct _Airavata_getUserProfileByName_presult__isset {
- _Airavata_getUserProfileByName_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
- bool success :1;
- bool ire :1;
- bool ace :1;
- bool ase :1;
- bool ae :1;
-} _Airavata_getUserProfileByName_presult__isset;
-
-class Airavata_getUserProfileByName_presult {
- public:
-
-
- virtual ~Airavata_getUserProfileByName_presult() throw();
- ::apache::airavata::model::user::UserProfile* success;
- ::apache::airavata::api::error::InvalidRequestException ire;
- ::apache::airavata::api::error::AiravataClientException ace;
- ::apache::airavata::api::error::AiravataSystemException ase;
- ::apache::airavata::api::error::AuthorizationException ae;
-
- _Airavata_getUserProfileByName_presult__isset __isset;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-
-};
-
-
class Airavata_doesUserProfileExist_args {
public:
Airavata_doesUserProfileExist_args(const Airavata_doesUserProfileExist_args&);
Airavata_doesUserProfileExist_args& operator=(const Airavata_doesUserProfileExist_args&);
- Airavata_doesUserProfileExist_args() : userName(), gatewayId() {
+ Airavata_doesUserProfileExist_args() : userId(), gatewayId() {
}
virtual ~Airavata_doesUserProfileExist_args() throw();
::apache::airavata::model::security::AuthzToken authzToken;
- std::string userName;
+ std::string userId;
std::string gatewayId;
void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
- void __set_userName(const std::string& val);
+ void __set_userId(const std::string& val);
void __set_gatewayId(const std::string& val);
@@ -28336,7 +28190,7 @@ class Airavata_doesUserProfileExist_args {
{
if (!(authzToken == rhs.authzToken))
return false;
- if (!(userName == rhs.userName))
+ if (!(userId == rhs.userId))
return false;
if (!(gatewayId == rhs.gatewayId))
return false;
@@ -28360,7 +28214,7 @@ class Airavata_doesUserProfileExist_pargs {
virtual ~Airavata_doesUserProfileExist_pargs() throw();
const ::apache::airavata::model::security::AuthzToken* authzToken;
- const std::string* userName;
+ const std::string* userId;
const std::string* gatewayId;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -29001,11 +28855,8 @@ class AiravataClient : virtual public AiravataIf {
void getAllUserProfilesInGateway(std::vector< ::apache::airavata::model::user::UserProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const int32_t offset, const int32_t limit);
void send_getAllUserProfilesInGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const int32_t offset, const int32_t limit);
void recv_getAllUserProfilesInGateway(std::vector< ::apache::airavata::model::user::UserProfile> & _return);
- void getUserProfileByName( ::apache::airavata::model::user::UserProfile& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId);
- void send_getUserProfileByName(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId);
- void recv_getUserProfileByName( ::apache::airavata::model::user::UserProfile& _return);
- bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId);
- void send_doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId);
+ bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId);
+ void send_doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId);
bool recv_doesUserProfileExist();
protected:
boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
@@ -29196,7 +29047,6 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
void process_getUserProfileById(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_deleteUserProfile(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getAllUserProfilesInGateway(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
- void process_getUserProfileByName(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_doesUserProfileExist(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
public:
AiravataProcessor(boost::shared_ptr<AiravataIf> iface) :
@@ -29375,7 +29225,6 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
processMap_["getUserProfileById"] = &AiravataProcessor::process_getUserProfileById;
processMap_["deleteUserProfile"] = &AiravataProcessor::process_deleteUserProfile;
processMap_["getAllUserProfilesInGateway"] = &AiravataProcessor::process_getAllUserProfilesInGateway;
- processMap_["getUserProfileByName"] = &AiravataProcessor::process_getUserProfileByName;
processMap_["doesUserProfileExist"] = &AiravataProcessor::process_doesUserProfileExist;
}
@@ -31075,23 +30924,13 @@ class AiravataMultiface : virtual public AiravataIf {
return;
}
- void getUserProfileByName( ::apache::airavata::model::user::UserProfile& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) {
- size_t sz = ifaces_.size();
- size_t i = 0;
- for (; i < (sz - 1); ++i) {
- ifaces_[i]->getUserProfileByName(_return, authzToken, userName, gatewayId);
- }
- ifaces_[i]->getUserProfileByName(_return, authzToken, userName, gatewayId);
- return;
- }
-
- bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) {
+ bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
- ifaces_[i]->doesUserProfileExist(authzToken, userName, gatewayId);
+ ifaces_[i]->doesUserProfileExist(authzToken, userId, gatewayId);
}
- return ifaces_[i]->doesUserProfileExist(authzToken, userName, gatewayId);
+ return ifaces_[i]->doesUserProfileExist(authzToken, userId, gatewayId);
}
};
@@ -31646,11 +31485,8 @@ class AiravataConcurrentClient : virtual public AiravataIf {
void getAllUserProfilesInGateway(std::vector< ::apache::airavata::model::user::UserProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const int32_t offset, const int32_t limit);
int32_t send_getAllUserProfilesInGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const int32_t offset, const int32_t limit);
void recv_getAllUserProfilesInGateway(std::vector< ::apache::airavata::model::user::UserProfile> & _return, const int32_t seqid);
- void getUserProfileByName( ::apache::airavata::model::user::UserProfile& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId);
- int32_t send_getUserProfileByName(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId);
- void recv_getUserProfileByName( ::apache::airavata::model::user::UserProfile& _return, const int32_t seqid);
- bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId);
- int32_t send_doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId);
+ bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId);
+ int32_t send_doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId);
bool recv_doesUserProfileExist(const int32_t seqid);
protected:
boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
index 4c913bb..d0321c7 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
@@ -3536,12 +3536,7 @@ class AiravataHandler : virtual public AiravataIf {
printf("getAllUserProfilesInGateway\n");
}
- void getUserProfileByName( ::apache::airavata::model::user::UserProfile& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) {
- // Your implementation goes here
- printf("getUserProfileByName\n");
- }
-
- bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) {
+ bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId) {
// Your implementation goes here
printf("doesUserProfileExist\n");
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.cpp
index 52598ef..852a9d0 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.cpp
@@ -506,6 +506,11 @@ void ApplicationDeploymentDescription::__set_defaultCPUCount(const int32_t val)
__isset.defaultCPUCount = true;
}
+void ApplicationDeploymentDescription::__set_defaultWalltime(const int32_t val) {
+ this->defaultWalltime = val;
+__isset.defaultWalltime = true;
+}
+
void ApplicationDeploymentDescription::__set_editableByUser(const bool val) {
this->editableByUser = val;
__isset.editableByUser = true;
@@ -732,6 +737,14 @@ uint32_t ApplicationDeploymentDescription::read(::apache::thrift::protocol::TPro
}
break;
case 16:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ xfer += iprot->readI32(this->defaultWalltime);
+ this->__isset.defaultWalltime = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 17:
if (ftype == ::apache::thrift::protocol::T_BOOL) {
xfer += iprot->readBool(this->editableByUser);
this->__isset.editableByUser = true;
@@ -884,8 +897,13 @@ uint32_t ApplicationDeploymentDescription::write(::apache::thrift::protocol::TPr
xfer += oprot->writeI32(this->defaultCPUCount);
xfer += oprot->writeFieldEnd();
}
+ if (this->__isset.defaultWalltime) {
+ xfer += oprot->writeFieldBegin("defaultWalltime", ::apache::thrift::protocol::T_I32, 16);
+ xfer += oprot->writeI32(this->defaultWalltime);
+ xfer += oprot->writeFieldEnd();
+ }
if (this->__isset.editableByUser) {
- xfer += oprot->writeFieldBegin("editableByUser", ::apache::thrift::protocol::T_BOOL, 16);
+ xfer += oprot->writeFieldBegin("editableByUser", ::apache::thrift::protocol::T_BOOL, 17);
xfer += oprot->writeBool(this->editableByUser);
xfer += oprot->writeFieldEnd();
}
@@ -911,6 +929,7 @@ void swap(ApplicationDeploymentDescription &a, ApplicationDeploymentDescription
swap(a.defaultQueueName, b.defaultQueueName);
swap(a.defaultNodeCount, b.defaultNodeCount);
swap(a.defaultCPUCount, b.defaultCPUCount);
+ swap(a.defaultWalltime, b.defaultWalltime);
swap(a.editableByUser, b.editableByUser);
swap(a.__isset, b.__isset);
}
@@ -931,6 +950,7 @@ ApplicationDeploymentDescription::ApplicationDeploymentDescription(const Applica
defaultQueueName = other43.defaultQueueName;
defaultNodeCount = other43.defaultNodeCount;
defaultCPUCount = other43.defaultCPUCount;
+ defaultWalltime = other43.defaultWalltime;
editableByUser = other43.editableByUser;
__isset = other43.__isset;
}
@@ -950,6 +970,7 @@ ApplicationDeploymentDescription& ApplicationDeploymentDescription::operator=(co
defaultQueueName = other44.defaultQueueName;
defaultNodeCount = other44.defaultNodeCount;
defaultCPUCount = other44.defaultCPUCount;
+ defaultWalltime = other44.defaultWalltime;
editableByUser = other44.editableByUser;
__isset = other44.__isset;
return *this;
@@ -972,6 +993,7 @@ void ApplicationDeploymentDescription::printTo(std::ostream& out) const {
out << ", " << "defaultQueueName="; (__isset.defaultQueueName ? (out << to_string(defaultQueueName)) : (out << "<null>"));
out << ", " << "defaultNodeCount="; (__isset.defaultNodeCount ? (out << to_string(defaultNodeCount)) : (out << "<null>"));
out << ", " << "defaultCPUCount="; (__isset.defaultCPUCount ? (out << to_string(defaultCPUCount)) : (out << "<null>"));
+ out << ", " << "defaultWalltime="; (__isset.defaultWalltime ? (out << to_string(defaultWalltime)) : (out << "<null>"));
out << ", " << "editableByUser="; (__isset.editableByUser ? (out << to_string(editableByUser)) : (out << "<null>"));
out << ")";
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.h
index 42599df..c2875bd 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.h
@@ -224,7 +224,7 @@ inline std::ostream& operator<<(std::ostream& out, const ApplicationModule& obj)
}
typedef struct _ApplicationDeploymentDescription__isset {
- _ApplicationDeploymentDescription__isset() : appDeploymentDescription(false), moduleLoadCmds(false), libPrependPaths(false), libAppendPaths(false), setEnvironment(false), preJobCommands(false), postJobCommands(false), defaultQueueName(false), defaultNodeCount(false), defaultCPUCount(false), editableByUser(false) {}
+ _ApplicationDeploymentDescription__isset() : appDeploymentDescription(false), moduleLoadCmds(false), libPrependPaths(false), libAppendPaths(false), setEnvironment(false), preJobCommands(false), postJobCommands(false), defaultQueueName(false), defaultNodeCount(false), defaultCPUCount(false), defaultWalltime(false), editableByUser(false) {}
bool appDeploymentDescription :1;
bool moduleLoadCmds :1;
bool libPrependPaths :1;
@@ -235,6 +235,7 @@ typedef struct _ApplicationDeploymentDescription__isset {
bool defaultQueueName :1;
bool defaultNodeCount :1;
bool defaultCPUCount :1;
+ bool defaultWalltime :1;
bool editableByUser :1;
} _ApplicationDeploymentDescription__isset;
@@ -243,7 +244,7 @@ class ApplicationDeploymentDescription {
ApplicationDeploymentDescription(const ApplicationDeploymentDescription&);
ApplicationDeploymentDescription& operator=(const ApplicationDeploymentDescription&);
- ApplicationDeploymentDescription() : appDeploymentId("DO_NOT_SET_AT_CLIENTS"), appModuleId(), computeHostId(), executablePath(), parallelism(( ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type)0), appDeploymentDescription(), defaultQueueName(), defaultNodeCount(0), defaultCPUCount(0), editableByUser(0) {
+ ApplicationDeploymentDescription() : appDeploymentId("DO_NOT_SET_AT_CLIENTS"), appModuleId(), computeHostId(), executablePath(), parallelism(( ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type)0), appDeploymentDescription(), defaultQueueName(), defaultNodeCount(0), defaultCPUCount(0), defaultWalltime(0), editableByUser(0) {
parallelism = ( ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type)0;
}
@@ -264,6 +265,7 @@ class ApplicationDeploymentDescription {
std::string defaultQueueName;
int32_t defaultNodeCount;
int32_t defaultCPUCount;
+ int32_t defaultWalltime;
bool editableByUser;
_ApplicationDeploymentDescription__isset __isset;
@@ -298,6 +300,8 @@ class ApplicationDeploymentDescription {
void __set_defaultCPUCount(const int32_t val);
+ void __set_defaultWalltime(const int32_t val);
+
void __set_editableByUser(const bool val);
bool operator == (const ApplicationDeploymentDescription & rhs) const
@@ -352,6 +356,10 @@ class ApplicationDeploymentDescription {
return false;
else if (__isset.defaultCPUCount && !(defaultCPUCount == rhs.defaultCPUCount))
return false;
+ if (__isset.defaultWalltime != rhs.__isset.defaultWalltime)
+ return false;
+ else if (__isset.defaultWalltime && !(defaultWalltime == rhs.defaultWalltime))
+ return false;
if (__isset.editableByUser != rhs.__isset.editableByUser)
return false;
else if (__isset.editableByUser && !(editableByUser == rhs.editableByUser))
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp
index 1f6cb42..7921ef3 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp
@@ -1792,6 +1792,26 @@ void ComputeResourceDescription::__set_gatewayUsageExecutable(const std::string&
__isset.gatewayUsageExecutable = true;
}
+void ComputeResourceDescription::__set_cpusPerNode(const int32_t val) {
+ this->cpusPerNode = val;
+__isset.cpusPerNode = true;
+}
+
+void ComputeResourceDescription::__set_defaultNodeCount(const int32_t val) {
+ this->defaultNodeCount = val;
+__isset.defaultNodeCount = true;
+}
+
+void ComputeResourceDescription::__set_defaultCPUCount(const int32_t val) {
+ this->defaultCPUCount = val;
+__isset.defaultCPUCount = true;
+}
+
+void ComputeResourceDescription::__set_defaultWallltime(const int32_t val) {
+ this->defaultWallltime = val;
+__isset.defaultWallltime = true;
+}
+
uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
@@ -2004,6 +2024,38 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
xfer += iprot->skip(ftype);
}
break;
+ case 15:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ xfer += iprot->readI32(this->cpusPerNode);
+ this->__isset.cpusPerNode = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 16:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ xfer += iprot->readI32(this->defaultNodeCount);
+ this->__isset.defaultNodeCount = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 17:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ xfer += iprot->readI32(this->defaultCPUCount);
+ this->__isset.defaultCPUCount = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 18:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ xfer += iprot->readI32(this->defaultWallltime);
+ this->__isset.defaultWallltime = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -2142,6 +2194,26 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeString(this->gatewayUsageExecutable);
xfer += oprot->writeFieldEnd();
}
+ if (this->__isset.cpusPerNode) {
+ xfer += oprot->writeFieldBegin("cpusPerNode", ::apache::thrift::protocol::T_I32, 15);
+ xfer += oprot->writeI32(this->cpusPerNode);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.defaultNodeCount) {
+ xfer += oprot->writeFieldBegin("defaultNodeCount", ::apache::thrift::protocol::T_I32, 16);
+ xfer += oprot->writeI32(this->defaultNodeCount);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.defaultCPUCount) {
+ xfer += oprot->writeFieldBegin("defaultCPUCount", ::apache::thrift::protocol::T_I32, 17);
+ xfer += oprot->writeI32(this->defaultCPUCount);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.defaultWallltime) {
+ xfer += oprot->writeFieldBegin("defaultWallltime", ::apache::thrift::protocol::T_I32, 18);
+ xfer += oprot->writeI32(this->defaultWallltime);
+ xfer += oprot->writeFieldEnd();
+ }
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -2163,6 +2235,10 @@ void swap(ComputeResourceDescription &a, ComputeResourceDescription &b) {
swap(a.gatewayUsageReporting, b.gatewayUsageReporting);
swap(a.gatewayUsageModuleLoadCommand, b.gatewayUsageModuleLoadCommand);
swap(a.gatewayUsageExecutable, b.gatewayUsageExecutable);
+ swap(a.cpusPerNode, b.cpusPerNode);
+ swap(a.defaultNodeCount, b.defaultNodeCount);
+ swap(a.defaultCPUCount, b.defaultCPUCount);
+ swap(a.defaultWallltime, b.defaultWallltime);
swap(a.__isset, b.__isset);
}
@@ -2181,6 +2257,10 @@ ComputeResourceDescription::ComputeResourceDescription(const ComputeResourceDesc
gatewayUsageReporting = other94.gatewayUsageReporting;
gatewayUsageModuleLoadCommand = other94.gatewayUsageModuleLoadCommand;
gatewayUsageExecutable = other94.gatewayUsageExecutable;
+ cpusPerNode = other94.cpusPerNode;
+ defaultNodeCount = other94.defaultNodeCount;
+ defaultCPUCount = other94.defaultCPUCount;
+ defaultWallltime = other94.defaultWallltime;
__isset = other94.__isset;
}
ComputeResourceDescription& ComputeResourceDescription::operator=(const ComputeResourceDescription& other95) {
@@ -2198,6 +2278,10 @@ ComputeResourceDescription& ComputeResourceDescription::operator=(const ComputeR
gatewayUsageReporting = other95.gatewayUsageReporting;
gatewayUsageModuleLoadCommand = other95.gatewayUsageModuleLoadCommand;
gatewayUsageExecutable = other95.gatewayUsageExecutable;
+ cpusPerNode = other95.cpusPerNode;
+ defaultNodeCount = other95.defaultNodeCount;
+ defaultCPUCount = other95.defaultCPUCount;
+ defaultWallltime = other95.defaultWallltime;
__isset = other95.__isset;
return *this;
}
@@ -2218,6 +2302,10 @@ void ComputeResourceDescription::printTo(std::ostream& out) const {
out << ", " << "gatewayUsageReporting="; (__isset.gatewayUsageReporting ? (out << to_string(gatewayUsageReporting)) : (out << "<null>"));
out << ", " << "gatewayUsageModuleLoadCommand="; (__isset.gatewayUsageModuleLoadCommand ? (out << to_string(gatewayUsageModuleLoadCommand)) : (out << "<null>"));
out << ", " << "gatewayUsageExecutable="; (__isset.gatewayUsageExecutable ? (out << to_string(gatewayUsageExecutable)) : (out << "<null>"));
+ out << ", " << "cpusPerNode="; (__isset.cpusPerNode ? (out << to_string(cpusPerNode)) : (out << "<null>"));
+ out << ", " << "defaultNodeCount="; (__isset.defaultNodeCount ? (out << to_string(defaultNodeCount)) : (out << "<null>"));
+ out << ", " << "defaultCPUCount="; (__isset.defaultCPUCount ? (out << to_string(defaultCPUCount)) : (out << "<null>"));
+ out << ", " << "defaultWallltime="; (__isset.defaultWallltime ? (out << to_string(defaultWallltime)) : (out << "<null>"));
out << ")";
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h
index d611b52..997c2cb 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h
@@ -711,7 +711,7 @@ inline std::ostream& operator<<(std::ostream& out, const JobSubmissionInterface&
}
typedef struct _ComputeResourceDescription__isset {
- _ComputeResourceDescription__isset() : hostAliases(false), ipAddresses(false), resourceDescription(false), enabled(false), batchQueues(false), fileSystems(false), jobSubmissionInterfaces(false), dataMovementInterfaces(false), maxMemoryPerNode(false), gatewayUsageReporting(false), gatewayUsageModuleLoadCommand(false), gatewayUsageExecutable(false) {}
+ _ComputeResourceDescription__isset() : hostAliases(false), ipAddresses(false), resourceDescription(false), enabled(false), batchQueues(false), fileSystems(false), jobSubmissionInterfaces(false), dataMovementInterfaces(false), maxMemoryPerNode(false), gatewayUsageReporting(false), gatewayUsageModuleLoadCommand(false), gatewayUsageExecutable(false), cpusPerNode(false), defaultNodeCount(false), defaultCPUCount(false), defaultWallltime(false) {}
bool hostAliases :1;
bool ipAddresses :1;
bool resourceDescription :1;
@@ -724,6 +724,10 @@ typedef struct _ComputeResourceDescription__isset {
bool gatewayUsageReporting :1;
bool gatewayUsageModuleLoadCommand :1;
bool gatewayUsageExecutable :1;
+ bool cpusPerNode :1;
+ bool defaultNodeCount :1;
+ bool defaultCPUCount :1;
+ bool defaultWallltime :1;
} _ComputeResourceDescription__isset;
class ComputeResourceDescription {
@@ -731,7 +735,7 @@ class ComputeResourceDescription {
ComputeResourceDescription(const ComputeResourceDescription&);
ComputeResourceDescription& operator=(const ComputeResourceDescription&);
- ComputeResourceDescription() : computeResourceId("DO_NOT_SET_AT_CLIENTS"), hostName(), resourceDescription(), enabled(0), maxMemoryPerNode(0), gatewayUsageReporting(0), gatewayUsageModuleLoadCommand(), gatewayUsageExecutable() {
+ ComputeResourceDescription() : computeResourceId("DO_NOT_SET_AT_CLIENTS"), hostName(), resourceDescription(), enabled(0), maxMemoryPerNode(0), gatewayUsageReporting(0), gatewayUsageModuleLoadCommand(), gatewayUsageExecutable(), cpusPerNode(0), defaultNodeCount(0), defaultCPUCount(0), defaultWallltime(0) {
}
virtual ~ComputeResourceDescription() throw();
@@ -749,6 +753,10 @@ class ComputeResourceDescription {
bool gatewayUsageReporting;
std::string gatewayUsageModuleLoadCommand;
std::string gatewayUsageExecutable;
+ int32_t cpusPerNode;
+ int32_t defaultNodeCount;
+ int32_t defaultCPUCount;
+ int32_t defaultWallltime;
_ComputeResourceDescription__isset __isset;
@@ -780,6 +788,14 @@ class ComputeResourceDescription {
void __set_gatewayUsageExecutable(const std::string& val);
+ void __set_cpusPerNode(const int32_t val);
+
+ void __set_defaultNodeCount(const int32_t val);
+
+ void __set_defaultCPUCount(const int32_t val);
+
+ void __set_defaultWallltime(const int32_t val);
+
bool operator == (const ComputeResourceDescription & rhs) const
{
if (!(computeResourceId == rhs.computeResourceId))
@@ -834,6 +850,22 @@ class ComputeResourceDescription {
return false;
else if (__isset.gatewayUsageExecutable && !(gatewayUsageExecutable == rhs.gatewayUsageExecutable))
return false;
+ if (__isset.cpusPerNode != rhs.__isset.cpusPerNode)
+ return false;
+ else if (__isset.cpusPerNode && !(cpusPerNode == rhs.cpusPerNode))
+ return false;
+ if (__isset.defaultNodeCount != rhs.__isset.defaultNodeCount)
+ return false;
+ else if (__isset.defaultNodeCount && !(defaultNodeCount == rhs.defaultNodeCount))
+ return false;
+ if (__isset.defaultCPUCount != rhs.__isset.defaultCPUCount)
+ return false;
+ else if (__isset.defaultCPUCount && !(defaultCPUCount == rhs.defaultCPUCount))
+ return false;
+ if (__isset.defaultWallltime != rhs.__isset.defaultWallltime)
+ return false;
+ else if (__isset.defaultWallltime && !(defaultWallltime == rhs.defaultWallltime))
+ return false;
return true;
}
bool operator != (const ComputeResourceDescription &rhs) const {
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp
index a7b968a..a3870cd 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.cpp
@@ -431,11 +431,6 @@ void UserProfile::__set_nameSuffix(const std::string& val) {
__isset.nameSuffix = true;
}
-void UserProfile::__set_userName(const std::string& val) {
- this->userName = val;
-__isset.userName = true;
-}
-
void UserProfile::__set_orcidId(const std::string& val) {
this->orcidId = val;
__isset.orcidId = true;
@@ -633,21 +628,13 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
break;
case 11:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->userName);
- this->__isset.userName = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 12:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->orcidId);
this->__isset.orcidId = true;
} else {
xfer += iprot->skip(ftype);
}
break;
- case 13:
+ case 12:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->phones.clear();
@@ -667,7 +654,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 14:
+ case 13:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->country);
this->__isset.country = true;
@@ -675,7 +662,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 15:
+ case 14:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->nationality.clear();
@@ -695,7 +682,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 16:
+ case 15:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->homeOrganization);
this->__isset.homeOrganization = true;
@@ -703,7 +690,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 17:
+ case 16:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->orginationAffiliation);
this->__isset.orginationAffiliation = true;
@@ -711,7 +698,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 18:
+ case 17:
if (ftype == ::apache::thrift::protocol::T_I64) {
xfer += iprot->readI64(this->creationTime);
isset_creationTime = true;
@@ -719,7 +706,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 19:
+ case 18:
if (ftype == ::apache::thrift::protocol::T_I64) {
xfer += iprot->readI64(this->lastAccessTime);
isset_lastAccessTime = true;
@@ -727,7 +714,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 20:
+ case 19:
if (ftype == ::apache::thrift::protocol::T_I64) {
xfer += iprot->readI64(this->validUntil);
isset_validUntil = true;
@@ -735,7 +722,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 21:
+ case 20:
if (ftype == ::apache::thrift::protocol::T_I32) {
int32_t ecast39;
xfer += iprot->readI32(ecast39);
@@ -745,7 +732,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 22:
+ case 21:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->comments);
this->__isset.comments = true;
@@ -753,7 +740,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 23:
+ case 22:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->labeledURI.clear();
@@ -773,7 +760,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 24:
+ case 23:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->gpgKey);
this->__isset.gpgKey = true;
@@ -781,7 +768,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 25:
+ case 24:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->timeZone);
this->__isset.timeZone = true;
@@ -789,7 +776,7 @@ uint32_t UserProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 26:
+ case 25:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->nsfDemographics.read(iprot);
this->__isset.nsfDemographics = true;
@@ -887,18 +874,13 @@ uint32_t UserProfile::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeString(this->nameSuffix);
xfer += oprot->writeFieldEnd();
}
- if (this->__isset.userName) {
- xfer += oprot->writeFieldBegin("userName", ::apache::thrift::protocol::T_STRING, 11);
- xfer += oprot->writeString(this->userName);
- xfer += oprot->writeFieldEnd();
- }
if (this->__isset.orcidId) {
- xfer += oprot->writeFieldBegin("orcidId", ::apache::thrift::protocol::T_STRING, 12);
+ xfer += oprot->writeFieldBegin("orcidId", ::apache::thrift::protocol::T_STRING, 11);
xfer += oprot->writeString(this->orcidId);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.phones) {
- xfer += oprot->writeFieldBegin("phones", ::apache::thrift::protocol::T_LIST, 13);
+ xfer += oprot->writeFieldBegin("phones", ::apache::thrift::protocol::T_LIST, 12);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->phones.size()));
std::vector<std::string> ::const_iterator _iter46;
@@ -911,12 +893,12 @@ uint32_t UserProfile::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeFieldEnd();
}
if (this->__isset.country) {
- xfer += oprot->writeFieldBegin("country", ::apache::thrift::protocol::T_STRING, 14);
+ xfer += oprot->writeFieldBegin("country", ::apache::thrift::protocol::T_STRING, 13);
xfer += oprot->writeString(this->country);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.nationality) {
- xfer += oprot->writeFieldBegin("nationality", ::apache::thrift::protocol::T_LIST, 15);
+ xfer += oprot->writeFieldBegin("nationality", ::apache::thrift::protocol::T_LIST, 14);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->nationality.size()));
std::vector<std::string> ::const_iterator _iter47;
@@ -929,38 +911,38 @@ uint32_t UserProfile::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeFieldEnd();
}
if (this->__isset.homeOrganization) {
- xfer += oprot->writeFieldBegin("homeOrganization", ::apache::thrift::protocol::T_STRING, 16);
+ xfer += oprot->writeFieldBegin("homeOrganization", ::apache::thrift::protocol::T_STRING, 15);
xfer += oprot->writeString(this->homeOrganization);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.orginationAffiliation) {
- xfer += oprot->writeFieldBegin("orginationAffiliation", ::apache::thrift::protocol::T_STRING, 17);
+ xfer += oprot->writeFieldBegin("orginationAffiliation", ::apache::thrift::protocol::T_STRING, 16);
xfer += oprot->writeString(this->orginationAffiliation);
xfer += oprot->writeFieldEnd();
}
- xfer += oprot->writeFieldBegin("creationTime", ::apache::thrift::protocol::T_I64, 18);
+ xfer += oprot->writeFieldBegin("creationTime", ::apache::thrift::protocol::T_I64, 17);
xfer += oprot->writeI64(this->creationTime);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("lastAccessTime", ::apache::thrift::protocol::T_I64, 19);
+ xfer += oprot->writeFieldBegin("lastAccessTime", ::apache::thrift::protocol::T_I64, 18);
xfer += oprot->writeI64(this->lastAccessTime);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("validUntil", ::apache::thrift::protocol::T_I64, 20);
+ xfer += oprot->writeFieldBegin("validUntil", ::apache::thrift::protocol::T_I64, 19);
xfer += oprot->writeI64(this->validUntil);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("State", ::apache::thrift::protocol::T_I32, 21);
+ xfer += oprot->writeFieldBegin("State", ::apache::thrift::protocol::T_I32, 20);
xfer += oprot->writeI32((int32_t)this->State);
xfer += oprot->writeFieldEnd();
if (this->__isset.comments) {
- xfer += oprot->writeFieldBegin("comments", ::apache::thrift::protocol::T_STRING, 22);
+ xfer += oprot->writeFieldBegin("comments", ::apache::thrift::protocol::T_STRING, 21);
xfer += oprot->writeString(this->comments);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.labeledURI) {
- xfer += oprot->writeFieldBegin("labeledURI", ::apache::thrift::protocol::T_LIST, 23);
+ xfer += oprot->writeFieldBegin("labeledURI", ::apache::thrift::protocol::T_LIST, 22);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->labeledURI.size()));
std::vector<std::string> ::const_iterator _iter48;
@@ -973,17 +955,17 @@ uint32_t UserProfile::write(::apache::thrift::protocol::TProtocol* oprot) const
xfer += oprot->writeFieldEnd();
}
if (this->__isset.gpgKey) {
- xfer += oprot->writeFieldBegin("gpgKey", ::apache::thrift::protocol::T_STRING, 24);
+ xfer += oprot->writeFieldBegin("gpgKey", ::apache::thrift::protocol::T_STRING, 23);
xfer += oprot->writeString(this->gpgKey);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.timeZone) {
- xfer += oprot->writeFieldBegin("timeZone", ::apache::thrift::protocol::T_STRING, 25);
+ xfer += oprot->writeFieldBegin("timeZone", ::apache::thrift::protocol::T_STRING, 24);
xfer += oprot->writeString(this->timeZone);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.nsfDemographics) {
- xfer += oprot->writeFieldBegin("nsfDemographics", ::apache::thrift::protocol::T_STRUCT, 26);
+ xfer += oprot->writeFieldBegin("nsfDemographics", ::apache::thrift::protocol::T_STRUCT, 25);
xfer += this->nsfDemographics.write(oprot);
xfer += oprot->writeFieldEnd();
}
@@ -1004,7 +986,6 @@ void swap(UserProfile &a, UserProfile &b) {
swap(a.middleName, b.middleName);
swap(a.namePrefix, b.namePrefix);
swap(a.nameSuffix, b.nameSuffix);
- swap(a.userName, b.userName);
swap(a.orcidId, b.orcidId);
swap(a.phones, b.phones);
swap(a.country, b.country);
@@ -1034,7 +1015,6 @@ UserProfile::UserProfile(const UserProfile& other49) {
middleName = other49.middleName;
namePrefix = other49.namePrefix;
nameSuffix = other49.nameSuffix;
- userName = other49.userName;
orcidId = other49.orcidId;
phones = other49.phones;
country = other49.country;
@@ -1063,7 +1043,6 @@ UserProfile& UserProfile::operator=(const UserProfile& other50) {
middleName = other50.middleName;
namePrefix = other50.namePrefix;
nameSuffix = other50.nameSuffix;
- userName = other50.userName;
orcidId = other50.orcidId;
phones = other50.phones;
country = other50.country;
@@ -1095,7 +1074,6 @@ void UserProfile::printTo(std::ostream& out) const {
out << ", " << "middleName="; (__isset.middleName ? (out << to_string(middleName)) : (out << "<null>"));
out << ", " << "namePrefix="; (__isset.namePrefix ? (out << to_string(namePrefix)) : (out << "<null>"));
out << ", " << "nameSuffix="; (__isset.nameSuffix ? (out << to_string(nameSuffix)) : (out << "<null>"));
- out << ", " << "userName="; (__isset.userName ? (out << to_string(userName)) : (out << "<null>"));
out << ", " << "orcidId="; (__isset.orcidId ? (out << to_string(orcidId)) : (out << "<null>"));
out << ", " << "phones="; (__isset.phones ? (out << to_string(phones)) : (out << "<null>"));
out << ", " << "country="; (__isset.country ? (out << to_string(country)) : (out << "<null>"));
http://git-wip-us.apache.org/repos/asf/airavata/blob/56bc4bee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h
index 1d5b3be..8f9181b 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/user_profile_model_types.h
@@ -190,11 +190,10 @@ inline std::ostream& operator<<(std::ostream& out, const NSFDemographics& obj)
}
typedef struct _UserProfile__isset {
- _UserProfile__isset() : middleName(false), namePrefix(false), nameSuffix(false), userName(false), orcidId(false), phones(false), country(false), nationality(false), homeOrganization(false), orginationAffiliation(false), comments(false), labeledURI(false), gpgKey(false), timeZone(false), nsfDemographics(false) {}
+ _UserProfile__isset() : middleName(false), namePrefix(false), nameSuffix(false), orcidId(false), phones(false), country(false), nationality(false), homeOrganization(false), orginationAffiliation(false), comments(false), labeledURI(false), gpgKey(false), timeZone(false), nsfDemographics(false) {}
bool middleName :1;
bool namePrefix :1;
bool nameSuffix :1;
- bool userName :1;
bool orcidId :1;
bool phones :1;
bool country :1;
@@ -213,7 +212,7 @@ class UserProfile {
UserProfile(const UserProfile&);
UserProfile& operator=(const UserProfile&);
- UserProfile() : userModelVersion("1.0"), airavataInternalUserId("DO_NOT_SET_AT_CLIENTS"), userId(), gatewayId(), firstName(), lastName(), middleName(), namePrefix(), nameSuffix(), userName(), orcidId(), country(), homeOrganization(), orginationAffiliation(), creationTime(0), lastAccessTime(0), validUntil(0), State((Status::type)0), comments(), gpgKey(), timeZone() {
+ UserProfile() : userModelVersion("1.0"), airavataInternalUserId("DO_NOT_SET_AT_CLIENTS"), userId(), gatewayId(), firstName(), lastName(), middleName(), namePrefix(), nameSuffix(), orcidId(), country(), homeOrganization(), orginationAffiliation(), creationTime(0), lastAccessTime(0), validUntil(0), State((Status::type)0), comments(), gpgKey(), timeZone() {
}
virtual ~UserProfile() throw();
@@ -227,7 +226,6 @@ class UserProfile {
std::string middleName;
std::string namePrefix;
std::string nameSuffix;
- std::string userName;
std::string orcidId;
std::vector<std::string> phones;
std::string country;
@@ -266,8 +264,6 @@ class UserProfile {
void __set_nameSuffix(const std::string& val);
- void __set_userName(const std::string& val);
-
void __set_orcidId(const std::string& val);
void __set_phones(const std::vector<std::string> & val);
@@ -326,10 +322,6 @@ class UserProfile {
return false;
else if (__isset.nameSuffix && !(nameSuffix == rhs.nameSuffix))
return false;
- if (__isset.userName != rhs.__isset.userName)
- return false;
- else if (__isset.userName && !(userName == rhs.userName))
- return false;
if (__isset.orcidId != rhs.__isset.orcidId)
return false;
else if (__isset.orcidId && !(orcidId == rhs.orcidId))