You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/08/03 16:01:59 UTC
[43/50] [abbrv] airavata git commit: updating some of the group
management API methods in AiravataServerHandler
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/tenant_profile_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/tenant_profile_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/tenant_profile_model_types.cpp
index 284f0d4..c6adfd2 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/tenant_profile_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/tenant_profile_model_types.cpp
@@ -37,7 +37,8 @@ int _kTenantApprovalStatusValues[] = {
TenantApprovalStatus::DEACTIVATED,
TenantApprovalStatus::CANCELLED,
TenantApprovalStatus::DENIED,
- TenantApprovalStatus::CREATED
+ TenantApprovalStatus::CREATED,
+ TenantApprovalStatus::DEPLOYED
};
const char* _kTenantApprovalStatusNames[] = {
"REQUESTED",
@@ -46,9 +47,296 @@ const char* _kTenantApprovalStatusNames[] = {
"DEACTIVATED",
"CANCELLED",
"DENIED",
- "CREATED"
+ "CREATED",
+ "DEPLOYED"
};
-const std::map<int, const char*> _TenantApprovalStatus_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(7, _kTenantApprovalStatusValues, _kTenantApprovalStatusNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+const std::map<int, const char*> _TenantApprovalStatus_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(8, _kTenantApprovalStatusValues, _kTenantApprovalStatusNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+
+
+TenantPreferences::~TenantPreferences() throw() {
+}
+
+
+void TenantPreferences::__set_tenantAdminFirstName(const std::string& val) {
+ this->tenantAdminFirstName = val;
+__isset.tenantAdminFirstName = true;
+}
+
+void TenantPreferences::__set_tenantAdminLastName(const std::string& val) {
+ this->tenantAdminLastName = val;
+__isset.tenantAdminLastName = true;
+}
+
+void TenantPreferences::__set_tenantAdminEmail(const std::string& val) {
+ this->tenantAdminEmail = val;
+__isset.tenantAdminEmail = true;
+}
+
+uint32_t TenantPreferences::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 10:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->tenantAdminFirstName);
+ this->__isset.tenantAdminFirstName = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 11:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->tenantAdminLastName);
+ this->__isset.tenantAdminLastName = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 12:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->tenantAdminEmail);
+ this->__isset.tenantAdminEmail = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
+uint32_t TenantPreferences::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+ xfer += oprot->writeStructBegin("TenantPreferences");
+
+ if (this->__isset.tenantAdminFirstName) {
+ xfer += oprot->writeFieldBegin("tenantAdminFirstName", ::apache::thrift::protocol::T_STRING, 10);
+ xfer += oprot->writeString(this->tenantAdminFirstName);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.tenantAdminLastName) {
+ xfer += oprot->writeFieldBegin("tenantAdminLastName", ::apache::thrift::protocol::T_STRING, 11);
+ xfer += oprot->writeString(this->tenantAdminLastName);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.tenantAdminEmail) {
+ xfer += oprot->writeFieldBegin("tenantAdminEmail", ::apache::thrift::protocol::T_STRING, 12);
+ xfer += oprot->writeString(this->tenantAdminEmail);
+ xfer += oprot->writeFieldEnd();
+ }
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+void swap(TenantPreferences &a, TenantPreferences &b) {
+ using ::std::swap;
+ swap(a.tenantAdminFirstName, b.tenantAdminFirstName);
+ swap(a.tenantAdminLastName, b.tenantAdminLastName);
+ swap(a.tenantAdminEmail, b.tenantAdminEmail);
+ swap(a.__isset, b.__isset);
+}
+
+TenantPreferences::TenantPreferences(const TenantPreferences& other0) {
+ tenantAdminFirstName = other0.tenantAdminFirstName;
+ tenantAdminLastName = other0.tenantAdminLastName;
+ tenantAdminEmail = other0.tenantAdminEmail;
+ __isset = other0.__isset;
+}
+TenantPreferences& TenantPreferences::operator=(const TenantPreferences& other1) {
+ tenantAdminFirstName = other1.tenantAdminFirstName;
+ tenantAdminLastName = other1.tenantAdminLastName;
+ tenantAdminEmail = other1.tenantAdminEmail;
+ __isset = other1.__isset;
+ return *this;
+}
+void TenantPreferences::printTo(std::ostream& out) const {
+ using ::apache::thrift::to_string;
+ out << "TenantPreferences(";
+ out << "tenantAdminFirstName="; (__isset.tenantAdminFirstName ? (out << to_string(tenantAdminFirstName)) : (out << "<null>"));
+ out << ", " << "tenantAdminLastName="; (__isset.tenantAdminLastName ? (out << to_string(tenantAdminLastName)) : (out << "<null>"));
+ out << ", " << "tenantAdminEmail="; (__isset.tenantAdminEmail ? (out << to_string(tenantAdminEmail)) : (out << "<null>"));
+ out << ")";
+}
+
+
+TenantConfig::~TenantConfig() throw() {
+}
+
+
+void TenantConfig::__set_oauthClientId(const std::string& val) {
+ this->oauthClientId = val;
+__isset.oauthClientId = true;
+}
+
+void TenantConfig::__set_oauthClientSecret(const std::string& val) {
+ this->oauthClientSecret = val;
+__isset.oauthClientSecret = true;
+}
+
+void TenantConfig::__set_identityServerUserName(const std::string& val) {
+ this->identityServerUserName = val;
+__isset.identityServerUserName = true;
+}
+
+void TenantConfig::__set_identityServerPasswordToken(const std::string& val) {
+ this->identityServerPasswordToken = val;
+__isset.identityServerPasswordToken = true;
+}
+
+uint32_t TenantConfig::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 16:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->oauthClientId);
+ this->__isset.oauthClientId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 17:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->oauthClientSecret);
+ this->__isset.oauthClientSecret = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 13:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->identityServerUserName);
+ this->__isset.identityServerUserName = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 14:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->identityServerPasswordToken);
+ this->__isset.identityServerPasswordToken = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
+uint32_t TenantConfig::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+ xfer += oprot->writeStructBegin("TenantConfig");
+
+ if (this->__isset.identityServerUserName) {
+ xfer += oprot->writeFieldBegin("identityServerUserName", ::apache::thrift::protocol::T_STRING, 13);
+ xfer += oprot->writeString(this->identityServerUserName);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.identityServerPasswordToken) {
+ xfer += oprot->writeFieldBegin("identityServerPasswordToken", ::apache::thrift::protocol::T_STRING, 14);
+ xfer += oprot->writeString(this->identityServerPasswordToken);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.oauthClientId) {
+ xfer += oprot->writeFieldBegin("oauthClientId", ::apache::thrift::protocol::T_STRING, 16);
+ xfer += oprot->writeString(this->oauthClientId);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.oauthClientSecret) {
+ xfer += oprot->writeFieldBegin("oauthClientSecret", ::apache::thrift::protocol::T_STRING, 17);
+ xfer += oprot->writeString(this->oauthClientSecret);
+ xfer += oprot->writeFieldEnd();
+ }
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+void swap(TenantConfig &a, TenantConfig &b) {
+ using ::std::swap;
+ swap(a.oauthClientId, b.oauthClientId);
+ swap(a.oauthClientSecret, b.oauthClientSecret);
+ swap(a.identityServerUserName, b.identityServerUserName);
+ swap(a.identityServerPasswordToken, b.identityServerPasswordToken);
+ swap(a.__isset, b.__isset);
+}
+
+TenantConfig::TenantConfig(const TenantConfig& other2) {
+ oauthClientId = other2.oauthClientId;
+ oauthClientSecret = other2.oauthClientSecret;
+ identityServerUserName = other2.identityServerUserName;
+ identityServerPasswordToken = other2.identityServerPasswordToken;
+ __isset = other2.__isset;
+}
+TenantConfig& TenantConfig::operator=(const TenantConfig& other3) {
+ oauthClientId = other3.oauthClientId;
+ oauthClientSecret = other3.oauthClientSecret;
+ identityServerUserName = other3.identityServerUserName;
+ identityServerPasswordToken = other3.identityServerPasswordToken;
+ __isset = other3.__isset;
+ return *this;
+}
+void TenantConfig::printTo(std::ostream& out) const {
+ using ::apache::thrift::to_string;
+ out << "TenantConfig(";
+ out << "oauthClientId="; (__isset.oauthClientId ? (out << to_string(oauthClientId)) : (out << "<null>"));
+ out << ", " << "oauthClientSecret="; (__isset.oauthClientSecret ? (out << to_string(oauthClientSecret)) : (out << "<null>"));
+ out << ", " << "identityServerUserName="; (__isset.identityServerUserName ? (out << to_string(identityServerUserName)) : (out << "<null>"));
+ out << ", " << "identityServerPasswordToken="; (__isset.identityServerPasswordToken ? (out << to_string(identityServerPasswordToken)) : (out << "<null>"));
+ out << ")";
+}
Tenant::~Tenant() throw() {
@@ -98,46 +386,11 @@ void Tenant::__set_reviewProposalDescription(const std::string& val) {
__isset.reviewProposalDescription = true;
}
-void Tenant::__set_tenantAdminFirstName(const std::string& val) {
- this->tenantAdminFirstName = val;
-__isset.tenantAdminFirstName = true;
-}
-
-void Tenant::__set_tenantAdminLastName(const std::string& val) {
- this->tenantAdminLastName = val;
-__isset.tenantAdminLastName = true;
-}
-
-void Tenant::__set_tenantAdminEmail(const std::string& val) {
- this->tenantAdminEmail = val;
-__isset.tenantAdminEmail = true;
-}
-
-void Tenant::__set_identityServerUserName(const std::string& val) {
- this->identityServerUserName = val;
-__isset.identityServerUserName = true;
-}
-
-void Tenant::__set_identityServerPasswordToken(const std::string& val) {
- this->identityServerPasswordToken = val;
-__isset.identityServerPasswordToken = true;
-}
-
void Tenant::__set_declinedReason(const std::string& val) {
this->declinedReason = val;
__isset.declinedReason = true;
}
-void Tenant::__set_oauthClientId(const std::string& val) {
- this->oauthClientId = val;
-__isset.oauthClientId = true;
-}
-
-void Tenant::__set_oauthClientSecret(const std::string& val) {
- this->oauthClientSecret = val;
-__isset.oauthClientSecret = true;
-}
-
void Tenant::__set_requestCreationTime(const int64_t val) {
this->requestCreationTime = val;
__isset.requestCreationTime = true;
@@ -181,9 +434,9 @@ uint32_t Tenant::read(::apache::thrift::protocol::TProtocol* iprot) {
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast0;
- xfer += iprot->readI32(ecast0);
- this->tenantApprovalStatus = (TenantApprovalStatus::type)ecast0;
+ int32_t ecast4;
+ xfer += iprot->readI32(ecast4);
+ this->tenantApprovalStatus = (TenantApprovalStatus::type)ecast4;
isset_tenantApprovalStatus = true;
} else {
xfer += iprot->skip(ftype);
@@ -245,46 +498,6 @@ uint32_t Tenant::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 10:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->tenantAdminFirstName);
- this->__isset.tenantAdminFirstName = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 11:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->tenantAdminLastName);
- this->__isset.tenantAdminLastName = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 12:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->tenantAdminEmail);
- this->__isset.tenantAdminEmail = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 13:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->identityServerUserName);
- this->__isset.identityServerUserName = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 14:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->identityServerPasswordToken);
- this->__isset.identityServerPasswordToken = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
case 15:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->declinedReason);
@@ -293,22 +506,6 @@ uint32_t Tenant::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 16:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->oauthClientId);
- this->__isset.oauthClientId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 17:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->oauthClientSecret);
- this->__isset.oauthClientSecret = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
case 18:
if (ftype == ::apache::thrift::protocol::T_I64) {
xfer += iprot->readI64(this->requestCreationTime);
@@ -389,46 +586,11 @@ uint32_t Tenant::write(::apache::thrift::protocol::TProtocol* oprot) const {
xfer += oprot->writeString(this->reviewProposalDescription);
xfer += oprot->writeFieldEnd();
}
- if (this->__isset.tenantAdminFirstName) {
- xfer += oprot->writeFieldBegin("tenantAdminFirstName", ::apache::thrift::protocol::T_STRING, 10);
- xfer += oprot->writeString(this->tenantAdminFirstName);
- xfer += oprot->writeFieldEnd();
- }
- if (this->__isset.tenantAdminLastName) {
- xfer += oprot->writeFieldBegin("tenantAdminLastName", ::apache::thrift::protocol::T_STRING, 11);
- xfer += oprot->writeString(this->tenantAdminLastName);
- xfer += oprot->writeFieldEnd();
- }
- if (this->__isset.tenantAdminEmail) {
- xfer += oprot->writeFieldBegin("tenantAdminEmail", ::apache::thrift::protocol::T_STRING, 12);
- xfer += oprot->writeString(this->tenantAdminEmail);
- xfer += oprot->writeFieldEnd();
- }
- if (this->__isset.identityServerUserName) {
- xfer += oprot->writeFieldBegin("identityServerUserName", ::apache::thrift::protocol::T_STRING, 13);
- xfer += oprot->writeString(this->identityServerUserName);
- xfer += oprot->writeFieldEnd();
- }
- if (this->__isset.identityServerPasswordToken) {
- xfer += oprot->writeFieldBegin("identityServerPasswordToken", ::apache::thrift::protocol::T_STRING, 14);
- xfer += oprot->writeString(this->identityServerPasswordToken);
- xfer += oprot->writeFieldEnd();
- }
if (this->__isset.declinedReason) {
xfer += oprot->writeFieldBegin("declinedReason", ::apache::thrift::protocol::T_STRING, 15);
xfer += oprot->writeString(this->declinedReason);
xfer += oprot->writeFieldEnd();
}
- if (this->__isset.oauthClientId) {
- xfer += oprot->writeFieldBegin("oauthClientId", ::apache::thrift::protocol::T_STRING, 16);
- xfer += oprot->writeString(this->oauthClientId);
- xfer += oprot->writeFieldEnd();
- }
- if (this->__isset.oauthClientSecret) {
- xfer += oprot->writeFieldBegin("oauthClientSecret", ::apache::thrift::protocol::T_STRING, 17);
- xfer += oprot->writeString(this->oauthClientSecret);
- xfer += oprot->writeFieldEnd();
- }
if (this->__isset.requestCreationTime) {
xfer += oprot->writeFieldBegin("requestCreationTime", ::apache::thrift::protocol::T_I64, 18);
xfer += oprot->writeI64(this->requestCreationTime);
@@ -455,62 +617,41 @@ void swap(Tenant &a, Tenant &b) {
swap(a.tenantURL, b.tenantURL);
swap(a.tenantPublicAbstract, b.tenantPublicAbstract);
swap(a.reviewProposalDescription, b.reviewProposalDescription);
- swap(a.tenantAdminFirstName, b.tenantAdminFirstName);
- swap(a.tenantAdminLastName, b.tenantAdminLastName);
- swap(a.tenantAdminEmail, b.tenantAdminEmail);
- swap(a.identityServerUserName, b.identityServerUserName);
- swap(a.identityServerPasswordToken, b.identityServerPasswordToken);
swap(a.declinedReason, b.declinedReason);
- swap(a.oauthClientId, b.oauthClientId);
- swap(a.oauthClientSecret, b.oauthClientSecret);
swap(a.requestCreationTime, b.requestCreationTime);
swap(a.requesterUsername, b.requesterUsername);
swap(a.__isset, b.__isset);
}
-Tenant::Tenant(const Tenant& other1) {
- tenantId = other1.tenantId;
- tenantApprovalStatus = other1.tenantApprovalStatus;
- tenantName = other1.tenantName;
- domain = other1.domain;
- emailAddress = other1.emailAddress;
- tenantAcronym = other1.tenantAcronym;
- tenantURL = other1.tenantURL;
- tenantPublicAbstract = other1.tenantPublicAbstract;
- reviewProposalDescription = other1.reviewProposalDescription;
- tenantAdminFirstName = other1.tenantAdminFirstName;
- tenantAdminLastName = other1.tenantAdminLastName;
- tenantAdminEmail = other1.tenantAdminEmail;
- identityServerUserName = other1.identityServerUserName;
- identityServerPasswordToken = other1.identityServerPasswordToken;
- declinedReason = other1.declinedReason;
- oauthClientId = other1.oauthClientId;
- oauthClientSecret = other1.oauthClientSecret;
- requestCreationTime = other1.requestCreationTime;
- requesterUsername = other1.requesterUsername;
- __isset = other1.__isset;
+Tenant::Tenant(const Tenant& other5) {
+ tenantId = other5.tenantId;
+ tenantApprovalStatus = other5.tenantApprovalStatus;
+ tenantName = other5.tenantName;
+ domain = other5.domain;
+ emailAddress = other5.emailAddress;
+ tenantAcronym = other5.tenantAcronym;
+ tenantURL = other5.tenantURL;
+ tenantPublicAbstract = other5.tenantPublicAbstract;
+ reviewProposalDescription = other5.reviewProposalDescription;
+ declinedReason = other5.declinedReason;
+ requestCreationTime = other5.requestCreationTime;
+ requesterUsername = other5.requesterUsername;
+ __isset = other5.__isset;
}
-Tenant& Tenant::operator=(const Tenant& other2) {
- tenantId = other2.tenantId;
- tenantApprovalStatus = other2.tenantApprovalStatus;
- tenantName = other2.tenantName;
- domain = other2.domain;
- emailAddress = other2.emailAddress;
- tenantAcronym = other2.tenantAcronym;
- tenantURL = other2.tenantURL;
- tenantPublicAbstract = other2.tenantPublicAbstract;
- reviewProposalDescription = other2.reviewProposalDescription;
- tenantAdminFirstName = other2.tenantAdminFirstName;
- tenantAdminLastName = other2.tenantAdminLastName;
- tenantAdminEmail = other2.tenantAdminEmail;
- identityServerUserName = other2.identityServerUserName;
- identityServerPasswordToken = other2.identityServerPasswordToken;
- declinedReason = other2.declinedReason;
- oauthClientId = other2.oauthClientId;
- oauthClientSecret = other2.oauthClientSecret;
- requestCreationTime = other2.requestCreationTime;
- requesterUsername = other2.requesterUsername;
- __isset = other2.__isset;
+Tenant& Tenant::operator=(const Tenant& other6) {
+ tenantId = other6.tenantId;
+ tenantApprovalStatus = other6.tenantApprovalStatus;
+ tenantName = other6.tenantName;
+ domain = other6.domain;
+ emailAddress = other6.emailAddress;
+ tenantAcronym = other6.tenantAcronym;
+ tenantURL = other6.tenantURL;
+ tenantPublicAbstract = other6.tenantPublicAbstract;
+ reviewProposalDescription = other6.reviewProposalDescription;
+ declinedReason = other6.declinedReason;
+ requestCreationTime = other6.requestCreationTime;
+ requesterUsername = other6.requesterUsername;
+ __isset = other6.__isset;
return *this;
}
void Tenant::printTo(std::ostream& out) const {
@@ -525,14 +666,7 @@ void Tenant::printTo(std::ostream& out) const {
out << ", " << "tenantURL="; (__isset.tenantURL ? (out << to_string(tenantURL)) : (out << "<null>"));
out << ", " << "tenantPublicAbstract="; (__isset.tenantPublicAbstract ? (out << to_string(tenantPublicAbstract)) : (out << "<null>"));
out << ", " << "reviewProposalDescription="; (__isset.reviewProposalDescription ? (out << to_string(reviewProposalDescription)) : (out << "<null>"));
- out << ", " << "tenantAdminFirstName="; (__isset.tenantAdminFirstName ? (out << to_string(tenantAdminFirstName)) : (out << "<null>"));
- out << ", " << "tenantAdminLastName="; (__isset.tenantAdminLastName ? (out << to_string(tenantAdminLastName)) : (out << "<null>"));
- out << ", " << "tenantAdminEmail="; (__isset.tenantAdminEmail ? (out << to_string(tenantAdminEmail)) : (out << "<null>"));
- out << ", " << "identityServerUserName="; (__isset.identityServerUserName ? (out << to_string(identityServerUserName)) : (out << "<null>"));
- out << ", " << "identityServerPasswordToken="; (__isset.identityServerPasswordToken ? (out << to_string(identityServerPasswordToken)) : (out << "<null>"));
out << ", " << "declinedReason="; (__isset.declinedReason ? (out << to_string(declinedReason)) : (out << "<null>"));
- out << ", " << "oauthClientId="; (__isset.oauthClientId ? (out << to_string(oauthClientId)) : (out << "<null>"));
- out << ", " << "oauthClientSecret="; (__isset.oauthClientSecret ? (out << to_string(oauthClientSecret)) : (out << "<null>"));
out << ", " << "requestCreationTime="; (__isset.requestCreationTime ? (out << to_string(requestCreationTime)) : (out << "<null>"));
out << ", " << "requesterUsername="; (__isset.requesterUsername ? (out << to_string(requesterUsername)) : (out << "<null>"));
out << ")";
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/tenant_profile_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/tenant_profile_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/tenant_profile_model_types.h
index 2a815f8..ed8aaf0 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/tenant_profile_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/tenant_profile_model_types.h
@@ -45,16 +45,157 @@ struct TenantApprovalStatus {
DEACTIVATED = 3,
CANCELLED = 4,
DENIED = 5,
- CREATED = 6
+ CREATED = 6,
+ DEPLOYED = 7
};
};
extern const std::map<int, const char*> _TenantApprovalStatus_VALUES_TO_NAMES;
+class TenantPreferences;
+
+class TenantConfig;
+
class Tenant;
+typedef struct _TenantPreferences__isset {
+ _TenantPreferences__isset() : tenantAdminFirstName(false), tenantAdminLastName(false), tenantAdminEmail(false) {}
+ bool tenantAdminFirstName :1;
+ bool tenantAdminLastName :1;
+ bool tenantAdminEmail :1;
+} _TenantPreferences__isset;
+
+class TenantPreferences {
+ public:
+
+ TenantPreferences(const TenantPreferences&);
+ TenantPreferences& operator=(const TenantPreferences&);
+ TenantPreferences() : tenantAdminFirstName(), tenantAdminLastName(), tenantAdminEmail() {
+ }
+
+ virtual ~TenantPreferences() throw();
+ std::string tenantAdminFirstName;
+ std::string tenantAdminLastName;
+ std::string tenantAdminEmail;
+
+ _TenantPreferences__isset __isset;
+
+ void __set_tenantAdminFirstName(const std::string& val);
+
+ void __set_tenantAdminLastName(const std::string& val);
+
+ void __set_tenantAdminEmail(const std::string& val);
+
+ bool operator == (const TenantPreferences & rhs) const
+ {
+ if (__isset.tenantAdminFirstName != rhs.__isset.tenantAdminFirstName)
+ return false;
+ else if (__isset.tenantAdminFirstName && !(tenantAdminFirstName == rhs.tenantAdminFirstName))
+ return false;
+ if (__isset.tenantAdminLastName != rhs.__isset.tenantAdminLastName)
+ return false;
+ else if (__isset.tenantAdminLastName && !(tenantAdminLastName == rhs.tenantAdminLastName))
+ return false;
+ if (__isset.tenantAdminEmail != rhs.__isset.tenantAdminEmail)
+ return false;
+ else if (__isset.tenantAdminEmail && !(tenantAdminEmail == rhs.tenantAdminEmail))
+ return false;
+ return true;
+ }
+ bool operator != (const TenantPreferences &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const TenantPreferences & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+ virtual void printTo(std::ostream& out) const;
+};
+
+void swap(TenantPreferences &a, TenantPreferences &b);
+
+inline std::ostream& operator<<(std::ostream& out, const TenantPreferences& obj)
+{
+ obj.printTo(out);
+ return out;
+}
+
+typedef struct _TenantConfig__isset {
+ _TenantConfig__isset() : oauthClientId(false), oauthClientSecret(false), identityServerUserName(false), identityServerPasswordToken(false) {}
+ bool oauthClientId :1;
+ bool oauthClientSecret :1;
+ bool identityServerUserName :1;
+ bool identityServerPasswordToken :1;
+} _TenantConfig__isset;
+
+class TenantConfig {
+ public:
+
+ TenantConfig(const TenantConfig&);
+ TenantConfig& operator=(const TenantConfig&);
+ TenantConfig() : oauthClientId(), oauthClientSecret(), identityServerUserName(), identityServerPasswordToken() {
+ }
+
+ virtual ~TenantConfig() throw();
+ std::string oauthClientId;
+ std::string oauthClientSecret;
+ std::string identityServerUserName;
+ std::string identityServerPasswordToken;
+
+ _TenantConfig__isset __isset;
+
+ void __set_oauthClientId(const std::string& val);
+
+ void __set_oauthClientSecret(const std::string& val);
+
+ void __set_identityServerUserName(const std::string& val);
+
+ void __set_identityServerPasswordToken(const std::string& val);
+
+ bool operator == (const TenantConfig & rhs) const
+ {
+ if (__isset.oauthClientId != rhs.__isset.oauthClientId)
+ return false;
+ else if (__isset.oauthClientId && !(oauthClientId == rhs.oauthClientId))
+ return false;
+ if (__isset.oauthClientSecret != rhs.__isset.oauthClientSecret)
+ return false;
+ else if (__isset.oauthClientSecret && !(oauthClientSecret == rhs.oauthClientSecret))
+ return false;
+ if (__isset.identityServerUserName != rhs.__isset.identityServerUserName)
+ return false;
+ else if (__isset.identityServerUserName && !(identityServerUserName == rhs.identityServerUserName))
+ return false;
+ if (__isset.identityServerPasswordToken != rhs.__isset.identityServerPasswordToken)
+ return false;
+ else if (__isset.identityServerPasswordToken && !(identityServerPasswordToken == rhs.identityServerPasswordToken))
+ return false;
+ return true;
+ }
+ bool operator != (const TenantConfig &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const TenantConfig & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+ virtual void printTo(std::ostream& out) const;
+};
+
+void swap(TenantConfig &a, TenantConfig &b);
+
+inline std::ostream& operator<<(std::ostream& out, const TenantConfig& obj)
+{
+ obj.printTo(out);
+ return out;
+}
+
typedef struct _Tenant__isset {
- _Tenant__isset() : tenantName(false), domain(false), emailAddress(false), tenantAcronym(false), tenantURL(false), tenantPublicAbstract(false), reviewProposalDescription(false), tenantAdminFirstName(false), tenantAdminLastName(false), tenantAdminEmail(false), identityServerUserName(false), identityServerPasswordToken(false), declinedReason(false), oauthClientId(false), oauthClientSecret(false), requestCreationTime(false), requesterUsername(false) {}
+ _Tenant__isset() : tenantName(false), domain(false), emailAddress(false), tenantAcronym(false), tenantURL(false), tenantPublicAbstract(false), reviewProposalDescription(false), declinedReason(false), requestCreationTime(false), requesterUsername(false) {}
bool tenantName :1;
bool domain :1;
bool emailAddress :1;
@@ -62,14 +203,7 @@ typedef struct _Tenant__isset {
bool tenantURL :1;
bool tenantPublicAbstract :1;
bool reviewProposalDescription :1;
- bool tenantAdminFirstName :1;
- bool tenantAdminLastName :1;
- bool tenantAdminEmail :1;
- bool identityServerUserName :1;
- bool identityServerPasswordToken :1;
bool declinedReason :1;
- bool oauthClientId :1;
- bool oauthClientSecret :1;
bool requestCreationTime :1;
bool requesterUsername :1;
} _Tenant__isset;
@@ -79,7 +213,7 @@ class Tenant {
Tenant(const Tenant&);
Tenant& operator=(const Tenant&);
- Tenant() : tenantId(), tenantApprovalStatus((TenantApprovalStatus::type)0), tenantName(), domain(), emailAddress(), tenantAcronym(), tenantURL(), tenantPublicAbstract(), reviewProposalDescription(), tenantAdminFirstName(), tenantAdminLastName(), tenantAdminEmail(), identityServerUserName(), identityServerPasswordToken(), declinedReason(), oauthClientId(), oauthClientSecret(), requestCreationTime(0), requesterUsername() {
+ Tenant() : tenantId(), tenantApprovalStatus((TenantApprovalStatus::type)0), tenantName(), domain(), emailAddress(), tenantAcronym(), tenantURL(), tenantPublicAbstract(), reviewProposalDescription(), declinedReason(), requestCreationTime(0), requesterUsername() {
}
virtual ~Tenant() throw();
@@ -92,14 +226,7 @@ class Tenant {
std::string tenantURL;
std::string tenantPublicAbstract;
std::string reviewProposalDescription;
- std::string tenantAdminFirstName;
- std::string tenantAdminLastName;
- std::string tenantAdminEmail;
- std::string identityServerUserName;
- std::string identityServerPasswordToken;
std::string declinedReason;
- std::string oauthClientId;
- std::string oauthClientSecret;
int64_t requestCreationTime;
std::string requesterUsername;
@@ -123,22 +250,8 @@ class Tenant {
void __set_reviewProposalDescription(const std::string& val);
- void __set_tenantAdminFirstName(const std::string& val);
-
- void __set_tenantAdminLastName(const std::string& val);
-
- void __set_tenantAdminEmail(const std::string& val);
-
- void __set_identityServerUserName(const std::string& val);
-
- void __set_identityServerPasswordToken(const std::string& val);
-
void __set_declinedReason(const std::string& val);
- void __set_oauthClientId(const std::string& val);
-
- void __set_oauthClientSecret(const std::string& val);
-
void __set_requestCreationTime(const int64_t val);
void __set_requesterUsername(const std::string& val);
@@ -177,38 +290,10 @@ class Tenant {
return false;
else if (__isset.reviewProposalDescription && !(reviewProposalDescription == rhs.reviewProposalDescription))
return false;
- if (__isset.tenantAdminFirstName != rhs.__isset.tenantAdminFirstName)
- return false;
- else if (__isset.tenantAdminFirstName && !(tenantAdminFirstName == rhs.tenantAdminFirstName))
- return false;
- if (__isset.tenantAdminLastName != rhs.__isset.tenantAdminLastName)
- return false;
- else if (__isset.tenantAdminLastName && !(tenantAdminLastName == rhs.tenantAdminLastName))
- return false;
- if (__isset.tenantAdminEmail != rhs.__isset.tenantAdminEmail)
- return false;
- else if (__isset.tenantAdminEmail && !(tenantAdminEmail == rhs.tenantAdminEmail))
- return false;
- if (__isset.identityServerUserName != rhs.__isset.identityServerUserName)
- return false;
- else if (__isset.identityServerUserName && !(identityServerUserName == rhs.identityServerUserName))
- return false;
- if (__isset.identityServerPasswordToken != rhs.__isset.identityServerPasswordToken)
- return false;
- else if (__isset.identityServerPasswordToken && !(identityServerPasswordToken == rhs.identityServerPasswordToken))
- return false;
if (__isset.declinedReason != rhs.__isset.declinedReason)
return false;
else if (__isset.declinedReason && !(declinedReason == rhs.declinedReason))
return false;
- if (__isset.oauthClientId != rhs.__isset.oauthClientId)
- return false;
- else if (__isset.oauthClientId && !(oauthClientId == rhs.oauthClientId))
- return false;
- if (__isset.oauthClientSecret != rhs.__isset.oauthClientSecret)
- return false;
- else if (__isset.oauthClientSecret && !(oauthClientSecret == rhs.oauthClientSecret))
- return false;
if (__isset.requestCreationTime != rhs.__isset.requestCreationTime)
return false;
else if (__isset.requestCreationTime && !(requestCreationTime == rhs.requestCreationTime))
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp
index edd4822..6089cf6 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp
@@ -37,7 +37,8 @@ int _kGatewayApprovalStatusValues[] = {
GatewayApprovalStatus::DEACTIVATED,
GatewayApprovalStatus::CANCELLED,
GatewayApprovalStatus::DENIED,
- GatewayApprovalStatus::CREATED
+ GatewayApprovalStatus::CREATED,
+ GatewayApprovalStatus::DEPLOYED
};
const char* _kGatewayApprovalStatusNames[] = {
"REQUESTED",
@@ -46,9 +47,10 @@ const char* _kGatewayApprovalStatusNames[] = {
"DEACTIVATED",
"CANCELLED",
"DENIED",
- "CREATED"
+ "CREATED",
+ "DEPLOYED"
};
-const std::map<int, const char*> _GatewayApprovalStatus_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(7, _kGatewayApprovalStatusValues, _kGatewayApprovalStatusNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+const std::map<int, const char*> _GatewayApprovalStatus_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(8, _kGatewayApprovalStatusValues, _kGatewayApprovalStatusNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
int _kNotificationPriorityValues[] = {
NotificationPriority::LOW,
@@ -664,6 +666,11 @@ Gateway::~Gateway() throw() {
}
+void Gateway::__set_airavataInternalGatewayId(const std::string& val) {
+ this->airavataInternalGatewayId = val;
+__isset.airavataInternalGatewayId = true;
+}
+
void Gateway::__set_gatewayId(const std::string& val) {
this->gatewayId = val;
}
@@ -782,13 +789,21 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
{
case 1:
if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->airavataInternalGatewayId);
+ this->__isset.airavataInternalGatewayId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->gatewayId);
isset_gatewayId = true;
} else {
xfer += iprot->skip(ftype);
}
break;
- case 2:
+ case 3:
if (ftype == ::apache::thrift::protocol::T_I32) {
int32_t ecast18;
xfer += iprot->readI32(ecast18);
@@ -798,7 +813,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 3:
+ case 4:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->gatewayName);
this->__isset.gatewayName = true;
@@ -806,7 +821,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 4:
+ case 5:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->domain);
this->__isset.domain = true;
@@ -814,7 +829,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 5:
+ case 6:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->emailAddress);
this->__isset.emailAddress = true;
@@ -822,7 +837,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 6:
+ case 7:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->gatewayAcronym);
this->__isset.gatewayAcronym = true;
@@ -830,7 +845,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 7:
+ case 8:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->gatewayURL);
this->__isset.gatewayURL = true;
@@ -838,7 +853,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 8:
+ case 9:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->gatewayPublicAbstract);
this->__isset.gatewayPublicAbstract = true;
@@ -846,7 +861,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 9:
+ case 10:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->reviewProposalDescription);
this->__isset.reviewProposalDescription = true;
@@ -854,7 +869,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 10:
+ case 11:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->gatewayAdminFirstName);
this->__isset.gatewayAdminFirstName = true;
@@ -862,7 +877,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 11:
+ case 12:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->gatewayAdminLastName);
this->__isset.gatewayAdminLastName = true;
@@ -870,7 +885,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 12:
+ case 13:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->gatewayAdminEmail);
this->__isset.gatewayAdminEmail = true;
@@ -878,7 +893,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 13:
+ case 14:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->identityServerUserName);
this->__isset.identityServerUserName = true;
@@ -886,7 +901,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 14:
+ case 15:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->identityServerPasswordToken);
this->__isset.identityServerPasswordToken = true;
@@ -894,7 +909,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 15:
+ case 16:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->declinedReason);
this->__isset.declinedReason = true;
@@ -902,7 +917,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 16:
+ case 17:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->oauthClientId);
this->__isset.oauthClientId = true;
@@ -910,7 +925,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 17:
+ case 18:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->oauthClientSecret);
this->__isset.oauthClientSecret = true;
@@ -918,7 +933,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 18:
+ case 19:
if (ftype == ::apache::thrift::protocol::T_I64) {
xfer += iprot->readI64(this->requestCreationTime);
this->__isset.requestCreationTime = true;
@@ -926,7 +941,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 19:
+ case 20:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->requesterUsername);
this->__isset.requesterUsername = true;
@@ -955,96 +970,101 @@ uint32_t Gateway::write(::apache::thrift::protocol::TProtocol* oprot) const {
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
xfer += oprot->writeStructBegin("Gateway");
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 1);
+ if (this->__isset.airavataInternalGatewayId) {
+ xfer += oprot->writeFieldBegin("airavataInternalGatewayId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->airavataInternalGatewayId);
+ xfer += oprot->writeFieldEnd();
+ }
+ xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString(this->gatewayId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("gatewayApprovalStatus", ::apache::thrift::protocol::T_I32, 2);
+ xfer += oprot->writeFieldBegin("gatewayApprovalStatus", ::apache::thrift::protocol::T_I32, 3);
xfer += oprot->writeI32((int32_t)this->gatewayApprovalStatus);
xfer += oprot->writeFieldEnd();
if (this->__isset.gatewayName) {
- xfer += oprot->writeFieldBegin("gatewayName", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeFieldBegin("gatewayName", ::apache::thrift::protocol::T_STRING, 4);
xfer += oprot->writeString(this->gatewayName);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.domain) {
- xfer += oprot->writeFieldBegin("domain", ::apache::thrift::protocol::T_STRING, 4);
+ xfer += oprot->writeFieldBegin("domain", ::apache::thrift::protocol::T_STRING, 5);
xfer += oprot->writeString(this->domain);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.emailAddress) {
- xfer += oprot->writeFieldBegin("emailAddress", ::apache::thrift::protocol::T_STRING, 5);
+ xfer += oprot->writeFieldBegin("emailAddress", ::apache::thrift::protocol::T_STRING, 6);
xfer += oprot->writeString(this->emailAddress);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.gatewayAcronym) {
- xfer += oprot->writeFieldBegin("gatewayAcronym", ::apache::thrift::protocol::T_STRING, 6);
+ xfer += oprot->writeFieldBegin("gatewayAcronym", ::apache::thrift::protocol::T_STRING, 7);
xfer += oprot->writeString(this->gatewayAcronym);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.gatewayURL) {
- xfer += oprot->writeFieldBegin("gatewayURL", ::apache::thrift::protocol::T_STRING, 7);
+ xfer += oprot->writeFieldBegin("gatewayURL", ::apache::thrift::protocol::T_STRING, 8);
xfer += oprot->writeString(this->gatewayURL);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.gatewayPublicAbstract) {
- xfer += oprot->writeFieldBegin("gatewayPublicAbstract", ::apache::thrift::protocol::T_STRING, 8);
+ xfer += oprot->writeFieldBegin("gatewayPublicAbstract", ::apache::thrift::protocol::T_STRING, 9);
xfer += oprot->writeString(this->gatewayPublicAbstract);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.reviewProposalDescription) {
- xfer += oprot->writeFieldBegin("reviewProposalDescription", ::apache::thrift::protocol::T_STRING, 9);
+ xfer += oprot->writeFieldBegin("reviewProposalDescription", ::apache::thrift::protocol::T_STRING, 10);
xfer += oprot->writeString(this->reviewProposalDescription);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.gatewayAdminFirstName) {
- xfer += oprot->writeFieldBegin("gatewayAdminFirstName", ::apache::thrift::protocol::T_STRING, 10);
+ xfer += oprot->writeFieldBegin("gatewayAdminFirstName", ::apache::thrift::protocol::T_STRING, 11);
xfer += oprot->writeString(this->gatewayAdminFirstName);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.gatewayAdminLastName) {
- xfer += oprot->writeFieldBegin("gatewayAdminLastName", ::apache::thrift::protocol::T_STRING, 11);
+ xfer += oprot->writeFieldBegin("gatewayAdminLastName", ::apache::thrift::protocol::T_STRING, 12);
xfer += oprot->writeString(this->gatewayAdminLastName);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.gatewayAdminEmail) {
- xfer += oprot->writeFieldBegin("gatewayAdminEmail", ::apache::thrift::protocol::T_STRING, 12);
+ xfer += oprot->writeFieldBegin("gatewayAdminEmail", ::apache::thrift::protocol::T_STRING, 13);
xfer += oprot->writeString(this->gatewayAdminEmail);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.identityServerUserName) {
- xfer += oprot->writeFieldBegin("identityServerUserName", ::apache::thrift::protocol::T_STRING, 13);
+ xfer += oprot->writeFieldBegin("identityServerUserName", ::apache::thrift::protocol::T_STRING, 14);
xfer += oprot->writeString(this->identityServerUserName);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.identityServerPasswordToken) {
- xfer += oprot->writeFieldBegin("identityServerPasswordToken", ::apache::thrift::protocol::T_STRING, 14);
+ xfer += oprot->writeFieldBegin("identityServerPasswordToken", ::apache::thrift::protocol::T_STRING, 15);
xfer += oprot->writeString(this->identityServerPasswordToken);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.declinedReason) {
- xfer += oprot->writeFieldBegin("declinedReason", ::apache::thrift::protocol::T_STRING, 15);
+ xfer += oprot->writeFieldBegin("declinedReason", ::apache::thrift::protocol::T_STRING, 16);
xfer += oprot->writeString(this->declinedReason);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.oauthClientId) {
- xfer += oprot->writeFieldBegin("oauthClientId", ::apache::thrift::protocol::T_STRING, 16);
+ xfer += oprot->writeFieldBegin("oauthClientId", ::apache::thrift::protocol::T_STRING, 17);
xfer += oprot->writeString(this->oauthClientId);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.oauthClientSecret) {
- xfer += oprot->writeFieldBegin("oauthClientSecret", ::apache::thrift::protocol::T_STRING, 17);
+ xfer += oprot->writeFieldBegin("oauthClientSecret", ::apache::thrift::protocol::T_STRING, 18);
xfer += oprot->writeString(this->oauthClientSecret);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.requestCreationTime) {
- xfer += oprot->writeFieldBegin("requestCreationTime", ::apache::thrift::protocol::T_I64, 18);
+ xfer += oprot->writeFieldBegin("requestCreationTime", ::apache::thrift::protocol::T_I64, 19);
xfer += oprot->writeI64(this->requestCreationTime);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.requesterUsername) {
- xfer += oprot->writeFieldBegin("requesterUsername", ::apache::thrift::protocol::T_STRING, 19);
+ xfer += oprot->writeFieldBegin("requesterUsername", ::apache::thrift::protocol::T_STRING, 20);
xfer += oprot->writeString(this->requesterUsername);
xfer += oprot->writeFieldEnd();
}
@@ -1055,6 +1075,7 @@ uint32_t Gateway::write(::apache::thrift::protocol::TProtocol* oprot) const {
void swap(Gateway &a, Gateway &b) {
using ::std::swap;
+ swap(a.airavataInternalGatewayId, b.airavataInternalGatewayId);
swap(a.gatewayId, b.gatewayId);
swap(a.gatewayApprovalStatus, b.gatewayApprovalStatus);
swap(a.gatewayName, b.gatewayName);
@@ -1078,6 +1099,7 @@ void swap(Gateway &a, Gateway &b) {
}
Gateway::Gateway(const Gateway& other19) {
+ airavataInternalGatewayId = other19.airavataInternalGatewayId;
gatewayId = other19.gatewayId;
gatewayApprovalStatus = other19.gatewayApprovalStatus;
gatewayName = other19.gatewayName;
@@ -1100,6 +1122,7 @@ Gateway::Gateway(const Gateway& other19) {
__isset = other19.__isset;
}
Gateway& Gateway::operator=(const Gateway& other20) {
+ airavataInternalGatewayId = other20.airavataInternalGatewayId;
gatewayId = other20.gatewayId;
gatewayApprovalStatus = other20.gatewayApprovalStatus;
gatewayName = other20.gatewayName;
@@ -1125,7 +1148,8 @@ Gateway& Gateway::operator=(const Gateway& other20) {
void Gateway::printTo(std::ostream& out) const {
using ::apache::thrift::to_string;
out << "Gateway(";
- out << "gatewayId=" << to_string(gatewayId);
+ out << "airavataInternalGatewayId="; (__isset.airavataInternalGatewayId ? (out << to_string(airavataInternalGatewayId)) : (out << "<null>"));
+ out << ", " << "gatewayId=" << to_string(gatewayId);
out << ", " << "gatewayApprovalStatus=" << to_string(gatewayApprovalStatus);
out << ", " << "gatewayName="; (__isset.gatewayName ? (out << to_string(gatewayName)) : (out << "<null>"));
out << ", " << "domain="; (__isset.domain ? (out << to_string(domain)) : (out << "<null>"));
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h
index d6db351..ecbf553 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h
@@ -45,7 +45,8 @@ struct GatewayApprovalStatus {
DEACTIVATED = 3,
CANCELLED = 4,
DENIED = 5,
- CREATED = 6
+ CREATED = 6,
+ DEPLOYED = 7
};
};
@@ -299,7 +300,8 @@ inline std::ostream& operator<<(std::ostream& out, const User& obj)
}
typedef struct _Gateway__isset {
- _Gateway__isset() : gatewayName(false), domain(false), emailAddress(false), gatewayAcronym(false), gatewayURL(false), gatewayPublicAbstract(false), reviewProposalDescription(false), gatewayAdminFirstName(false), gatewayAdminLastName(false), gatewayAdminEmail(false), identityServerUserName(false), identityServerPasswordToken(false), declinedReason(false), oauthClientId(false), oauthClientSecret(false), requestCreationTime(false), requesterUsername(false) {}
+ _Gateway__isset() : airavataInternalGatewayId(false), gatewayName(false), domain(false), emailAddress(false), gatewayAcronym(false), gatewayURL(false), gatewayPublicAbstract(false), reviewProposalDescription(false), gatewayAdminFirstName(false), gatewayAdminLastName(false), gatewayAdminEmail(false), identityServerUserName(false), identityServerPasswordToken(false), declinedReason(false), oauthClientId(false), oauthClientSecret(false), requestCreationTime(false), requesterUsername(false) {}
+ bool airavataInternalGatewayId :1;
bool gatewayName :1;
bool domain :1;
bool emailAddress :1;
@@ -324,10 +326,11 @@ class Gateway {
Gateway(const Gateway&);
Gateway& operator=(const Gateway&);
- Gateway() : gatewayId(), gatewayApprovalStatus((GatewayApprovalStatus::type)0), gatewayName(), domain(), emailAddress(), gatewayAcronym(), gatewayURL(), gatewayPublicAbstract(), reviewProposalDescription(), gatewayAdminFirstName(), gatewayAdminLastName(), gatewayAdminEmail(), identityServerUserName(), identityServerPasswordToken(), declinedReason(), oauthClientId(), oauthClientSecret(), requestCreationTime(0), requesterUsername() {
+ Gateway() : airavataInternalGatewayId(), gatewayId(), gatewayApprovalStatus((GatewayApprovalStatus::type)0), gatewayName(), domain(), emailAddress(), gatewayAcronym(), gatewayURL(), gatewayPublicAbstract(), reviewProposalDescription(), gatewayAdminFirstName(), gatewayAdminLastName(), gatewayAdminEmail(), identityServerUserName(), identityServerPasswordToken(), declinedReason(), oauthClientId(), oauthClientSecret(), requestCreationTime(0), requesterUsername() {
}
virtual ~Gateway() throw();
+ std::string airavataInternalGatewayId;
std::string gatewayId;
GatewayApprovalStatus::type gatewayApprovalStatus;
std::string gatewayName;
@@ -350,6 +353,8 @@ class Gateway {
_Gateway__isset __isset;
+ void __set_airavataInternalGatewayId(const std::string& val);
+
void __set_gatewayId(const std::string& val);
void __set_gatewayApprovalStatus(const GatewayApprovalStatus::type val);
@@ -390,6 +395,10 @@ class Gateway {
bool operator == (const Gateway & rhs) const
{
+ if (__isset.airavataInternalGatewayId != rhs.__isset.airavataInternalGatewayId)
+ return false;
+ else if (__isset.airavataInternalGatewayId && !(airavataInternalGatewayId == rhs.airavataInternalGatewayId))
+ return false;
if (!(gatewayId == rhs.gatewayId))
return false;
if (!(gatewayApprovalStatus == rhs.gatewayApprovalStatus))
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/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 ae27035..18bfcf5 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
@@ -4045,7 +4045,7 @@ interface AiravataIf {
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param \Airavata\Model\Group\GroupModel $groupModel
- * @return bool
+ * @return string
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
@@ -4066,14 +4066,13 @@ interface AiravataIf {
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $groupId
* @param string $ownerId
- * @param string $gatewayId
* @return bool
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function deleteGroup(\Airavata\Model\Security\AuthzToken $authzToken, $groupId, $ownerId, $gatewayId);
+ public function deleteGroup(\Airavata\Model\Security\AuthzToken $authzToken, $groupId, $ownerId);
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $groupId
@@ -4087,14 +4086,13 @@ interface AiravataIf {
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $userName
- * @param string $gatewayId
* @return \Airavata\Model\Group\GroupModel[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function getAllGroupsUserBelongs(\Airavata\Model\Security\AuthzToken $authzToken, $userName, $gatewayId);
+ public function getAllGroupsUserBelongs(\Airavata\Model\Security\AuthzToken $authzToken, $userName);
}
class AiravataClient implements \Airavata\API\AiravataIf {
@@ -14860,19 +14858,18 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("updateGroup failed: unknown result");
}
- public function deleteGroup(\Airavata\Model\Security\AuthzToken $authzToken, $groupId, $ownerId, $gatewayId)
+ public function deleteGroup(\Airavata\Model\Security\AuthzToken $authzToken, $groupId, $ownerId)
{
- $this->send_deleteGroup($authzToken, $groupId, $ownerId, $gatewayId);
+ $this->send_deleteGroup($authzToken, $groupId, $ownerId);
return $this->recv_deleteGroup();
}
- public function send_deleteGroup(\Airavata\Model\Security\AuthzToken $authzToken, $groupId, $ownerId, $gatewayId)
+ public function send_deleteGroup(\Airavata\Model\Security\AuthzToken $authzToken, $groupId, $ownerId)
{
$args = new \Airavata\API\Airavata_deleteGroup_args();
$args->authzToken = $authzToken;
$args->groupId = $groupId;
$args->ownerId = $ownerId;
- $args->gatewayId = $gatewayId;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
@@ -14990,18 +14987,17 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getGroup failed: unknown result");
}
- public function getAllGroupsUserBelongs(\Airavata\Model\Security\AuthzToken $authzToken, $userName, $gatewayId)
+ public function getAllGroupsUserBelongs(\Airavata\Model\Security\AuthzToken $authzToken, $userName)
{
- $this->send_getAllGroupsUserBelongs($authzToken, $userName, $gatewayId);
+ $this->send_getAllGroupsUserBelongs($authzToken, $userName);
return $this->recv_getAllGroupsUserBelongs();
}
- public function send_getAllGroupsUserBelongs(\Airavata\Model\Security\AuthzToken $authzToken, $userName, $gatewayId)
+ public function send_getAllGroupsUserBelongs(\Airavata\Model\Security\AuthzToken $authzToken, $userName)
{
$args = new \Airavata\API\Airavata_getAllGroupsUserBelongs_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)
{
@@ -65533,7 +65529,7 @@ class Airavata_createGroup_result {
static $_TSPEC;
/**
- * @var bool
+ * @var string
*/
public $success = null;
/**
@@ -65558,7 +65554,7 @@ class Airavata_createGroup_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::BOOL,
+ 'type' => TType::STRING,
),
1 => array(
'var' => 'ire',
@@ -65621,8 +65617,8 @@ class Airavata_createGroup_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->success);
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->success);
} else {
$xfer += $input->skip($ftype);
}
@@ -65673,8 +65669,8 @@ class Airavata_createGroup_result {
$xfer = 0;
$xfer += $output->writeStructBegin('Airavata_createGroup_result');
if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
- $xfer += $output->writeBool($this->success);
+ $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
+ $xfer += $output->writeString($this->success);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -66002,10 +65998,6 @@ class Airavata_deleteGroup_args {
* @var string
*/
public $ownerId = null;
- /**
- * @var string
- */
- public $gatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -66023,10 +66015,6 @@ class Airavata_deleteGroup_args {
'var' => 'ownerId',
'type' => TType::STRING,
),
- 4 => array(
- 'var' => 'gatewayId',
- 'type' => TType::STRING,
- ),
);
}
if (is_array($vals)) {
@@ -66039,9 +66027,6 @@ class Airavata_deleteGroup_args {
if (isset($vals['ownerId'])) {
$this->ownerId = $vals['ownerId'];
}
- if (isset($vals['gatewayId'])) {
- $this->gatewayId = $vals['gatewayId'];
- }
}
}
@@ -66086,13 +66071,6 @@ class Airavata_deleteGroup_args {
$xfer += $input->skip($ftype);
}
break;
- case 4:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -66124,11 +66102,6 @@ class Airavata_deleteGroup_args {
$xfer += $output->writeString($this->ownerId);
$xfer += $output->writeFieldEnd();
}
- if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 4);
- $xfer += $output->writeString($this->gatewayId);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -66605,10 +66578,6 @@ class Airavata_getAllGroupsUserBelongs_args {
* @var string
*/
public $userName = null;
- /**
- * @var string
- */
- public $gatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -66622,10 +66591,6 @@ class Airavata_getAllGroupsUserBelongs_args {
'var' => 'userName',
'type' => TType::STRING,
),
- 3 => array(
- 'var' => 'gatewayId',
- 'type' => TType::STRING,
- ),
);
}
if (is_array($vals)) {
@@ -66635,9 +66600,6 @@ class Airavata_getAllGroupsUserBelongs_args {
if (isset($vals['userName'])) {
$this->userName = $vals['userName'];
}
- if (isset($vals['gatewayId'])) {
- $this->gatewayId = $vals['gatewayId'];
- }
}
}
@@ -66675,13 +66637,6 @@ class Airavata_getAllGroupsUserBelongs_args {
$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;
@@ -66708,11 +66663,6 @@ class Airavata_getAllGroupsUserBelongs_args {
$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;
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Tenant/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Tenant/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Tenant/Types.php
index b217adf..c1ad4ec 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Tenant/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Tenant/Types.php
@@ -38,77 +38,314 @@ final class TenantApprovalStatus {
);
}
-class Tenant {
+class TenantPreferences {
static $_TSPEC;
/**
* @var string
*/
- public $tenantId = null;
+ public $tenantAdminFirstName = null;
/**
- * @var int
+ * @var string
*/
- public $tenantApprovalStatus = null;
+ public $tenantAdminLastName = null;
/**
* @var string
*/
- public $tenantName = null;
+ public $tenantAdminEmail = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 10 => array(
+ 'var' => 'tenantAdminFirstName',
+ 'type' => TType::STRING,
+ ),
+ 11 => array(
+ 'var' => 'tenantAdminLastName',
+ 'type' => TType::STRING,
+ ),
+ 12 => array(
+ 'var' => 'tenantAdminEmail',
+ 'type' => TType::STRING,
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['tenantAdminFirstName'])) {
+ $this->tenantAdminFirstName = $vals['tenantAdminFirstName'];
+ }
+ if (isset($vals['tenantAdminLastName'])) {
+ $this->tenantAdminLastName = $vals['tenantAdminLastName'];
+ }
+ if (isset($vals['tenantAdminEmail'])) {
+ $this->tenantAdminEmail = $vals['tenantAdminEmail'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'TenantPreferences';
+ }
+
+ 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 10:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->tenantAdminFirstName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 11:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->tenantAdminLastName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 12:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->tenantAdminEmail);
+ } 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('TenantPreferences');
+ if ($this->tenantAdminFirstName !== null) {
+ $xfer += $output->writeFieldBegin('tenantAdminFirstName', TType::STRING, 10);
+ $xfer += $output->writeString($this->tenantAdminFirstName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->tenantAdminLastName !== null) {
+ $xfer += $output->writeFieldBegin('tenantAdminLastName', TType::STRING, 11);
+ $xfer += $output->writeString($this->tenantAdminLastName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->tenantAdminEmail !== null) {
+ $xfer += $output->writeFieldBegin('tenantAdminEmail', TType::STRING, 12);
+ $xfer += $output->writeString($this->tenantAdminEmail);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class TenantConfig {
+ static $_TSPEC;
+
/**
* @var string
*/
- public $domain = null;
+ public $oauthClientId = null;
/**
* @var string
*/
- public $emailAddress = null;
+ public $oauthClientSecret = null;
/**
* @var string
*/
- public $tenantAcronym = null;
+ public $identityServerUserName = null;
/**
* @var string
*/
- public $tenantURL = null;
+ public $identityServerPasswordToken = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 16 => array(
+ 'var' => 'oauthClientId',
+ 'type' => TType::STRING,
+ ),
+ 17 => array(
+ 'var' => 'oauthClientSecret',
+ 'type' => TType::STRING,
+ ),
+ 13 => array(
+ 'var' => 'identityServerUserName',
+ 'type' => TType::STRING,
+ ),
+ 14 => array(
+ 'var' => 'identityServerPasswordToken',
+ 'type' => TType::STRING,
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['oauthClientId'])) {
+ $this->oauthClientId = $vals['oauthClientId'];
+ }
+ if (isset($vals['oauthClientSecret'])) {
+ $this->oauthClientSecret = $vals['oauthClientSecret'];
+ }
+ if (isset($vals['identityServerUserName'])) {
+ $this->identityServerUserName = $vals['identityServerUserName'];
+ }
+ if (isset($vals['identityServerPasswordToken'])) {
+ $this->identityServerPasswordToken = $vals['identityServerPasswordToken'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'TenantConfig';
+ }
+
+ 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 16:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->oauthClientId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 17:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->oauthClientSecret);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 13:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->identityServerUserName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 14:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->identityServerPasswordToken);
+ } 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('TenantConfig');
+ if ($this->identityServerUserName !== null) {
+ $xfer += $output->writeFieldBegin('identityServerUserName', TType::STRING, 13);
+ $xfer += $output->writeString($this->identityServerUserName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->identityServerPasswordToken !== null) {
+ $xfer += $output->writeFieldBegin('identityServerPasswordToken', TType::STRING, 14);
+ $xfer += $output->writeString($this->identityServerPasswordToken);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->oauthClientId !== null) {
+ $xfer += $output->writeFieldBegin('oauthClientId', TType::STRING, 16);
+ $xfer += $output->writeString($this->oauthClientId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->oauthClientSecret !== null) {
+ $xfer += $output->writeFieldBegin('oauthClientSecret', TType::STRING, 17);
+ $xfer += $output->writeString($this->oauthClientSecret);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Tenant {
+ static $_TSPEC;
+
/**
* @var string
*/
- public $tenantPublicAbstract = null;
+ public $tenantId = null;
/**
- * @var string
+ * @var int
*/
- public $reviewProposalDescription = null;
+ public $tenantApprovalStatus = null;
/**
* @var string
*/
- public $tenantAdminFirstName = null;
+ public $tenantName = null;
/**
* @var string
*/
- public $tenantAdminLastName = null;
+ public $domain = null;
/**
* @var string
*/
- public $tenantAdminEmail = null;
+ public $emailAddress = null;
/**
* @var string
*/
- public $identityServerUserName = null;
+ public $tenantAcronym = null;
/**
* @var string
*/
- public $identityServerPasswordToken = null;
+ public $tenantURL = null;
/**
* @var string
*/
- public $declinedReason = null;
+ public $tenantPublicAbstract = null;
/**
* @var string
*/
- public $oauthClientId = null;
+ public $reviewProposalDescription = null;
/**
* @var string
*/
- public $oauthClientSecret = null;
+ public $declinedReason = null;
/**
* @var int
*/
@@ -157,38 +394,10 @@ class Tenant {
'var' => 'reviewProposalDescription',
'type' => TType::STRING,
),
- 10 => array(
- 'var' => 'tenantAdminFirstName',
- 'type' => TType::STRING,
- ),
- 11 => array(
- 'var' => 'tenantAdminLastName',
- 'type' => TType::STRING,
- ),
- 12 => array(
- 'var' => 'tenantAdminEmail',
- 'type' => TType::STRING,
- ),
- 13 => array(
- 'var' => 'identityServerUserName',
- 'type' => TType::STRING,
- ),
- 14 => array(
- 'var' => 'identityServerPasswordToken',
- 'type' => TType::STRING,
- ),
15 => array(
'var' => 'declinedReason',
'type' => TType::STRING,
),
- 16 => array(
- 'var' => 'oauthClientId',
- 'type' => TType::STRING,
- ),
- 17 => array(
- 'var' => 'oauthClientSecret',
- 'type' => TType::STRING,
- ),
18 => array(
'var' => 'requestCreationTime',
'type' => TType::I64,
@@ -227,30 +436,9 @@ class Tenant {
if (isset($vals['reviewProposalDescription'])) {
$this->reviewProposalDescription = $vals['reviewProposalDescription'];
}
- if (isset($vals['tenantAdminFirstName'])) {
- $this->tenantAdminFirstName = $vals['tenantAdminFirstName'];
- }
- if (isset($vals['tenantAdminLastName'])) {
- $this->tenantAdminLastName = $vals['tenantAdminLastName'];
- }
- if (isset($vals['tenantAdminEmail'])) {
- $this->tenantAdminEmail = $vals['tenantAdminEmail'];
- }
- if (isset($vals['identityServerUserName'])) {
- $this->identityServerUserName = $vals['identityServerUserName'];
- }
- if (isset($vals['identityServerPasswordToken'])) {
- $this->identityServerPasswordToken = $vals['identityServerPasswordToken'];
- }
if (isset($vals['declinedReason'])) {
$this->declinedReason = $vals['declinedReason'];
}
- if (isset($vals['oauthClientId'])) {
- $this->oauthClientId = $vals['oauthClientId'];
- }
- if (isset($vals['oauthClientSecret'])) {
- $this->oauthClientSecret = $vals['oauthClientSecret'];
- }
if (isset($vals['requestCreationTime'])) {
$this->requestCreationTime = $vals['requestCreationTime'];
}
@@ -342,41 +530,6 @@ class Tenant {
$xfer += $input->skip($ftype);
}
break;
- case 10:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->tenantAdminFirstName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 11:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->tenantAdminLastName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 12:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->tenantAdminEmail);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 13:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->identityServerUserName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 14:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->identityServerPasswordToken);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
case 15:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->declinedReason);
@@ -384,20 +537,6 @@ class Tenant {
$xfer += $input->skip($ftype);
}
break;
- case 16:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->oauthClientId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 17:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->oauthClientSecret);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
case 18:
if ($ftype == TType::I64) {
$xfer += $input->readI64($this->requestCreationTime);
@@ -470,46 +609,11 @@ class Tenant {
$xfer += $output->writeString($this->reviewProposalDescription);
$xfer += $output->writeFieldEnd();
}
- if ($this->tenantAdminFirstName !== null) {
- $xfer += $output->writeFieldBegin('tenantAdminFirstName', TType::STRING, 10);
- $xfer += $output->writeString($this->tenantAdminFirstName);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->tenantAdminLastName !== null) {
- $xfer += $output->writeFieldBegin('tenantAdminLastName', TType::STRING, 11);
- $xfer += $output->writeString($this->tenantAdminLastName);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->tenantAdminEmail !== null) {
- $xfer += $output->writeFieldBegin('tenantAdminEmail', TType::STRING, 12);
- $xfer += $output->writeString($this->tenantAdminEmail);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->identityServerUserName !== null) {
- $xfer += $output->writeFieldBegin('identityServerUserName', TType::STRING, 13);
- $xfer += $output->writeString($this->identityServerUserName);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->identityServerPasswordToken !== null) {
- $xfer += $output->writeFieldBegin('identityServerPasswordToken', TType::STRING, 14);
- $xfer += $output->writeString($this->identityServerPasswordToken);
- $xfer += $output->writeFieldEnd();
- }
if ($this->declinedReason !== null) {
$xfer += $output->writeFieldBegin('declinedReason', TType::STRING, 15);
$xfer += $output->writeString($this->declinedReason);
$xfer += $output->writeFieldEnd();
}
- if ($this->oauthClientId !== null) {
- $xfer += $output->writeFieldBegin('oauthClientId', TType::STRING, 16);
- $xfer += $output->writeString($this->oauthClientId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->oauthClientSecret !== null) {
- $xfer += $output->writeFieldBegin('oauthClientSecret', TType::STRING, 17);
- $xfer += $output->writeString($this->oauthClientSecret);
- $xfer += $output->writeFieldEnd();
- }
if ($this->requestCreationTime !== null) {
$xfer += $output->writeFieldBegin('requestCreationTime', TType::I64, 18);
$xfer += $output->writeI64($this->requestCreationTime);
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/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 96f0e6f..6e93167 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
@@ -188,17 +188,11 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
print(' bool shareResourceWithUsers(AuthzToken authzToken, string resourceId, ResourceType resourceType, userPermissionList)')
print(' bool revokeSharingOfResourceFromUsers(AuthzToken authzToken, string resourceId, ResourceType resourceType, userPermissionList)')
print(' getAllAccessibleUsers(AuthzToken authzToken, string resourceId, ResourceType resourceType, ResourcePermissionType permissionType)')
- print(' bool createGroup(AuthzToken authzToken, GroupModel groupModel)')
+ print(' string createGroup(AuthzToken authzToken, GroupModel groupModel)')
print(' bool updateGroup(AuthzToken authzToken, GroupModel groupModel)')
- print(' bool deleteGroup(AuthzToken authzToken, string groupId, string ownerId, string gatewayId)')
+ print(' bool deleteGroup(AuthzToken authzToken, string groupId, string ownerId)')
print(' GroupModel getGroup(AuthzToken authzToken, string groupId)')
- print(' getAllGroupsUserBelongs(AuthzToken authzToken, string userName, string gatewayId)')
- print(' string addUserProfile(AuthzToken authzToken, UserProfile userProfile)')
- print(' bool updateUserProfile(AuthzToken authzToken, UserProfile userProfile)')
- 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(' bool doesUserProfileExist(AuthzToken authzToken, string userId, string gatewayId)')
+ print(' getAllGroupsUserBelongs(AuthzToken authzToken, string userName)')
print('')
sys.exit(0)
@@ -1252,10 +1246,10 @@ elif cmd == 'updateGroup':
pp.pprint(client.updateGroup(eval(args[0]),eval(args[1]),))
elif cmd == 'deleteGroup':
- if len(args) != 4:
- print('deleteGroup requires 4 args')
+ if len(args) != 3:
+ print('deleteGroup requires 3 args')
sys.exit(1)
- pp.pprint(client.deleteGroup(eval(args[0]),args[1],args[2],args[3],))
+ pp.pprint(client.deleteGroup(eval(args[0]),args[1],args[2],))
elif cmd == 'getGroup':
if len(args) != 2:
@@ -1264,46 +1258,10 @@ elif cmd == 'getGroup':
pp.pprint(client.getGroup(eval(args[0]),args[1],))
elif cmd == 'getAllGroupsUserBelongs':
- if len(args) != 3:
- print('getAllGroupsUserBelongs requires 3 args')
- sys.exit(1)
- pp.pprint(client.getAllGroupsUserBelongs(eval(args[0]),args[1],args[2],))
-
-elif cmd == 'addUserProfile':
- if len(args) != 2:
- print('addUserProfile requires 2 args')
- sys.exit(1)
- pp.pprint(client.addUserProfile(eval(args[0]),eval(args[1]),))
-
-elif cmd == 'updateUserProfile':
- if len(args) != 2:
- print('updateUserProfile requires 2 args')
- sys.exit(1)
- pp.pprint(client.updateUserProfile(eval(args[0]),eval(args[1]),))
-
-elif cmd == 'getUserProfileById':
- if len(args) != 3:
- print('getUserProfileById requires 3 args')
- sys.exit(1)
- pp.pprint(client.getUserProfileById(eval(args[0]),args[1],args[2],))
-
-elif cmd == 'deleteUserProfile':
if len(args) != 2:
- print('deleteUserProfile requires 2 args')
- sys.exit(1)
- pp.pprint(client.deleteUserProfile(eval(args[0]),args[1],))
-
-elif cmd == 'getAllUserProfilesInGateway':
- if len(args) != 4:
- print('getAllUserProfilesInGateway requires 4 args')
- sys.exit(1)
- pp.pprint(client.getAllUserProfilesInGateway(eval(args[0]),args[1],eval(args[2]),eval(args[3]),))
-
-elif cmd == 'doesUserProfileExist':
- if len(args) != 3:
- print('doesUserProfileExist requires 3 args')
+ print('getAllGroupsUserBelongs requires 2 args')
sys.exit(1)
- pp.pprint(client.doesUserProfileExist(eval(args[0]),args[1],args[2],))
+ pp.pprint(client.getAllGroupsUserBelongs(eval(args[0]),args[1],))
else:
print('Unrecognized method %s' % cmd)