Repository: airavata Updated Branches: refs/heads/develop 63825ce32 -> 3bb7f493d
http://git-wip-us.apache.org/repos/asf/airavata/blob/3bb7f493/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/CertificateCredential.java ---------------------------------------------------------------------- diff --git a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/CertificateCredential.java b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/CertificateCredential.java index 2e80356..cbb5b37 100644 --- a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/CertificateCredential.java +++ b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/CertificateCredential.java @@ -50,7 +50,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-05-01") public class CertificateCredential implements org.apache.thrift.TBase<CertificateCredential, CertificateCredential._Fields>, java.io.Serializable, Cloneable, Comparable<CertificateCredential> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CertificateCredential"); http://git-wip-us.apache.org/repos/asf/airavata/blob/3bb7f493/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/CommunityUser.java ---------------------------------------------------------------------- diff --git a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/CommunityUser.java b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/CommunityUser.java index acad065..1fb27e7 100644 --- a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/CommunityUser.java +++ b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/CommunityUser.java @@ -50,7 +50,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-05-01") public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, CommunityUser._Fields>, java.io.Serializable, Cloneable, Comparable<CommunityUser> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CommunityUser"); http://git-wip-us.apache.org/repos/asf/airavata/blob/3bb7f493/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/PasswordCredential.java ---------------------------------------------------------------------- diff --git a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/PasswordCredential.java b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/PasswordCredential.java index c83f720..1a529b0 100644 --- a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/PasswordCredential.java +++ b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/PasswordCredential.java @@ -50,14 +50,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-05-01") public class PasswordCredential implements org.apache.thrift.TBase<PasswordCredential, PasswordCredential._Fields>, java.io.Serializable, Cloneable, Comparable<PasswordCredential> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PasswordCredential"); - private static final org.apache.thrift.protocol.TField USERNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("username", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField PASSWORD_FIELD_DESC = new org.apache.thrift.protocol.TField("password", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField PERSISTED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("persistedTime", org.apache.thrift.protocol.TType.I64, (short)3); - private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField USERNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("username", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField PASSWORD_FIELD_DESC = new org.apache.thrift.protocol.TField("password", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField PERSISTED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("persistedTime", org.apache.thrift.protocol.TType.I64, (short)5); + private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)6); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -65,17 +67,21 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede schemes.put(TupleScheme.class, new PasswordCredentialTupleSchemeFactory()); } + public String gatewayId; // required public String username; // required public String password; // required + public String description; // optional public long persistedTime; // optional public String token; // 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 { - USERNAME((short)1, "username"), - PASSWORD((short)2, "password"), - PERSISTED_TIME((short)3, "persistedTime"), - TOKEN((short)4, "token"); + GATEWAY_ID((short)1, "gatewayId"), + USERNAME((short)2, "username"), + PASSWORD((short)3, "password"), + DESCRIPTION((short)4, "description"), + PERSISTED_TIME((short)5, "persistedTime"), + TOKEN((short)6, "token"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -90,13 +96,17 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // USERNAME + case 1: // GATEWAY_ID + return GATEWAY_ID; + case 2: // USERNAME return USERNAME; - case 2: // PASSWORD + case 3: // PASSWORD return PASSWORD; - case 3: // PERSISTED_TIME + case 4: // DESCRIPTION + return DESCRIPTION; + case 5: // PERSISTED_TIME return PERSISTED_TIME; - case 4: // TOKEN + case 6: // TOKEN return TOKEN; default: return null; @@ -140,14 +150,18 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede // isset id assignments private static final int __PERSISTEDTIME_ISSET_ID = 0; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.PERSISTED_TIME,_Fields.TOKEN}; + private static final _Fields optionals[] = {_Fields.DESCRIPTION,_Fields.PERSISTED_TIME,_Fields.TOKEN}; 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); + tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.USERNAME, new org.apache.thrift.meta_data.FieldMetaData("username", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.PASSWORD, new org.apache.thrift.meta_data.FieldMetaData("password", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("description", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.PERSISTED_TIME, new org.apache.thrift.meta_data.FieldMetaData("persistedTime", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.OPTIONAL, @@ -160,10 +174,12 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede } public PasswordCredential( + String gatewayId, String username, String password) { this(); + this.gatewayId = gatewayId; this.username = username; this.password = password; } @@ -173,12 +189,18 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede */ public PasswordCredential(PasswordCredential other) { __isset_bitfield = other.__isset_bitfield; + if (other.isSetGatewayId()) { + this.gatewayId = other.gatewayId; + } if (other.isSetUsername()) { this.username = other.username; } if (other.isSetPassword()) { this.password = other.password; } + if (other.isSetDescription()) { + this.description = other.description; + } this.persistedTime = other.persistedTime; if (other.isSetToken()) { this.token = other.token; @@ -191,13 +213,39 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede @Override public void clear() { + this.gatewayId = null; this.username = null; this.password = null; + this.description = null; setPersistedTimeIsSet(false); this.persistedTime = 0; this.token = null; } + public String getGatewayId() { + return this.gatewayId; + } + + public PasswordCredential setGatewayId(String gatewayId) { + this.gatewayId = gatewayId; + return this; + } + + public void unsetGatewayId() { + this.gatewayId = null; + } + + /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */ + public boolean isSetGatewayId() { + return this.gatewayId != null; + } + + public void setGatewayIdIsSet(boolean value) { + if (!value) { + this.gatewayId = null; + } + } + public String getUsername() { return this.username; } @@ -246,6 +294,30 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede } } + public String getDescription() { + return this.description; + } + + public PasswordCredential setDescription(String description) { + this.description = description; + return this; + } + + public void unsetDescription() { + this.description = null; + } + + /** Returns true if field description is set (has been assigned a value) and false otherwise */ + public boolean isSetDescription() { + return this.description != null; + } + + public void setDescriptionIsSet(boolean value) { + if (!value) { + this.description = null; + } + } + public long getPersistedTime() { return this.persistedTime; } @@ -295,6 +367,14 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede public void setFieldValue(_Fields field, Object value) { switch (field) { + case GATEWAY_ID: + if (value == null) { + unsetGatewayId(); + } else { + setGatewayId((String)value); + } + break; + case USERNAME: if (value == null) { unsetUsername(); @@ -311,6 +391,14 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede } break; + case DESCRIPTION: + if (value == null) { + unsetDescription(); + } else { + setDescription((String)value); + } + break; + case PERSISTED_TIME: if (value == null) { unsetPersistedTime(); @@ -332,12 +420,18 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede public Object getFieldValue(_Fields field) { switch (field) { + case GATEWAY_ID: + return getGatewayId(); + case USERNAME: return getUsername(); case PASSWORD: return getPassword(); + case DESCRIPTION: + return getDescription(); + case PERSISTED_TIME: return getPersistedTime(); @@ -355,10 +449,14 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede } switch (field) { + case GATEWAY_ID: + return isSetGatewayId(); case USERNAME: return isSetUsername(); case PASSWORD: return isSetPassword(); + case DESCRIPTION: + return isSetDescription(); case PERSISTED_TIME: return isSetPersistedTime(); case TOKEN: @@ -380,6 +478,15 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede if (that == null) return false; + boolean this_present_gatewayId = true && this.isSetGatewayId(); + boolean that_present_gatewayId = true && that.isSetGatewayId(); + if (this_present_gatewayId || that_present_gatewayId) { + if (!(this_present_gatewayId && that_present_gatewayId)) + return false; + if (!this.gatewayId.equals(that.gatewayId)) + return false; + } + boolean this_present_username = true && this.isSetUsername(); boolean that_present_username = true && that.isSetUsername(); if (this_present_username || that_present_username) { @@ -398,6 +505,15 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede return false; } + boolean this_present_description = true && this.isSetDescription(); + boolean that_present_description = true && that.isSetDescription(); + if (this_present_description || that_present_description) { + if (!(this_present_description && that_present_description)) + return false; + if (!this.description.equals(that.description)) + return false; + } + boolean this_present_persistedTime = true && this.isSetPersistedTime(); boolean that_present_persistedTime = true && that.isSetPersistedTime(); if (this_present_persistedTime || that_present_persistedTime) { @@ -423,6 +539,11 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede public int hashCode() { List<Object> list = new ArrayList<Object>(); + boolean present_gatewayId = true && (isSetGatewayId()); + list.add(present_gatewayId); + if (present_gatewayId) + list.add(gatewayId); + boolean present_username = true && (isSetUsername()); list.add(present_username); if (present_username) @@ -433,6 +554,11 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede if (present_password) list.add(password); + boolean present_description = true && (isSetDescription()); + list.add(present_description); + if (present_description) + list.add(description); + boolean present_persistedTime = true && (isSetPersistedTime()); list.add(present_persistedTime); if (present_persistedTime) @@ -454,6 +580,16 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede int lastComparison = 0; + lastComparison = Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetGatewayId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayId, other.gatewayId); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetUsername()).compareTo(other.isSetUsername()); if (lastComparison != 0) { return lastComparison; @@ -474,6 +610,16 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede return lastComparison; } } + lastComparison = Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetDescription()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.description, other.description); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetPersistedTime()).compareTo(other.isSetPersistedTime()); if (lastComparison != 0) { return lastComparison; @@ -514,6 +660,14 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede StringBuilder sb = new StringBuilder("PasswordCredential("); boolean first = true; + sb.append("gatewayId:"); + if (this.gatewayId == null) { + sb.append("null"); + } else { + sb.append(this.gatewayId); + } + first = false; + if (!first) sb.append(", "); sb.append("username:"); if (this.username == null) { sb.append("null"); @@ -529,6 +683,16 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede sb.append(this.password); } first = false; + if (isSetDescription()) { + if (!first) sb.append(", "); + sb.append("description:"); + if (this.description == null) { + sb.append("null"); + } else { + sb.append(this.description); + } + first = false; + } if (isSetPersistedTime()) { if (!first) sb.append(", "); sb.append("persistedTime:"); @@ -551,6 +715,9 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede public void validate() throws org.apache.thrift.TException { // check for required fields + if (gatewayId == null) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' was not present! Struct: " + toString()); + } if (username == null) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'username' was not present! Struct: " + toString()); } @@ -596,7 +763,15 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede break; } switch (schemeField.id) { - case 1: // USERNAME + case 1: // GATEWAY_ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.gatewayId = iprot.readString(); + struct.setGatewayIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 2: // USERNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.username = iprot.readString(); struct.setUsernameIsSet(true); @@ -604,7 +779,7 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // PASSWORD + case 3: // PASSWORD if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.password = iprot.readString(); struct.setPasswordIsSet(true); @@ -612,7 +787,15 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // PERSISTED_TIME + case 4: // DESCRIPTION + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.description = iprot.readString(); + struct.setDescriptionIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 5: // PERSISTED_TIME if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.persistedTime = iprot.readI64(); struct.setPersistedTimeIsSet(true); @@ -620,7 +803,7 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // TOKEN + case 6: // TOKEN if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.token = iprot.readString(); struct.setTokenIsSet(true); @@ -643,6 +826,11 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + if (struct.gatewayId != null) { + oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC); + oprot.writeString(struct.gatewayId); + oprot.writeFieldEnd(); + } if (struct.username != null) { oprot.writeFieldBegin(USERNAME_FIELD_DESC); oprot.writeString(struct.username); @@ -653,6 +841,13 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede oprot.writeString(struct.password); oprot.writeFieldEnd(); } + if (struct.description != null) { + if (struct.isSetDescription()) { + oprot.writeFieldBegin(DESCRIPTION_FIELD_DESC); + oprot.writeString(struct.description); + oprot.writeFieldEnd(); + } + } if (struct.isSetPersistedTime()) { oprot.writeFieldBegin(PERSISTED_TIME_FIELD_DESC); oprot.writeI64(struct.persistedTime); @@ -682,16 +877,23 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede @Override public void write(org.apache.thrift.protocol.TProtocol prot, PasswordCredential struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; + oprot.writeString(struct.gatewayId); oprot.writeString(struct.username); oprot.writeString(struct.password); BitSet optionals = new BitSet(); - if (struct.isSetPersistedTime()) { + if (struct.isSetDescription()) { optionals.set(0); } - if (struct.isSetToken()) { + if (struct.isSetPersistedTime()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); + if (struct.isSetToken()) { + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); + if (struct.isSetDescription()) { + oprot.writeString(struct.description); + } if (struct.isSetPersistedTime()) { oprot.writeI64(struct.persistedTime); } @@ -703,16 +905,22 @@ public class PasswordCredential implements org.apache.thrift.TBase<PasswordCrede @Override public void read(org.apache.thrift.protocol.TProtocol prot, PasswordCredential struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; + struct.gatewayId = iprot.readString(); + struct.setGatewayIdIsSet(true); struct.username = iprot.readString(); struct.setUsernameIsSet(true); struct.password = iprot.readString(); struct.setPasswordIsSet(true); - BitSet incoming = iprot.readBitSet(2); + BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { + struct.description = iprot.readString(); + struct.setDescriptionIsSet(true); + } + if (incoming.get(1)) { struct.persistedTime = iprot.readI64(); struct.setPersistedTimeIsSet(true); } - if (incoming.get(1)) { + if (incoming.get(2)) { struct.token = iprot.readString(); struct.setTokenIsSet(true); } http://git-wip-us.apache.org/repos/asf/airavata/blob/3bb7f493/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/SSHCredential.java ---------------------------------------------------------------------- diff --git a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/SSHCredential.java b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/SSHCredential.java index 365a17c..3d18b99 100644 --- a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/SSHCredential.java +++ b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/SSHCredential.java @@ -50,7 +50,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-05-01") public class SSHCredential implements org.apache.thrift.TBase<SSHCredential, SSHCredential._Fields>, java.io.Serializable, Cloneable, Comparable<SSHCredential> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SSHCredential"); http://git-wip-us.apache.org/repos/asf/airavata/blob/3bb7f493/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/exception/CredentialStoreException.java ---------------------------------------------------------------------- diff --git a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/exception/CredentialStoreException.java b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/exception/CredentialStoreException.java index 2e900b8..a99b0be 100644 --- a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/exception/CredentialStoreException.java +++ b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/exception/CredentialStoreException.java @@ -50,7 +50,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-05-01") public class CredentialStoreException extends TException implements org.apache.thrift.TBase<CredentialStoreException, CredentialStoreException._Fields>, java.io.Serializable, Cloneable, Comparable<CredentialStoreException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CredentialStoreException"); http://git-wip-us.apache.org/repos/asf/airavata/blob/3bb7f493/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java b/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java index c844713..e350ded 100644 --- a/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java +++ b/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java @@ -50,7 +50,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-05-01") public class GfacService { public interface Iface { http://git-wip-us.apache.org/repos/asf/airavata/blob/3bb7f493/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/OrchestratorService.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/OrchestratorService.java b/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/OrchestratorService.java index 6e81385..173204b 100644 --- a/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/OrchestratorService.java +++ b/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/OrchestratorService.java @@ -50,7 +50,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-21") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-05-01") public class OrchestratorService { public interface Iface { http://git-wip-us.apache.org/repos/asf/airavata/blob/3bb7f493/thrift-interface-descriptions/airavata-apis/airavata_api.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift index 96e707f..fd435dd 100644 --- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift +++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift @@ -258,6 +258,32 @@ service Airavata { 2: airavata_errors.AiravataClientException ace, 3: airavata_errors.AiravataSystemException ase) + + /** + * Generate and Register Username PWD Pair with Airavata Credential Store. + * + * @param gatewayId + * The identifier for the requested Gateway. + * + * @param userName + * The User for which the credential should be registered. For community accounts, this user is the name of the + * community user name. For computational resources, this user name need not be the same user name on resoruces. + * + * @param password + * + * @return airavataCredStoreToken + * An SSH Key pair is generated and stored in the credential store and associated with users or community account + * belonging to a Gateway. + * + **/ + string registerPwdCredential (1: required security_model.AuthzToken authzToken, + 2: required string gatewayId, + 3: required string userName, + 4: required string password) + throws (1: airavata_errors.InvalidRequestException ire, + 2: airavata_errors.AiravataClientException ace, + 3: airavata_errors.AiravataSystemException ase) + /** * Get a Public Key by Providing the Token * @@ -316,6 +342,13 @@ service Airavata { 2: airavata_errors.AiravataClientException ace, 3: airavata_errors.AiravataSystemException ase) + + map<string, string> getAllGatewayPWDCredentials (1: required security_model.AuthzToken authzToken, + 2: required string gatewayId) + throws (1: airavata_errors.InvalidRequestException ire, + 2: airavata_errors.AiravataClientException ace, + 3: airavata_errors.AiravataSystemException ase) + /** * * Delete a Gateway @@ -334,6 +367,14 @@ service Airavata { 2: airavata_errors.AiravataClientException ace, 3: airavata_errors.AiravataSystemException ase) + + bool deletePWDCredential (1: required security_model.AuthzToken authzToken, + 2: required string airavataCredStoreToken, + 3: required string gatewayId) + throws (1: airavata_errors.InvalidRequestException ire, + 2: airavata_errors.AiravataClientException ace, + 3: airavata_errors.AiravataSystemException ase) + /** * * Creates a Project with basic metadata. http://git-wip-us.apache.org/repos/asf/airavata/blob/3bb7f493/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift b/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift index 57ed0bf..f884930 100644 --- a/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift +++ b/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift @@ -60,7 +60,10 @@ service CredentialStoreService { map<string,string> getAllSSHKeysForGateway (1: required string gatewayId) throws (1:credential_store_errors.CredentialStoreException csException); + map<string,string> getAllPWDCredentialsForGateway (1: required string gatewayId) throws (1:credential_store_errors.CredentialStoreException csException); + bool deleteSSHCredential(1: required string tokenId, 2: required string gatewayId) throws (1:credential_store_errors.CredentialStoreException csException); + bool deletePWDCredential(1: required string tokenId, 2: required string gatewayId) throws (1:credential_store_errors.CredentialStoreException csException); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/3bb7f493/thrift-interface-descriptions/component-cpis/credential_store_data_models.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/component-cpis/credential_store_data_models.thrift b/thrift-interface-descriptions/component-cpis/credential_store_data_models.thrift index 921d141..84e5243 100644 --- a/thrift-interface-descriptions/component-cpis/credential_store_data_models.thrift +++ b/thrift-interface-descriptions/component-cpis/credential_store_data_models.thrift @@ -52,15 +52,10 @@ struct CertificateCredential { } struct PasswordCredential { - 1: required string username, - 2: required string password, - 3: optional i64 persistedTime, - 4: optional string token -} - -struct APICredential { - 1: required string apiKey, - 2: required string apiSecret, - 3: optional i64 persistedTime, - 4: optional string token + 1: required string gatewayId, + 2: required string username, + 3: required string password, + 4: optional string description, + 5: optional i64 persistedTime, + 6: optional string token }
