http://git-wip-us.apache.org/repos/asf/airavata/blob/325d1630/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
 
b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
index ebcf3b8..278781b 100644
--- 
a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
+++ 
b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
@@ -4494,11 +4494,11 @@ uint32_t 
Airavata_generateAndRegisterSSHKeys_presult::read(::apache::thrift::pro
 }
 
 
-Airavata_registerPwdCredential_args::~Airavata_registerPwdCredential_args() 
throw() {
+Airavata_generateAndRegisterSSHKeysWithDescription_args::~Airavata_generateAndRegisterSSHKeysWithDescription_args()
 throw() {
 }
 
 
-uint32_t 
Airavata_registerPwdCredential_args::read(::apache::thrift::protocol::TProtocol*
 iprot) {
+uint32_t 
Airavata_generateAndRegisterSSHKeysWithDescription_args::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -4512,9 +4512,7 @@ uint32_t 
Airavata_registerPwdCredential_args::read(::apache::thrift::protocol::T
 
   bool isset_authzToken = false;
   bool isset_gatewayId = false;
-  bool isset_portalUserName = false;
-  bool isset_loginUserName = false;
-  bool isset_password = false;
+  bool isset_userName = false;
   bool isset_description = false;
 
   while (true)
@@ -4543,30 +4541,14 @@ uint32_t 
Airavata_registerPwdCredential_args::read(::apache::thrift::protocol::T
         break;
       case 3:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->portalUserName);
-          isset_portalUserName = true;
+          xfer += iprot->readString(this->userName);
+          isset_userName = true;
         } else {
           xfer += iprot->skip(ftype);
         }
         break;
       case 4:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->loginUserName);
-          isset_loginUserName = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 5:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->password);
-          isset_password = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 6:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
           xfer += iprot->readString(this->description);
           isset_description = true;
         } else {
@@ -4586,21 +4568,17 @@ uint32_t 
Airavata_registerPwdCredential_args::read(::apache::thrift::protocol::T
     throw TProtocolException(TProtocolException::INVALID_DATA);
   if (!isset_gatewayId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_portalUserName)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_loginUserName)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_password)
+  if (!isset_userName)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   if (!isset_description)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
-uint32_t 
Airavata_registerPwdCredential_args::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
+uint32_t 
Airavata_generateAndRegisterSSHKeysWithDescription_args::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_registerPwdCredential_args");
+  xfer += 
oprot->writeStructBegin("Airavata_generateAndRegisterSSHKeysWithDescription_args");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->authzToken.write(oprot);
@@ -4610,19 +4588,11 @@ uint32_t 
Airavata_registerPwdCredential_args::write(::apache::thrift::protocol::
   xfer += oprot->writeString(this->gatewayId);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("portalUserName", 
::apache::thrift::protocol::T_STRING, 3);
-  xfer += oprot->writeString(this->portalUserName);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("loginUserName", 
::apache::thrift::protocol::T_STRING, 4);
-  xfer += oprot->writeString(this->loginUserName);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("password", 
::apache::thrift::protocol::T_STRING, 5);
-  xfer += oprot->writeString(this->password);
+  xfer += oprot->writeFieldBegin("userName", 
::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString(this->userName);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("description", 
::apache::thrift::protocol::T_STRING, 6);
+  xfer += oprot->writeFieldBegin("description", 
::apache::thrift::protocol::T_STRING, 4);
   xfer += oprot->writeString(this->description);
   xfer += oprot->writeFieldEnd();
 
@@ -4632,14 +4602,14 @@ uint32_t 
Airavata_registerPwdCredential_args::write(::apache::thrift::protocol::
 }
 
 
-Airavata_registerPwdCredential_pargs::~Airavata_registerPwdCredential_pargs() 
throw() {
+Airavata_generateAndRegisterSSHKeysWithDescription_pargs::~Airavata_generateAndRegisterSSHKeysWithDescription_pargs()
 throw() {
 }
 
 
-uint32_t 
Airavata_registerPwdCredential_pargs::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
+uint32_t 
Airavata_generateAndRegisterSSHKeysWithDescription_pargs::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_registerPwdCredential_pargs");
+  xfer += 
oprot->writeStructBegin("Airavata_generateAndRegisterSSHKeysWithDescription_pargs");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->authzToken)).write(oprot);
@@ -4649,19 +4619,11 @@ uint32_t 
Airavata_registerPwdCredential_pargs::write(::apache::thrift::protocol:
   xfer += oprot->writeString((*(this->gatewayId)));
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("portalUserName", 
::apache::thrift::protocol::T_STRING, 3);
-  xfer += oprot->writeString((*(this->portalUserName)));
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("loginUserName", 
::apache::thrift::protocol::T_STRING, 4);
-  xfer += oprot->writeString((*(this->loginUserName)));
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("password", 
::apache::thrift::protocol::T_STRING, 5);
-  xfer += oprot->writeString((*(this->password)));
+  xfer += oprot->writeFieldBegin("userName", 
::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString((*(this->userName)));
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("description", 
::apache::thrift::protocol::T_STRING, 6);
+  xfer += oprot->writeFieldBegin("description", 
::apache::thrift::protocol::T_STRING, 4);
   xfer += oprot->writeString((*(this->description)));
   xfer += oprot->writeFieldEnd();
 
@@ -4671,11 +4633,11 @@ uint32_t 
Airavata_registerPwdCredential_pargs::write(::apache::thrift::protocol:
 }
 
 
-Airavata_registerPwdCredential_result::~Airavata_registerPwdCredential_result()
 throw() {
+Airavata_generateAndRegisterSSHKeysWithDescription_result::~Airavata_generateAndRegisterSSHKeysWithDescription_result()
 throw() {
 }
 
 
-uint32_t 
Airavata_registerPwdCredential_result::read(::apache::thrift::protocol::TProtocol*
 iprot) {
+uint32_t 
Airavata_generateAndRegisterSSHKeysWithDescription_result::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -4740,11 +4702,11 @@ uint32_t 
Airavata_registerPwdCredential_result::read(::apache::thrift::protocol:
   return xfer;
 }
 
-uint32_t 
Airavata_registerPwdCredential_result::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
+uint32_t 
Airavata_generateAndRegisterSSHKeysWithDescription_result::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
 
   uint32_t xfer = 0;
 
-  xfer += oprot->writeStructBegin("Airavata_registerPwdCredential_result");
+  xfer += 
oprot->writeStructBegin("Airavata_generateAndRegisterSSHKeysWithDescription_result");
 
   if (this->__isset.success) {
     xfer += oprot->writeFieldBegin("success", 
::apache::thrift::protocol::T_STRING, 0);
@@ -4769,11 +4731,11 @@ uint32_t 
Airavata_registerPwdCredential_result::write(::apache::thrift::protocol
 }
 
 
-Airavata_registerPwdCredential_presult::~Airavata_registerPwdCredential_presult()
 throw() {
+Airavata_generateAndRegisterSSHKeysWithDescription_presult::~Airavata_generateAndRegisterSSHKeysWithDescription_presult()
 throw() {
 }
 
 
-uint32_t 
Airavata_registerPwdCredential_presult::read(::apache::thrift::protocol::TProtocol*
 iprot) {
+uint32_t 
Airavata_generateAndRegisterSSHKeysWithDescription_presult::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -4839,11 +4801,11 @@ uint32_t 
Airavata_registerPwdCredential_presult::read(::apache::thrift::protocol
 }
 
 
-Airavata_getSSHPubKey_args::~Airavata_getSSHPubKey_args() throw() {
+Airavata_registerPwdCredential_args::~Airavata_registerPwdCredential_args() 
throw() {
 }
 
 
-uint32_t 
Airavata_getSSHPubKey_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t 
Airavata_registerPwdCredential_args::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -4856,8 +4818,11 @@ uint32_t 
Airavata_getSSHPubKey_args::read(::apache::thrift::protocol::TProtocol*
   using ::apache::thrift::protocol::TProtocolException;
 
   bool isset_authzToken = false;
-  bool isset_airavataCredStoreToken = false;
   bool isset_gatewayId = false;
+  bool isset_portalUserName = false;
+  bool isset_loginUserName = false;
+  bool isset_password = false;
+  bool isset_description = false;
 
   while (true)
   {
@@ -4877,16 +4842,40 @@ uint32_t 
Airavata_getSSHPubKey_args::read(::apache::thrift::protocol::TProtocol*
         break;
       case 2:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->airavataCredStoreToken);
-          isset_airavataCredStoreToken = true;
+          xfer += iprot->readString(this->gatewayId);
+          isset_gatewayId = true;
         } else {
           xfer += iprot->skip(ftype);
         }
         break;
       case 3:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->gatewayId);
-          isset_gatewayId = true;
+          xfer += iprot->readString(this->portalUserName);
+          isset_portalUserName = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->loginUserName);
+          isset_loginUserName = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 5:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->password);
+          isset_password = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 6:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->description);
+          isset_description = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -4902,28 +4891,46 @@ uint32_t 
Airavata_getSSHPubKey_args::read(::apache::thrift::protocol::TProtocol*
 
   if (!isset_authzToken)
     throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_airavataCredStoreToken)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
   if (!isset_gatewayId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_portalUserName)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_loginUserName)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_password)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_description)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
-uint32_t 
Airavata_getSSHPubKey_args::write(::apache::thrift::protocol::TProtocol* oprot) 
const {
+uint32_t 
Airavata_registerPwdCredential_args::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_getSSHPubKey_args");
+  xfer += oprot->writeStructBegin("Airavata_registerPwdCredential_args");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->authzToken.write(oprot);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("airavataCredStoreToken", 
::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString(this->airavataCredStoreToken);
+  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString(this->gatewayId);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 3);
-  xfer += oprot->writeString(this->gatewayId);
+  xfer += oprot->writeFieldBegin("portalUserName", 
::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString(this->portalUserName);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("loginUserName", 
::apache::thrift::protocol::T_STRING, 4);
+  xfer += oprot->writeString(this->loginUserName);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("password", 
::apache::thrift::protocol::T_STRING, 5);
+  xfer += oprot->writeString(this->password);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("description", 
::apache::thrift::protocol::T_STRING, 6);
+  xfer += oprot->writeString(this->description);
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -4932,25 +4939,37 @@ uint32_t 
Airavata_getSSHPubKey_args::write(::apache::thrift::protocol::TProtocol
 }
 
 
-Airavata_getSSHPubKey_pargs::~Airavata_getSSHPubKey_pargs() throw() {
+Airavata_registerPwdCredential_pargs::~Airavata_registerPwdCredential_pargs() 
throw() {
 }
 
 
-uint32_t 
Airavata_getSSHPubKey_pargs::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
+uint32_t 
Airavata_registerPwdCredential_pargs::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_getSSHPubKey_pargs");
+  xfer += oprot->writeStructBegin("Airavata_registerPwdCredential_pargs");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->authzToken)).write(oprot);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("airavataCredStoreToken", 
::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString((*(this->airavataCredStoreToken)));
+  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString((*(this->gatewayId)));
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 3);
-  xfer += oprot->writeString((*(this->gatewayId)));
+  xfer += oprot->writeFieldBegin("portalUserName", 
::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString((*(this->portalUserName)));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("loginUserName", 
::apache::thrift::protocol::T_STRING, 4);
+  xfer += oprot->writeString((*(this->loginUserName)));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("password", 
::apache::thrift::protocol::T_STRING, 5);
+  xfer += oprot->writeString((*(this->password)));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("description", 
::apache::thrift::protocol::T_STRING, 6);
+  xfer += oprot->writeString((*(this->description)));
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -4959,11 +4978,11 @@ uint32_t 
Airavata_getSSHPubKey_pargs::write(::apache::thrift::protocol::TProtoco
 }
 
 
-Airavata_getSSHPubKey_result::~Airavata_getSSHPubKey_result() throw() {
+Airavata_registerPwdCredential_result::~Airavata_registerPwdCredential_result()
 throw() {
 }
 
 
-uint32_t 
Airavata_getSSHPubKey_result::read(::apache::thrift::protocol::TProtocol* 
iprot) {
+uint32_t 
Airavata_registerPwdCredential_result::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -5028,11 +5047,11 @@ uint32_t 
Airavata_getSSHPubKey_result::read(::apache::thrift::protocol::TProtoco
   return xfer;
 }
 
-uint32_t 
Airavata_getSSHPubKey_result::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
+uint32_t 
Airavata_registerPwdCredential_result::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
 
   uint32_t xfer = 0;
 
-  xfer += oprot->writeStructBegin("Airavata_getSSHPubKey_result");
+  xfer += oprot->writeStructBegin("Airavata_registerPwdCredential_result");
 
   if (this->__isset.success) {
     xfer += oprot->writeFieldBegin("success", 
::apache::thrift::protocol::T_STRING, 0);
@@ -5057,11 +5076,11 @@ uint32_t 
Airavata_getSSHPubKey_result::write(::apache::thrift::protocol::TProtoc
 }
 
 
-Airavata_getSSHPubKey_presult::~Airavata_getSSHPubKey_presult() throw() {
+Airavata_registerPwdCredential_presult::~Airavata_registerPwdCredential_presult()
 throw() {
 }
 
 
-uint32_t 
Airavata_getSSHPubKey_presult::read(::apache::thrift::protocol::TProtocol* 
iprot) {
+uint32_t 
Airavata_registerPwdCredential_presult::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -5127,11 +5146,11 @@ uint32_t 
Airavata_getSSHPubKey_presult::read(::apache::thrift::protocol::TProtoc
 }
 
 
-Airavata_getAllGatewaySSHPubKeys_args::~Airavata_getAllGatewaySSHPubKeys_args()
 throw() {
+Airavata_getSSHPubKey_args::~Airavata_getSSHPubKey_args() throw() {
 }
 
 
-uint32_t 
Airavata_getAllGatewaySSHPubKeys_args::read(::apache::thrift::protocol::TProtocol*
 iprot) {
+uint32_t 
Airavata_getSSHPubKey_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -5144,6 +5163,7 @@ uint32_t 
Airavata_getAllGatewaySSHPubKeys_args::read(::apache::thrift::protocol:
   using ::apache::thrift::protocol::TProtocolException;
 
   bool isset_authzToken = false;
+  bool isset_airavataCredStoreToken = false;
   bool isset_gatewayId = false;
 
   while (true)
@@ -5164,6 +5184,14 @@ uint32_t 
Airavata_getAllGatewaySSHPubKeys_args::read(::apache::thrift::protocol:
         break;
       case 2:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->airavataCredStoreToken);
+          isset_airavataCredStoreToken = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
           xfer += iprot->readString(this->gatewayId);
           isset_gatewayId = true;
         } else {
@@ -5181,21 +5209,27 @@ uint32_t 
Airavata_getAllGatewaySSHPubKeys_args::read(::apache::thrift::protocol:
 
   if (!isset_authzToken)
     throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_airavataCredStoreToken)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
   if (!isset_gatewayId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
-uint32_t 
Airavata_getAllGatewaySSHPubKeys_args::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
+uint32_t 
Airavata_getSSHPubKey_args::write(::apache::thrift::protocol::TProtocol* oprot) 
const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_getAllGatewaySSHPubKeys_args");
+  xfer += oprot->writeStructBegin("Airavata_getSSHPubKey_args");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->authzToken.write(oprot);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeFieldBegin("airavataCredStoreToken", 
::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString(this->airavataCredStoreToken);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 3);
   xfer += oprot->writeString(this->gatewayId);
   xfer += oprot->writeFieldEnd();
 
@@ -5205,20 +5239,24 @@ uint32_t 
Airavata_getAllGatewaySSHPubKeys_args::write(::apache::thrift::protocol
 }
 
 
-Airavata_getAllGatewaySSHPubKeys_pargs::~Airavata_getAllGatewaySSHPubKeys_pargs()
 throw() {
+Airavata_getSSHPubKey_pargs::~Airavata_getSSHPubKey_pargs() throw() {
 }
 
 
-uint32_t 
Airavata_getAllGatewaySSHPubKeys_pargs::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
+uint32_t 
Airavata_getSSHPubKey_pargs::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_getAllGatewaySSHPubKeys_pargs");
+  xfer += oprot->writeStructBegin("Airavata_getSSHPubKey_pargs");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->authzToken)).write(oprot);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeFieldBegin("airavataCredStoreToken", 
::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString((*(this->airavataCredStoreToken)));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 3);
   xfer += oprot->writeString((*(this->gatewayId)));
   xfer += oprot->writeFieldEnd();
 
@@ -5228,11 +5266,11 @@ uint32_t 
Airavata_getAllGatewaySSHPubKeys_pargs::write(::apache::thrift::protoco
 }
 
 
-Airavata_getAllGatewaySSHPubKeys_result::~Airavata_getAllGatewaySSHPubKeys_result()
 throw() {
+Airavata_getSSHPubKey_result::~Airavata_getSSHPubKey_result() throw() {
 }
 
 
-uint32_t 
Airavata_getAllGatewaySSHPubKeys_result::read(::apache::thrift::protocol::TProtocol*
 iprot) {
+uint32_t 
Airavata_getSSHPubKey_result::read(::apache::thrift::protocol::TProtocol* 
iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -5254,23 +5292,8 @@ uint32_t 
Airavata_getAllGatewaySSHPubKeys_result::read(::apache::thrift::protoco
     switch (fid)
     {
       case 0:
-        if (ftype == ::apache::thrift::protocol::T_MAP) {
-          {
-            this->success.clear();
-            uint32_t _size33;
-            ::apache::thrift::protocol::TType _ktype34;
-            ::apache::thrift::protocol::TType _vtype35;
-            xfer += iprot->readMapBegin(_ktype34, _vtype35, _size33);
-            uint32_t _i37;
-            for (_i37 = 0; _i37 < _size33; ++_i37)
-            {
-              std::string _key38;
-              xfer += iprot->readString(_key38);
-              std::string& _val39 = this->success[_key38];
-              xfer += iprot->readString(_val39);
-            }
-            xfer += iprot->readMapEnd();
-          }
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->success);
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -5312,24 +5335,15 @@ uint32_t 
Airavata_getAllGatewaySSHPubKeys_result::read(::apache::thrift::protoco
   return xfer;
 }
 
-uint32_t 
Airavata_getAllGatewaySSHPubKeys_result::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
+uint32_t 
Airavata_getSSHPubKey_result::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
 
   uint32_t xfer = 0;
 
-  xfer += oprot->writeStructBegin("Airavata_getAllGatewaySSHPubKeys_result");
+  xfer += oprot->writeStructBegin("Airavata_getSSHPubKey_result");
 
   if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", 
::apache::thrift::protocol::T_MAP, 0);
-    {
-      xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, 
::apache::thrift::protocol::T_STRING, 
static_cast<uint32_t>(this->success.size()));
-      std::map<std::string, std::string> ::const_iterator _iter40;
-      for (_iter40 = this->success.begin(); _iter40 != this->success.end(); 
++_iter40)
-      {
-        xfer += oprot->writeString(_iter40->first);
-        xfer += oprot->writeString(_iter40->second);
-      }
-      xfer += oprot->writeMapEnd();
-    }
+    xfer += oprot->writeFieldBegin("success", 
::apache::thrift::protocol::T_STRING, 0);
+    xfer += oprot->writeString(this->success);
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ire) {
     xfer += oprot->writeFieldBegin("ire", 
::apache::thrift::protocol::T_STRUCT, 1);
@@ -5350,11 +5364,11 @@ uint32_t 
Airavata_getAllGatewaySSHPubKeys_result::write(::apache::thrift::protoc
 }
 
 
-Airavata_getAllGatewaySSHPubKeys_presult::~Airavata_getAllGatewaySSHPubKeys_presult()
 throw() {
+Airavata_getSSHPubKey_presult::~Airavata_getSSHPubKey_presult() throw() {
 }
 
 
-uint32_t 
Airavata_getAllGatewaySSHPubKeys_presult::read(::apache::thrift::protocol::TProtocol*
 iprot) {
+uint32_t 
Airavata_getSSHPubKey_presult::read(::apache::thrift::protocol::TProtocol* 
iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -5376,23 +5390,8 @@ uint32_t 
Airavata_getAllGatewaySSHPubKeys_presult::read(::apache::thrift::protoc
     switch (fid)
     {
       case 0:
-        if (ftype == ::apache::thrift::protocol::T_MAP) {
-          {
-            (*(this->success)).clear();
-            uint32_t _size41;
-            ::apache::thrift::protocol::TType _ktype42;
-            ::apache::thrift::protocol::TType _vtype43;
-            xfer += iprot->readMapBegin(_ktype42, _vtype43, _size41);
-            uint32_t _i45;
-            for (_i45 = 0; _i45 < _size41; ++_i45)
-            {
-              std::string _key46;
-              xfer += iprot->readString(_key46);
-              std::string& _val47 = (*(this->success))[_key46];
-              xfer += iprot->readString(_val47);
-            }
-            xfer += iprot->readMapEnd();
-          }
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString((*(this->success)));
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -5435,11 +5434,11 @@ uint32_t 
Airavata_getAllGatewaySSHPubKeys_presult::read(::apache::thrift::protoc
 }
 
 
-Airavata_getAllGatewayPWDCredentials_args::~Airavata_getAllGatewayPWDCredentials_args()
 throw() {
+Airavata_getAllGatewaySSHPubKeys_args::~Airavata_getAllGatewaySSHPubKeys_args()
 throw() {
 }
 
 
-uint32_t 
Airavata_getAllGatewayPWDCredentials_args::read(::apache::thrift::protocol::TProtocol*
 iprot) {
+uint32_t 
Airavata_getAllGatewaySSHPubKeys_args::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -5494,10 +5493,10 @@ uint32_t 
Airavata_getAllGatewayPWDCredentials_args::read(::apache::thrift::proto
   return xfer;
 }
 
-uint32_t 
Airavata_getAllGatewayPWDCredentials_args::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
+uint32_t 
Airavata_getAllGatewaySSHPubKeys_args::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_getAllGatewayPWDCredentials_args");
+  xfer += oprot->writeStructBegin("Airavata_getAllGatewaySSHPubKeys_args");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->authzToken.write(oprot);
@@ -5513,14 +5512,14 @@ uint32_t 
Airavata_getAllGatewayPWDCredentials_args::write(::apache::thrift::prot
 }
 
 
-Airavata_getAllGatewayPWDCredentials_pargs::~Airavata_getAllGatewayPWDCredentials_pargs()
 throw() {
+Airavata_getAllGatewaySSHPubKeys_pargs::~Airavata_getAllGatewaySSHPubKeys_pargs()
 throw() {
 }
 
 
-uint32_t 
Airavata_getAllGatewayPWDCredentials_pargs::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
+uint32_t 
Airavata_getAllGatewaySSHPubKeys_pargs::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += 
oprot->writeStructBegin("Airavata_getAllGatewayPWDCredentials_pargs");
+  xfer += oprot->writeStructBegin("Airavata_getAllGatewaySSHPubKeys_pargs");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->authzToken)).write(oprot);
@@ -5536,11 +5535,11 @@ uint32_t 
Airavata_getAllGatewayPWDCredentials_pargs::write(::apache::thrift::pro
 }
 
 
-Airavata_getAllGatewayPWDCredentials_result::~Airavata_getAllGatewayPWDCredentials_result()
 throw() {
+Airavata_getAllGatewaySSHPubKeys_result::~Airavata_getAllGatewaySSHPubKeys_result()
 throw() {
 }
 
 
-uint32_t 
Airavata_getAllGatewayPWDCredentials_result::read(::apache::thrift::protocol::TProtocol*
 iprot) {
+uint32_t 
Airavata_getAllGatewaySSHPubKeys_result::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -5565,17 +5564,17 @@ uint32_t 
Airavata_getAllGatewayPWDCredentials_result::read(::apache::thrift::pro
         if (ftype == ::apache::thrift::protocol::T_MAP) {
           {
             this->success.clear();
-            uint32_t _size48;
-            ::apache::thrift::protocol::TType _ktype49;
-            ::apache::thrift::protocol::TType _vtype50;
-            xfer += iprot->readMapBegin(_ktype49, _vtype50, _size48);
-            uint32_t _i52;
-            for (_i52 = 0; _i52 < _size48; ++_i52)
+            uint32_t _size33;
+            ::apache::thrift::protocol::TType _ktype34;
+            ::apache::thrift::protocol::TType _vtype35;
+            xfer += iprot->readMapBegin(_ktype34, _vtype35, _size33);
+            uint32_t _i37;
+            for (_i37 = 0; _i37 < _size33; ++_i37)
             {
-              std::string _key53;
-              xfer += iprot->readString(_key53);
-              std::string& _val54 = this->success[_key53];
-              xfer += iprot->readString(_val54);
+              std::string _key38;
+              xfer += iprot->readString(_key38);
+              std::string& _val39 = this->success[_key38];
+              xfer += iprot->readString(_val39);
             }
             xfer += iprot->readMapEnd();
           }
@@ -5620,21 +5619,21 @@ uint32_t 
Airavata_getAllGatewayPWDCredentials_result::read(::apache::thrift::pro
   return xfer;
 }
 
-uint32_t 
Airavata_getAllGatewayPWDCredentials_result::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
+uint32_t 
Airavata_getAllGatewaySSHPubKeys_result::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
 
   uint32_t xfer = 0;
 
-  xfer += 
oprot->writeStructBegin("Airavata_getAllGatewayPWDCredentials_result");
+  xfer += oprot->writeStructBegin("Airavata_getAllGatewaySSHPubKeys_result");
 
   if (this->__isset.success) {
     xfer += oprot->writeFieldBegin("success", 
::apache::thrift::protocol::T_MAP, 0);
     {
       xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, 
::apache::thrift::protocol::T_STRING, 
static_cast<uint32_t>(this->success.size()));
-      std::map<std::string, std::string> ::const_iterator _iter55;
-      for (_iter55 = this->success.begin(); _iter55 != this->success.end(); 
++_iter55)
+      std::map<std::string, std::string> ::const_iterator _iter40;
+      for (_iter40 = this->success.begin(); _iter40 != this->success.end(); 
++_iter40)
       {
-        xfer += oprot->writeString(_iter55->first);
-        xfer += oprot->writeString(_iter55->second);
+        xfer += oprot->writeString(_iter40->first);
+        xfer += oprot->writeString(_iter40->second);
       }
       xfer += oprot->writeMapEnd();
     }
@@ -5658,11 +5657,11 @@ uint32_t 
Airavata_getAllGatewayPWDCredentials_result::write(::apache::thrift::pr
 }
 
 
-Airavata_getAllGatewayPWDCredentials_presult::~Airavata_getAllGatewayPWDCredentials_presult()
 throw() {
+Airavata_getAllGatewaySSHPubKeys_presult::~Airavata_getAllGatewaySSHPubKeys_presult()
 throw() {
 }
 
 
-uint32_t 
Airavata_getAllGatewayPWDCredentials_presult::read(::apache::thrift::protocol::TProtocol*
 iprot) {
+uint32_t 
Airavata_getAllGatewaySSHPubKeys_presult::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -5687,17 +5686,17 @@ uint32_t 
Airavata_getAllGatewayPWDCredentials_presult::read(::apache::thrift::pr
         if (ftype == ::apache::thrift::protocol::T_MAP) {
           {
             (*(this->success)).clear();
-            uint32_t _size56;
-            ::apache::thrift::protocol::TType _ktype57;
-            ::apache::thrift::protocol::TType _vtype58;
-            xfer += iprot->readMapBegin(_ktype57, _vtype58, _size56);
-            uint32_t _i60;
-            for (_i60 = 0; _i60 < _size56; ++_i60)
+            uint32_t _size41;
+            ::apache::thrift::protocol::TType _ktype42;
+            ::apache::thrift::protocol::TType _vtype43;
+            xfer += iprot->readMapBegin(_ktype42, _vtype43, _size41);
+            uint32_t _i45;
+            for (_i45 = 0; _i45 < _size41; ++_i45)
             {
-              std::string _key61;
-              xfer += iprot->readString(_key61);
-              std::string& _val62 = (*(this->success))[_key61];
-              xfer += iprot->readString(_val62);
+              std::string _key46;
+              xfer += iprot->readString(_key46);
+              std::string& _val47 = (*(this->success))[_key46];
+              xfer += iprot->readString(_val47);
             }
             xfer += iprot->readMapEnd();
           }
@@ -5743,11 +5742,11 @@ uint32_t 
Airavata_getAllGatewayPWDCredentials_presult::read(::apache::thrift::pr
 }
 
 
-Airavata_deleteSSHPubKey_args::~Airavata_deleteSSHPubKey_args() throw() {
+Airavata_getAllGatewaySSHPubKeysSummary_args::~Airavata_getAllGatewaySSHPubKeysSummary_args()
 throw() {
 }
 
 
-uint32_t 
Airavata_deleteSSHPubKey_args::read(::apache::thrift::protocol::TProtocol* 
iprot) {
+uint32_t 
Airavata_getAllGatewaySSHPubKeysSummary_args::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -5760,7 +5759,6 @@ uint32_t 
Airavata_deleteSSHPubKey_args::read(::apache::thrift::protocol::TProtoc
   using ::apache::thrift::protocol::TProtocolException;
 
   bool isset_authzToken = false;
-  bool isset_airavataCredStoreToken = false;
   bool isset_gatewayId = false;
 
   while (true)
@@ -5781,14 +5779,6 @@ uint32_t 
Airavata_deleteSSHPubKey_args::read(::apache::thrift::protocol::TProtoc
         break;
       case 2:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->airavataCredStoreToken);
-          isset_airavataCredStoreToken = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
           xfer += iprot->readString(this->gatewayId);
           isset_gatewayId = true;
         } else {
@@ -5806,27 +5796,21 @@ uint32_t 
Airavata_deleteSSHPubKey_args::read(::apache::thrift::protocol::TProtoc
 
   if (!isset_authzToken)
     throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_airavataCredStoreToken)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
   if (!isset_gatewayId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
-uint32_t 
Airavata_deleteSSHPubKey_args::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
+uint32_t 
Airavata_getAllGatewaySSHPubKeysSummary_args::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_deleteSSHPubKey_args");
+  xfer += 
oprot->writeStructBegin("Airavata_getAllGatewaySSHPubKeysSummary_args");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->authzToken.write(oprot);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("airavataCredStoreToken", 
::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString(this->airavataCredStoreToken);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 2);
   xfer += oprot->writeString(this->gatewayId);
   xfer += oprot->writeFieldEnd();
 
@@ -5836,24 +5820,20 @@ uint32_t 
Airavata_deleteSSHPubKey_args::write(::apache::thrift::protocol::TProto
 }
 
 
-Airavata_deleteSSHPubKey_pargs::~Airavata_deleteSSHPubKey_pargs() throw() {
+Airavata_getAllGatewaySSHPubKeysSummary_pargs::~Airavata_getAllGatewaySSHPubKeysSummary_pargs()
 throw() {
 }
 
 
-uint32_t 
Airavata_deleteSSHPubKey_pargs::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
+uint32_t 
Airavata_getAllGatewaySSHPubKeysSummary_pargs::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_deleteSSHPubKey_pargs");
+  xfer += 
oprot->writeStructBegin("Airavata_getAllGatewaySSHPubKeysSummary_pargs");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->authzToken)).write(oprot);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("airavataCredStoreToken", 
::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString((*(this->airavataCredStoreToken)));
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 2);
   xfer += oprot->writeString((*(this->gatewayId)));
   xfer += oprot->writeFieldEnd();
 
@@ -5863,11 +5843,11 @@ uint32_t 
Airavata_deleteSSHPubKey_pargs::write(::apache::thrift::protocol::TProt
 }
 
 
-Airavata_deleteSSHPubKey_result::~Airavata_deleteSSHPubKey_result() throw() {
+Airavata_getAllGatewaySSHPubKeysSummary_result::~Airavata_getAllGatewaySSHPubKeysSummary_result()
 throw() {
 }
 
 
-uint32_t 
Airavata_deleteSSHPubKey_result::read(::apache::thrift::protocol::TProtocol* 
iprot) {
+uint32_t 
Airavata_getAllGatewaySSHPubKeysSummary_result::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -5889,8 +5869,20 @@ uint32_t 
Airavata_deleteSSHPubKey_result::read(::apache::thrift::protocol::TProt
     switch (fid)
     {
       case 0:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool(this->success);
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->success.clear();
+            uint32_t _size48;
+            ::apache::thrift::protocol::TType _etype51;
+            xfer += iprot->readListBegin(_etype51, _size48);
+            this->success.resize(_size48);
+            uint32_t _i52;
+            for (_i52 = 0; _i52 < _size48; ++_i52)
+            {
+              xfer += this->success[_i52].read(iprot);
+            }
+            xfer += iprot->readListEnd();
+          }
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -5932,15 +5924,23 @@ uint32_t 
Airavata_deleteSSHPubKey_result::read(::apache::thrift::protocol::TProt
   return xfer;
 }
 
-uint32_t 
Airavata_deleteSSHPubKey_result::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
+uint32_t 
Airavata_getAllGatewaySSHPubKeysSummary_result::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
 
   uint32_t xfer = 0;
 
-  xfer += oprot->writeStructBegin("Airavata_deleteSSHPubKey_result");
+  xfer += 
oprot->writeStructBegin("Airavata_getAllGatewaySSHPubKeysSummary_result");
 
   if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", 
::apache::thrift::protocol::T_BOOL, 0);
-    xfer += oprot->writeBool(this->success);
+    xfer += oprot->writeFieldBegin("success", 
::apache::thrift::protocol::T_LIST, 0);
+    {
+      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, 
static_cast<uint32_t>(this->success.size()));
+      std::vector< 
::apache::airavata::model::appcatalog::credentialsummary::CredentialSummary> 
::const_iterator _iter53;
+      for (_iter53 = this->success.begin(); _iter53 != this->success.end(); 
++_iter53)
+      {
+        xfer += (*_iter53).write(oprot);
+      }
+      xfer += oprot->writeListEnd();
+    }
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ire) {
     xfer += oprot->writeFieldBegin("ire", 
::apache::thrift::protocol::T_STRUCT, 1);
@@ -5961,11 +5961,11 @@ uint32_t 
Airavata_deleteSSHPubKey_result::write(::apache::thrift::protocol::TPro
 }
 
 
-Airavata_deleteSSHPubKey_presult::~Airavata_deleteSSHPubKey_presult() throw() {
+Airavata_getAllGatewaySSHPubKeysSummary_presult::~Airavata_getAllGatewaySSHPubKeysSummary_presult()
 throw() {
 }
 
 
-uint32_t 
Airavata_deleteSSHPubKey_presult::read(::apache::thrift::protocol::TProtocol* 
iprot) {
+uint32_t 
Airavata_getAllGatewaySSHPubKeysSummary_presult::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -5987,8 +5987,20 @@ uint32_t 
Airavata_deleteSSHPubKey_presult::read(::apache::thrift::protocol::TPro
     switch (fid)
     {
       case 0:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool((*(this->success)));
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            (*(this->success)).clear();
+            uint32_t _size54;
+            ::apache::thrift::protocol::TType _etype57;
+            xfer += iprot->readListBegin(_etype57, _size54);
+            (*(this->success)).resize(_size54);
+            uint32_t _i58;
+            for (_i58 = 0; _i58 < _size54; ++_i58)
+            {
+              xfer += (*(this->success))[_i58].read(iprot);
+            }
+            xfer += iprot->readListEnd();
+          }
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -6031,11 +6043,11 @@ uint32_t 
Airavata_deleteSSHPubKey_presult::read(::apache::thrift::protocol::TPro
 }
 
 
-Airavata_deletePWDCredential_args::~Airavata_deletePWDCredential_args() 
throw() {
+Airavata_getAllSSHPubKeysSummaryForUserInGateway_args::~Airavata_getAllSSHPubKeysSummaryForUserInGateway_args()
 throw() {
 }
 
 
-uint32_t 
Airavata_deletePWDCredential_args::read(::apache::thrift::protocol::TProtocol* 
iprot) {
+uint32_t 
Airavata_getAllSSHPubKeysSummaryForUserInGateway_args::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -6048,8 +6060,8 @@ uint32_t 
Airavata_deletePWDCredential_args::read(::apache::thrift::protocol::TPr
   using ::apache::thrift::protocol::TProtocolException;
 
   bool isset_authzToken = false;
-  bool isset_airavataCredStoreToken = false;
   bool isset_gatewayId = false;
+  bool isset_userId = false;
 
   while (true)
   {
@@ -6069,16 +6081,16 @@ uint32_t 
Airavata_deletePWDCredential_args::read(::apache::thrift::protocol::TPr
         break;
       case 2:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->airavataCredStoreToken);
-          isset_airavataCredStoreToken = true;
+          xfer += iprot->readString(this->gatewayId);
+          isset_gatewayId = true;
         } else {
           xfer += iprot->skip(ftype);
         }
         break;
       case 3:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->gatewayId);
-          isset_gatewayId = true;
+          xfer += iprot->readString(this->userId);
+          isset_userId = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -6094,28 +6106,28 @@ uint32_t 
Airavata_deletePWDCredential_args::read(::apache::thrift::protocol::TPr
 
   if (!isset_authzToken)
     throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_airavataCredStoreToken)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
   if (!isset_gatewayId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_userId)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
-uint32_t 
Airavata_deletePWDCredential_args::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
+uint32_t 
Airavata_getAllSSHPubKeysSummaryForUserInGateway_args::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_deletePWDCredential_args");
+  xfer += 
oprot->writeStructBegin("Airavata_getAllSSHPubKeysSummaryForUserInGateway_args");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->authzToken.write(oprot);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("airavataCredStoreToken", 
::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString(this->airavataCredStoreToken);
+  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString(this->gatewayId);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 3);
-  xfer += oprot->writeString(this->gatewayId);
+  xfer += oprot->writeFieldBegin("userId", 
::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString(this->userId);
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -6124,25 +6136,25 @@ uint32_t 
Airavata_deletePWDCredential_args::write(::apache::thrift::protocol::TP
 }
 
 
-Airavata_deletePWDCredential_pargs::~Airavata_deletePWDCredential_pargs() 
throw() {
+Airavata_getAllSSHPubKeysSummaryForUserInGateway_pargs::~Airavata_getAllSSHPubKeysSummaryForUserInGateway_pargs()
 throw() {
 }
 
 
-uint32_t 
Airavata_deletePWDCredential_pargs::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
+uint32_t 
Airavata_getAllSSHPubKeysSummaryForUserInGateway_pargs::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_deletePWDCredential_pargs");
+  xfer += 
oprot->writeStructBegin("Airavata_getAllSSHPubKeysSummaryForUserInGateway_pargs");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->authzToken)).write(oprot);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("airavataCredStoreToken", 
::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString((*(this->airavataCredStoreToken)));
+  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString((*(this->gatewayId)));
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 3);
-  xfer += oprot->writeString((*(this->gatewayId)));
+  xfer += oprot->writeFieldBegin("userId", 
::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString((*(this->userId)));
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -6151,11 +6163,11 @@ uint32_t 
Airavata_deletePWDCredential_pargs::write(::apache::thrift::protocol::T
 }
 
 
-Airavata_deletePWDCredential_result::~Airavata_deletePWDCredential_result() 
throw() {
+Airavata_getAllSSHPubKeysSummaryForUserInGateway_result::~Airavata_getAllSSHPubKeysSummaryForUserInGateway_result()
 throw() {
 }
 
 
-uint32_t 
Airavata_deletePWDCredential_result::read(::apache::thrift::protocol::TProtocol*
 iprot) {
+uint32_t 
Airavata_getAllSSHPubKeysSummaryForUserInGateway_result::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -6177,8 +6189,20 @@ uint32_t 
Airavata_deletePWDCredential_result::read(::apache::thrift::protocol::T
     switch (fid)
     {
       case 0:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool(this->success);
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->success.clear();
+            uint32_t _size59;
+            ::apache::thrift::protocol::TType _etype62;
+            xfer += iprot->readListBegin(_etype62, _size59);
+            this->success.resize(_size59);
+            uint32_t _i63;
+            for (_i63 = 0; _i63 < _size59; ++_i63)
+            {
+              xfer += this->success[_i63].read(iprot);
+            }
+            xfer += iprot->readListEnd();
+          }
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -6220,15 +6244,23 @@ uint32_t 
Airavata_deletePWDCredential_result::read(::apache::thrift::protocol::T
   return xfer;
 }
 
-uint32_t 
Airavata_deletePWDCredential_result::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
+uint32_t 
Airavata_getAllSSHPubKeysSummaryForUserInGateway_result::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
 
   uint32_t xfer = 0;
 
-  xfer += oprot->writeStructBegin("Airavata_deletePWDCredential_result");
+  xfer += 
oprot->writeStructBegin("Airavata_getAllSSHPubKeysSummaryForUserInGateway_result");
 
   if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", 
::apache::thrift::protocol::T_BOOL, 0);
-    xfer += oprot->writeBool(this->success);
+    xfer += oprot->writeFieldBegin("success", 
::apache::thrift::protocol::T_LIST, 0);
+    {
+      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, 
static_cast<uint32_t>(this->success.size()));
+      std::vector< 
::apache::airavata::model::appcatalog::credentialsummary::CredentialSummary> 
::const_iterator _iter64;
+      for (_iter64 = this->success.begin(); _iter64 != this->success.end(); 
++_iter64)
+      {
+        xfer += (*_iter64).write(oprot);
+      }
+      xfer += oprot->writeListEnd();
+    }
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ire) {
     xfer += oprot->writeFieldBegin("ire", 
::apache::thrift::protocol::T_STRUCT, 1);
@@ -6249,11 +6281,11 @@ uint32_t 
Airavata_deletePWDCredential_result::write(::apache::thrift::protocol::
 }
 
 
-Airavata_deletePWDCredential_presult::~Airavata_deletePWDCredential_presult() 
throw() {
+Airavata_getAllSSHPubKeysSummaryForUserInGateway_presult::~Airavata_getAllSSHPubKeysSummaryForUserInGateway_presult()
 throw() {
 }
 
 
-uint32_t 
Airavata_deletePWDCredential_presult::read(::apache::thrift::protocol::TProtocol*
 iprot) {
+uint32_t 
Airavata_getAllSSHPubKeysSummaryForUserInGateway_presult::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -6275,8 +6307,20 @@ uint32_t 
Airavata_deletePWDCredential_presult::read(::apache::thrift::protocol::
     switch (fid)
     {
       case 0:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool((*(this->success)));
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            (*(this->success)).clear();
+            uint32_t _size65;
+            ::apache::thrift::protocol::TType _etype68;
+            xfer += iprot->readListBegin(_etype68, _size65);
+            (*(this->success)).resize(_size65);
+            uint32_t _i69;
+            for (_i69 = 0; _i69 < _size65; ++_i69)
+            {
+              xfer += (*(this->success))[_i69].read(iprot);
+            }
+            xfer += iprot->readListEnd();
+          }
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -6319,11 +6363,11 @@ uint32_t 
Airavata_deletePWDCredential_presult::read(::apache::thrift::protocol::
 }
 
 
-Airavata_createProject_args::~Airavata_createProject_args() throw() {
+Airavata_getAllGatewayPWDCredentials_args::~Airavata_getAllGatewayPWDCredentials_args()
 throw() {
 }
 
 
-uint32_t 
Airavata_createProject_args::read(::apache::thrift::protocol::TProtocol* iprot) 
{
+uint32_t 
Airavata_getAllGatewayPWDCredentials_args::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -6337,7 +6381,6 @@ uint32_t 
Airavata_createProject_args::read(::apache::thrift::protocol::TProtocol
 
   bool isset_authzToken = false;
   bool isset_gatewayId = false;
-  bool isset_project = false;
 
   while (true)
   {
@@ -6363,14 +6406,6 @@ uint32_t 
Airavata_createProject_args::read(::apache::thrift::protocol::TProtocol
           xfer += iprot->skip(ftype);
         }
         break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->project.read(iprot);
-          isset_project = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
       default:
         xfer += iprot->skip(ftype);
         break;
@@ -6384,15 +6419,13 @@ uint32_t 
Airavata_createProject_args::read(::apache::thrift::protocol::TProtocol
     throw TProtocolException(TProtocolException::INVALID_DATA);
   if (!isset_gatewayId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_project)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
-uint32_t 
Airavata_createProject_args::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
+uint32_t 
Airavata_getAllGatewayPWDCredentials_args::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_createProject_args");
+  xfer += oprot->writeStructBegin("Airavata_getAllGatewayPWDCredentials_args");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->authzToken.write(oprot);
@@ -6402,24 +6435,20 @@ uint32_t 
Airavata_createProject_args::write(::apache::thrift::protocol::TProtoco
   xfer += oprot->writeString(this->gatewayId);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("project", 
::apache::thrift::protocol::T_STRUCT, 3);
-  xfer += this->project.write(oprot);
-  xfer += oprot->writeFieldEnd();
-
   xfer += oprot->writeFieldStop();
   xfer += oprot->writeStructEnd();
   return xfer;
 }
 
 
-Airavata_createProject_pargs::~Airavata_createProject_pargs() throw() {
+Airavata_getAllGatewayPWDCredentials_pargs::~Airavata_getAllGatewayPWDCredentials_pargs()
 throw() {
 }
 
 
-uint32_t 
Airavata_createProject_pargs::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
+uint32_t 
Airavata_getAllGatewayPWDCredentials_pargs::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_createProject_pargs");
+  xfer += 
oprot->writeStructBegin("Airavata_getAllGatewayPWDCredentials_pargs");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->authzToken)).write(oprot);
@@ -6429,21 +6458,17 @@ uint32_t 
Airavata_createProject_pargs::write(::apache::thrift::protocol::TProtoc
   xfer += oprot->writeString((*(this->gatewayId)));
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("project", 
::apache::thrift::protocol::T_STRUCT, 3);
-  xfer += (*(this->project)).write(oprot);
-  xfer += oprot->writeFieldEnd();
-
   xfer += oprot->writeFieldStop();
   xfer += oprot->writeStructEnd();
   return xfer;
 }
 
 
-Airavata_createProject_result::~Airavata_createProject_result() throw() {
+Airavata_getAllGatewayPWDCredentials_result::~Airavata_getAllGatewayPWDCredentials_result()
 throw() {
 }
 
 
-uint32_t 
Airavata_createProject_result::read(::apache::thrift::protocol::TProtocol* 
iprot) {
+uint32_t 
Airavata_getAllGatewayPWDCredentials_result::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -6465,8 +6490,23 @@ uint32_t 
Airavata_createProject_result::read(::apache::thrift::protocol::TProtoc
     switch (fid)
     {
       case 0:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->success);
+        if (ftype == ::apache::thrift::protocol::T_MAP) {
+          {
+            this->success.clear();
+            uint32_t _size70;
+            ::apache::thrift::protocol::TType _ktype71;
+            ::apache::thrift::protocol::TType _vtype72;
+            xfer += iprot->readMapBegin(_ktype71, _vtype72, _size70);
+            uint32_t _i74;
+            for (_i74 = 0; _i74 < _size70; ++_i74)
+            {
+              std::string _key75;
+              xfer += iprot->readString(_key75);
+              std::string& _val76 = this->success[_key75];
+              xfer += iprot->readString(_val76);
+            }
+            xfer += iprot->readMapEnd();
+          }
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -6496,14 +6536,6 @@ uint32_t 
Airavata_createProject_result::read(::apache::thrift::protocol::TProtoc
           xfer += iprot->skip(ftype);
         }
         break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->ae.read(iprot);
-          this->__isset.ae = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
       default:
         xfer += iprot->skip(ftype);
         break;
@@ -6516,15 +6548,24 @@ uint32_t 
Airavata_createProject_result::read(::apache::thrift::protocol::TProtoc
   return xfer;
 }
 
-uint32_t 
Airavata_createProject_result::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
+uint32_t 
Airavata_getAllGatewayPWDCredentials_result::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
 
   uint32_t xfer = 0;
 
-  xfer += oprot->writeStructBegin("Airavata_createProject_result");
+  xfer += 
oprot->writeStructBegin("Airavata_getAllGatewayPWDCredentials_result");
 
   if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", 
::apache::thrift::protocol::T_STRING, 0);
-    xfer += oprot->writeString(this->success);
+    xfer += oprot->writeFieldBegin("success", 
::apache::thrift::protocol::T_MAP, 0);
+    {
+      xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, 
::apache::thrift::protocol::T_STRING, 
static_cast<uint32_t>(this->success.size()));
+      std::map<std::string, std::string> ::const_iterator _iter77;
+      for (_iter77 = this->success.begin(); _iter77 != this->success.end(); 
++_iter77)
+      {
+        xfer += oprot->writeString(_iter77->first);
+        xfer += oprot->writeString(_iter77->second);
+      }
+      xfer += oprot->writeMapEnd();
+    }
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ire) {
     xfer += oprot->writeFieldBegin("ire", 
::apache::thrift::protocol::T_STRUCT, 1);
@@ -6538,10 +6579,6 @@ uint32_t 
Airavata_createProject_result::write(::apache::thrift::protocol::TProto
     xfer += oprot->writeFieldBegin("ase", 
::apache::thrift::protocol::T_STRUCT, 3);
     xfer += this->ase.write(oprot);
     xfer += oprot->writeFieldEnd();
-  } else if (this->__isset.ae) {
-    xfer += oprot->writeFieldBegin("ae", ::apache::thrift::protocol::T_STRUCT, 
4);
-    xfer += this->ae.write(oprot);
-    xfer += oprot->writeFieldEnd();
   }
   xfer += oprot->writeFieldStop();
   xfer += oprot->writeStructEnd();
@@ -6549,11 +6586,11 @@ uint32_t 
Airavata_createProject_result::write(::apache::thrift::protocol::TProto
 }
 
 
-Airavata_createProject_presult::~Airavata_createProject_presult() throw() {
+Airavata_getAllGatewayPWDCredentials_presult::~Airavata_getAllGatewayPWDCredentials_presult()
 throw() {
 }
 
 
-uint32_t 
Airavata_createProject_presult::read(::apache::thrift::protocol::TProtocol* 
iprot) {
+uint32_t 
Airavata_getAllGatewayPWDCredentials_presult::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -6575,8 +6612,23 @@ uint32_t 
Airavata_createProject_presult::read(::apache::thrift::protocol::TProto
     switch (fid)
     {
       case 0:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString((*(this->success)));
+        if (ftype == ::apache::thrift::protocol::T_MAP) {
+          {
+            (*(this->success)).clear();
+            uint32_t _size78;
+            ::apache::thrift::protocol::TType _ktype79;
+            ::apache::thrift::protocol::TType _vtype80;
+            xfer += iprot->readMapBegin(_ktype79, _vtype80, _size78);
+            uint32_t _i82;
+            for (_i82 = 0; _i82 < _size78; ++_i82)
+            {
+              std::string _key83;
+              xfer += iprot->readString(_key83);
+              std::string& _val84 = (*(this->success))[_key83];
+              xfer += iprot->readString(_val84);
+            }
+            xfer += iprot->readMapEnd();
+          }
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -6606,14 +6658,6 @@ uint32_t 
Airavata_createProject_presult::read(::apache::thrift::protocol::TProto
           xfer += iprot->skip(ftype);
         }
         break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->ae.read(iprot);
-          this->__isset.ae = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
       default:
         xfer += iprot->skip(ftype);
         break;
@@ -6627,11 +6671,11 @@ uint32_t 
Airavata_createProject_presult::read(::apache::thrift::protocol::TProto
 }
 
 
-Airavata_updateProject_args::~Airavata_updateProject_args() throw() {
+Airavata_deleteSSHPubKey_args::~Airavata_deleteSSHPubKey_args() throw() {
 }
 
 
-uint32_t 
Airavata_updateProject_args::read(::apache::thrift::protocol::TProtocol* iprot) 
{
+uint32_t 
Airavata_deleteSSHPubKey_args::read(::apache::thrift::protocol::TProtocol* 
iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -6644,8 +6688,8 @@ uint32_t 
Airavata_updateProject_args::read(::apache::thrift::protocol::TProtocol
   using ::apache::thrift::protocol::TProtocolException;
 
   bool isset_authzToken = false;
-  bool isset_projectId = false;
-  bool isset_updatedProject = false;
+  bool isset_airavataCredStoreToken = false;
+  bool isset_gatewayId = false;
 
   while (true)
   {
@@ -6665,16 +6709,16 @@ uint32_t 
Airavata_updateProject_args::read(::apache::thrift::protocol::TProtocol
         break;
       case 2:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->projectId);
-          isset_projectId = true;
+          xfer += iprot->readString(this->airavataCredStoreToken);
+          isset_airavataCredStoreToken = true;
         } else {
           xfer += iprot->skip(ftype);
         }
         break;
       case 3:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->updatedProject.read(iprot);
-          isset_updatedProject = true;
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->gatewayId);
+          isset_gatewayId = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -6690,28 +6734,28 @@ uint32_t 
Airavata_updateProject_args::read(::apache::thrift::protocol::TProtocol
 
   if (!isset_authzToken)
     throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_projectId)
+  if (!isset_airavataCredStoreToken)
     throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_updatedProject)
+  if (!isset_gatewayId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
-uint32_t 
Airavata_updateProject_args::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
+uint32_t 
Airavata_deleteSSHPubKey_args::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_updateProject_args");
+  xfer += oprot->writeStructBegin("Airavata_deleteSSHPubKey_args");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->authzToken.write(oprot);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("projectId", 
::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString(this->projectId);
+  xfer += oprot->writeFieldBegin("airavataCredStoreToken", 
::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString(this->airavataCredStoreToken);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("updatedProject", 
::apache::thrift::protocol::T_STRUCT, 3);
-  xfer += this->updatedProject.write(oprot);
+  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString(this->gatewayId);
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -6720,25 +6764,25 @@ uint32_t 
Airavata_updateProject_args::write(::apache::thrift::protocol::TProtoco
 }
 
 
-Airavata_updateProject_pargs::~Airavata_updateProject_pargs() throw() {
+Airavata_deleteSSHPubKey_pargs::~Airavata_deleteSSHPubKey_pargs() throw() {
 }
 
 
-uint32_t 
Airavata_updateProject_pargs::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
+uint32_t 
Airavata_deleteSSHPubKey_pargs::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_updateProject_pargs");
+  xfer += oprot->writeStructBegin("Airavata_deleteSSHPubKey_pargs");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->authzToken)).write(oprot);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("projectId", 
::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString((*(this->projectId)));
+  xfer += oprot->writeFieldBegin("airavataCredStoreToken", 
::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString((*(this->airavataCredStoreToken)));
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("updatedProject", 
::apache::thrift::protocol::T_STRUCT, 3);
-  xfer += (*(this->updatedProject)).write(oprot);
+  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString((*(this->gatewayId)));
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -6747,11 +6791,11 @@ uint32_t 
Airavata_updateProject_pargs::write(::apache::thrift::protocol::TProtoc
 }
 
 
-Airavata_updateProject_result::~Airavata_updateProject_result() throw() {
+Airavata_deleteSSHPubKey_result::~Airavata_deleteSSHPubKey_result() throw() {
 }
 
 
-uint32_t 
Airavata_updateProject_result::read(::apache::thrift::protocol::TProtocol* 
iprot) {
+uint32_t 
Airavata_deleteSSHPubKey_result::read(::apache::thrift::protocol::TProtocol* 
iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -6772,6 +6816,14 @@ uint32_t 
Airavata_updateProject_result::read(::apache::thrift::protocol::TProtoc
     }
     switch (fid)
     {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->success);
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
       case 1:
         if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ire.read(iprot);
@@ -6796,22 +6848,6 @@ uint32_t 
Airavata_updateProject_result::read(::apache::thrift::protocol::TProtoc
           xfer += iprot->skip(ftype);
         }
         break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->pnfe.read(iprot);
-          this->__isset.pnfe = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 5:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->ae.read(iprot);
-          this->__isset.ae = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
       default:
         xfer += iprot->skip(ftype);
         break;
@@ -6824,13 +6860,17 @@ uint32_t 
Airavata_updateProject_result::read(::apache::thrift::protocol::TProtoc
   return xfer;
 }
 
-uint32_t 
Airavata_updateProject_result::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
+uint32_t 
Airavata_deleteSSHPubKey_result::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
 
   uint32_t xfer = 0;
 
-  xfer += oprot->writeStructBegin("Airavata_updateProject_result");
+  xfer += oprot->writeStructBegin("Airavata_deleteSSHPubKey_result");
 
-  if (this->__isset.ire) {
+  if (this->__isset.success) {
+    xfer += oprot->writeFieldBegin("success", 
::apache::thrift::protocol::T_BOOL, 0);
+    xfer += oprot->writeBool(this->success);
+    xfer += oprot->writeFieldEnd();
+  } else if (this->__isset.ire) {
     xfer += oprot->writeFieldBegin("ire", 
::apache::thrift::protocol::T_STRUCT, 1);
     xfer += this->ire.write(oprot);
     xfer += oprot->writeFieldEnd();
@@ -6842,14 +6882,6 @@ uint32_t 
Airavata_updateProject_result::write(::apache::thrift::protocol::TProto
     xfer += oprot->writeFieldBegin("ase", 
::apache::thrift::protocol::T_STRUCT, 3);
     xfer += this->ase.write(oprot);
     xfer += oprot->writeFieldEnd();
-  } else if (this->__isset.pnfe) {
-    xfer += oprot->writeFieldBegin("pnfe", 
::apache::thrift::protocol::T_STRUCT, 4);
-    xfer += this->pnfe.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  } else if (this->__isset.ae) {
-    xfer += oprot->writeFieldBegin("ae", ::apache::thrift::protocol::T_STRUCT, 
5);
-    xfer += this->ae.write(oprot);
-    xfer += oprot->writeFieldEnd();
   }
   xfer += oprot->writeFieldStop();
   xfer += oprot->writeStructEnd();
@@ -6857,11 +6889,11 @@ uint32_t 
Airavata_updateProject_result::write(::apache::thrift::protocol::TProto
 }
 
 
-Airavata_updateProject_presult::~Airavata_updateProject_presult() throw() {
+Airavata_deleteSSHPubKey_presult::~Airavata_deleteSSHPubKey_presult() throw() {
 }
 
 
-uint32_t 
Airavata_updateProject_presult::read(::apache::thrift::protocol::TProtocol* 
iprot) {
+uint32_t 
Airavata_deleteSSHPubKey_presult::read(::apache::thrift::protocol::TProtocol* 
iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -6882,6 +6914,14 @@ uint32_t 
Airavata_updateProject_presult::read(::apache::thrift::protocol::TProto
     }
     switch (fid)
     {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool((*(this->success)));
+          this->__isset.success = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
       case 1:
         if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ire.read(iprot);
@@ -6906,22 +6946,6 @@ uint32_t 
Airavata_updateProject_presult::read(::apache::thrift::protocol::TProto
           xfer += iprot->skip(ftype);
         }
         break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->pnfe.read(iprot);
-          this->__isset.pnfe = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 5:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->ae.read(iprot);
-          this->__isset.ae = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
       default:
         xfer += iprot->skip(ftype);
         break;
@@ -6935,11 +6959,11 @@ uint32_t 
Airavata_updateProject_presult::read(::apache::thrift::protocol::TProto
 }
 
 
-Airavata_getProject_args::~Airavata_getProject_args() throw() {
+Airavata_deletePWDCredential_args::~Airavata_deletePWDCredential_args() 
throw() {
 }
 
 
-uint32_t Airavata_getProject_args::read(::apache::thrift::protocol::TProtocol* 
iprot) {
+uint32_t 
Airavata_deletePWDCredential_args::read(::apache::thrift::protocol::TProtocol* 
iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -6952,7 +6976,8 @@ uint32_t 
Airavata_getProject_args::read(::apache::thrift::protocol::TProtocol* i
   using ::apache::thrift::protocol::TProtocolException;
 
   bool isset_authzToken = false;
-  bool isset_projectId = false;
+  bool isset_airavataCredStoreToken = false;
+  bool isset_gatewayId = false;
 
   while (true)
   {
@@ -6972,8 +6997,16 @@ uint32_t 
Airavata_getProject_args::read(::apache::thrift::protocol::TProtocol* i
         break;
       case 2:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->projectId);
-          isset_projectId = true;
+          xfer += iprot->readString(this->airavataCredStoreToken);
+          isset_airavataCredStoreToken = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->gatewayId);
+          isset_gatewayId = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -6989,22 +7022,28 @@ uint32_t 
Airavata_getProject_args::read(::apache::thrift::protocol::TProtocol* i
 
   if (!isset_authzToken)
     throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_projectId)
+  if (!isset_airavataCredStoreToken)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_gatewayId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
-uint32_t 
Airavata_getProject_args::write(::apache::thrift::protocol::TProtocol* oprot) 
const {
+uint32_t 
Airavata_deletePWDCredential_args::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_getProject_args");
+  xfer += oprot->writeStructBegin("Airavata_deletePWDCredential_args");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->authzToken.write(oprot);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("projectId", 
::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString(this->projectId);
+  xfer += oprot->writeFieldBegin("airavataCredStoreToken", 
::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString(this->airavataCredStoreToken);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString(this->gatewayId);
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -7013,21 +7052,25 @@ uint32_t 
Airavata_getProject_args::write(::apache::thrift::protocol::TProtocol*
 }
 
 
-Airavata_getProject_pargs::~Airavata_getProject_pargs() throw() {
+Airavata_deletePWDCredential_pargs::~Airavata_deletePWDCredential_pargs() 
throw() {
 }
 
 
-uint32_t 
Airavata_getProject_pargs::write(::apache::thrift::protocol::TProtocol* oprot) 
const {
+uint32_t 
Airavata_deletePWDCredential_pargs::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_getProject_pargs");
+  xfer += oprot->writeStructBegin("Airavata_deletePWDCredential_pargs");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->authzToken)).write(oprot);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("projectId", 
::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString((*(this->projectId)));
+  xfer += oprot->writeFieldBegin("airavataCredStoreToken", 
::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString((*(this->airavataCredStoreToken)));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString((*(this->gatewayId)));
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -7036,11 +7079,11 @@ uint32_t 
Airavata_getProject_pargs::write(::apache::thrift::protocol::TProtocol*
 }
 
 
-Airavata_getProject_result::~Airavata_getProject_result() throw() {
+Airavata_deletePWDCredential_result::~Airavata_deletePWDCredential_result() 
throw() {
 }
 
 
-uint32_t 
Airavata_getProject_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t 
Airavata_deletePWDCredential_result::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -7062,8 +7105,8 @@ uint32_t 
Airavata_getProject_result::read(::apache::thrift::protocol::TProtocol*
     switch (fid)
     {
       case 0:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->success.read(iprot);
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->success);
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -7093,22 +7136,6 @@ uint32_t 
Airavata_getProject_result::read(::apache::thrift::protocol::TProtocol*
           xfer += iprot->skip(ftype);
         }
         break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->pnfe.read(iprot);
-          this->__isset.pnfe = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 5:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->ae.read(iprot);
-          this->__isset.ae = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
       default:
         xfer += iprot->skip(ftype);
         break;
@@ -7121,15 +7148,15 @@ uint32_t 
Airavata_getProject_result::read(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
-uint32_t 
Airavata_getProject_result::write(::apache::thrift::protocol::TProtocol* oprot) 
const {
+uint32_t 
Airavata_deletePWDCredential_result::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
 
   uint32_t xfer = 0;
 
-  xfer += oprot->writeStructBegin("Airavata_getProject_result");
+  xfer += oprot->writeStructBegin("Airavata_deletePWDCredential_result");
 
   if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", 
::apache::thrift::protocol::T_STRUCT, 0);
-    xfer += this->success.write(oprot);
+    xfer += oprot->writeFieldBegin("success", 
::apache::thrift::protocol::T_BOOL, 0);
+    xfer += oprot->writeBool(this->success);
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ire) {
     xfer += oprot->writeFieldBegin("ire", 
::apache::thrift::protocol::T_STRUCT, 1);
@@ -7143,14 +7170,6 @@ uint32_t 
Airavata_getProject_result::write(::apache::thrift::protocol::TProtocol
     xfer += oprot->writeFieldBegin("ase", 
::apache::thrift::protocol::T_STRUCT, 3);
     xfer += this->ase.write(oprot);
     xfer += oprot->writeFieldEnd();
-  } else if (this->__isset.pnfe) {
-    xfer += oprot->writeFieldBegin("pnfe", 
::apache::thrift::protocol::T_STRUCT, 4);
-    xfer += this->pnfe.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  } else if (this->__isset.ae) {
-    xfer += oprot->writeFieldBegin("ae", ::apache::thrift::protocol::T_STRUCT, 
5);
-    xfer += this->ae.write(oprot);
-    xfer += oprot->writeFieldEnd();
   }
   xfer += oprot->writeFieldStop();
   xfer += oprot->writeStructEnd();
@@ -7158,11 +7177,11 @@ uint32_t 
Airavata_getProject_result::write(::apache::thrift::protocol::TProtocol
 }
 
 
-Airavata_getProject_presult::~Airavata_getProject_presult() throw() {
+Airavata_deletePWDCredential_presult::~Airavata_deletePWDCredential_presult() 
throw() {
 }
 
 
-uint32_t 
Airavata_getProject_presult::read(::apache::thrift::protocol::TProtocol* iprot) 
{
+uint32_t 
Airavata_deletePWDCredential_presult::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -7184,8 +7203,8 @@ uint32_t 
Airavata_getProject_presult::read(::apache::thrift::protocol::TProtocol
     switch (fid)
     {
       case 0:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += (*(this->success)).read(iprot);
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool((*(this->success)));
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -7215,22 +7234,6 @@ uint32_t 
Airavata_getProject_presult::read(::apache::thrift::protocol::TProtocol
           xfer += iprot->skip(ftype);
         }
         break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->pnfe.read(iprot);
-          this->__isset.pnfe = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 5:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->ae.read(iprot);
-          this->__isset.ae = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
       default:
         xfer += iprot->skip(ftype);
         break;
@@ -7244,11 +7247,11 @@ uint32_t 
Airavata_getProject_presult::read(::apache::thrift::protocol::TProtocol
 }
 
 
-Airavata_deleteProject_args::~Airavata_deleteProject_args() throw() {
+Airavata_createProject_args::~Airavata_createProject_args() throw() {
 }
 
 
-uint32_t 
Airavata_deleteProject_args::read(::apache::thrift::protocol::TProtocol* iprot) 
{
+uint32_t 
Airavata_createProject_args::read(::apache::thrift::protocol::TProtocol* iprot) 
{
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -7261,7 +7264,8 @@ uint32_t 
Airavata_deleteProject_args::read(::apache::thrift::protocol::TProtocol
   using ::apache::thrift::protocol::TProtocolException;
 
   bool isset_authzToken = false;
-  bool isset_projectId = false;
+  bool isset_gatewayId = false;
+  bool isset_project = false;
 
   while (true)
   {
@@ -7281,8 +7285,16 @@ uint32_t 
Airavata_deleteProject_args::read(::apache::thrift::protocol::TProtocol
         break;
       case 2:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->projectId);
-          isset_projectId = true;
+          xfer += iprot->readString(this->gatewayId);
+          isset_gatewayId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->project.read(iprot);
+          isset_project = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -7298,22 +7310,28 @@ uint32_t 
Airavata_deleteProject_args::read(::apache::thrift::protocol::TProtocol
 
   if (!isset_authzToken)
     throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_projectId)
+  if (!isset_gatewayId)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_project)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
-uint32_t 
Airavata_deleteProject_args::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
+uint32_t 
Airavata_createProject_args::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_deleteProject_args");
+  xfer += oprot->writeStructBegin("Airavata_createProject_args");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->authzToken.write(oprot);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("projectId", 
::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString(this->projectId);
+  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString(this->gatewayId);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("project", 
::apache::thrift::protocol::T_STRUCT, 3);
+  xfer += this->project.write(oprot);
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -7322,21 +7340,25 @@ uint32_t 
Airavata_deleteProject_args::write(::apache::thrift::protocol::TProtoco
 }
 
 
-Airavata_deleteProject_pargs::~Airavata_deleteProject_pargs() throw() {
+Airavata_createProject_pargs::~Airavata_createProject_pargs() throw() {
 }
 
 
-uint32_t 
Airavata_deleteProject_pargs::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
+uint32_t 
Airavata_createProject_pargs::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_deleteProject_pargs");
+  xfer += oprot->writeStructBegin("Airavata_createProject_pargs");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->authzToken)).write(oprot);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("projectId", 
::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString((*(this->projectId)));
+  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString((*(this->gatewayId)));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("project", 
::apache::thrift::protocol::T_STRUCT, 3);
+  xfer += (*(this->project)).write(oprot);
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -7345,11 +7367,11 @@ uint32_t 
Airavata_deleteProject_pargs::write(::apache::thrift::protocol::TProtoc
 }
 
 
-Airavata_deleteProject_result::~Airavata_deleteProject_result() throw() {
+Airavata_createProject_result::~Airavata_createProject_result() throw() {
 }
 
 
-uint32_t 
Airavata_deleteProject_result::read(::apache::thrift::protocol::TProtocol* 
iprot) {
+uint32_t 
Airavata_createProject_result::read(::apache::thrift::protocol::TProtocol* 
iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -7371,8 +7393,8 @@ uint32_t 
Airavata_deleteProject_result::read(::apache::thrift::protocol::TProtoc
     switch (fid)
     {
       case 0:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool(this->success);
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->success);
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -7404,14 +7426,6 @@ uint32_t 
Airavata_deleteProject_result::read(::apache::thrift::protocol::TProtoc
         break;
       case 4:
         if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->pnfe.read(iprot);

<TRUNCATED>

Reply via email to