http://git-wip-us.apache.org/repos/asf/airavata/blob/47290ad1/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 54a0771..4f72e61 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
@@ -2350,11 +2350,11 @@ uint32_t 
Airavata_isGatewayExist_presult::read(::apache::thrift::protocol::TProt
 }
 
 
-Airavata_generateAndRegisterSSHKeys_args::~Airavata_generateAndRegisterSSHKeys_args()
 throw() {
+Airavata_createNotification_args::~Airavata_createNotification_args() throw() {
 }
 
 
-uint32_t 
Airavata_generateAndRegisterSSHKeys_args::read(::apache::thrift::protocol::TProtocol*
 iprot) {
+uint32_t 
Airavata_createNotification_args::read(::apache::thrift::protocol::TProtocol* 
iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -2367,8 +2367,7 @@ uint32_t 
Airavata_generateAndRegisterSSHKeys_args::read(::apache::thrift::protoc
   using ::apache::thrift::protocol::TProtocolException;
 
   bool isset_authzToken = false;
-  bool isset_gatewayId = false;
-  bool isset_userName = false;
+  bool isset_notification = false;
 
   while (true)
   {
@@ -2387,17 +2386,9 @@ uint32_t 
Airavata_generateAndRegisterSSHKeys_args::read(::apache::thrift::protoc
         }
         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 3:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->userName);
-          isset_userName = true;
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->notification.read(iprot);
+          isset_notification = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -2413,28 +2404,22 @@ uint32_t 
Airavata_generateAndRegisterSSHKeys_args::read(::apache::thrift::protoc
 
   if (!isset_authzToken)
     throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_gatewayId)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_userName)
+  if (!isset_notification)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
-uint32_t 
Airavata_generateAndRegisterSSHKeys_args::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
+uint32_t 
Airavata_createNotification_args::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_generateAndRegisterSSHKeys_args");
+  xfer += oprot->writeStructBegin("Airavata_createNotification_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->writeString(this->gatewayId);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("userName", 
::apache::thrift::protocol::T_STRING, 3);
-  xfer += oprot->writeString(this->userName);
+  xfer += oprot->writeFieldBegin("notification", 
::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += this->notification.write(oprot);
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -2443,25 +2428,21 @@ uint32_t 
Airavata_generateAndRegisterSSHKeys_args::write(::apache::thrift::proto
 }
 
 
-Airavata_generateAndRegisterSSHKeys_pargs::~Airavata_generateAndRegisterSSHKeys_pargs()
 throw() {
+Airavata_createNotification_pargs::~Airavata_createNotification_pargs() 
throw() {
 }
 
 
-uint32_t 
Airavata_generateAndRegisterSSHKeys_pargs::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
+uint32_t 
Airavata_createNotification_pargs::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_generateAndRegisterSSHKeys_pargs");
+  xfer += oprot->writeStructBegin("Airavata_createNotification_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->writeString((*(this->gatewayId)));
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("userName", 
::apache::thrift::protocol::T_STRING, 3);
-  xfer += oprot->writeString((*(this->userName)));
+  xfer += oprot->writeFieldBegin("notification", 
::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += (*(this->notification)).write(oprot);
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -2470,11 +2451,11 @@ uint32_t 
Airavata_generateAndRegisterSSHKeys_pargs::write(::apache::thrift::prot
 }
 
 
-Airavata_generateAndRegisterSSHKeys_result::~Airavata_generateAndRegisterSSHKeys_result()
 throw() {
+Airavata_createNotification_result::~Airavata_createNotification_result() 
throw() {
 }
 
 
-uint32_t 
Airavata_generateAndRegisterSSHKeys_result::read(::apache::thrift::protocol::TProtocol*
 iprot) {
+uint32_t 
Airavata_createNotification_result::read(::apache::thrift::protocol::TProtocol* 
iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -2527,6 +2508,14 @@ uint32_t 
Airavata_generateAndRegisterSSHKeys_result::read(::apache::thrift::prot
           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;
@@ -2539,11 +2528,11 @@ uint32_t 
Airavata_generateAndRegisterSSHKeys_result::read(::apache::thrift::prot
   return xfer;
 }
 
-uint32_t 
Airavata_generateAndRegisterSSHKeys_result::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
+uint32_t 
Airavata_createNotification_result::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
 
   uint32_t xfer = 0;
 
-  xfer += 
oprot->writeStructBegin("Airavata_generateAndRegisterSSHKeys_result");
+  xfer += oprot->writeStructBegin("Airavata_createNotification_result");
 
   if (this->__isset.success) {
     xfer += oprot->writeFieldBegin("success", 
::apache::thrift::protocol::T_STRING, 0);
@@ -2561,6 +2550,10 @@ uint32_t 
Airavata_generateAndRegisterSSHKeys_result::write(::apache::thrift::pro
     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();
@@ -2568,11 +2561,11 @@ uint32_t 
Airavata_generateAndRegisterSSHKeys_result::write(::apache::thrift::pro
 }
 
 
-Airavata_generateAndRegisterSSHKeys_presult::~Airavata_generateAndRegisterSSHKeys_presult()
 throw() {
+Airavata_createNotification_presult::~Airavata_createNotification_presult() 
throw() {
 }
 
 
-uint32_t 
Airavata_generateAndRegisterSSHKeys_presult::read(::apache::thrift::protocol::TProtocol*
 iprot) {
+uint32_t 
Airavata_createNotification_presult::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -2625,6 +2618,14 @@ uint32_t 
Airavata_generateAndRegisterSSHKeys_presult::read(::apache::thrift::pro
           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;
@@ -2638,11 +2639,11 @@ uint32_t 
Airavata_generateAndRegisterSSHKeys_presult::read(::apache::thrift::pro
 }
 
 
-Airavata_getSSHPubKey_args::~Airavata_getSSHPubKey_args() throw() {
+Airavata_updateNotification_args::~Airavata_updateNotification_args() throw() {
 }
 
 
-uint32_t 
Airavata_getSSHPubKey_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t 
Airavata_updateNotification_args::read(::apache::thrift::protocol::TProtocol* 
iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -2655,8 +2656,7 @@ 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_notification = false;
 
   while (true)
   {
@@ -2675,17 +2675,9 @@ 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;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->gatewayId);
-          isset_gatewayId = true;
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->notification.read(iprot);
+          isset_notification = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -2701,28 +2693,22 @@ 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)
+  if (!isset_notification)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
-uint32_t 
Airavata_getSSHPubKey_args::write(::apache::thrift::protocol::TProtocol* oprot) 
const {
+uint32_t 
Airavata_updateNotification_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_updateNotification_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->writeString(this->gatewayId);
+  xfer += oprot->writeFieldBegin("notification", 
::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += this->notification.write(oprot);
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -2731,25 +2717,21 @@ uint32_t 
Airavata_getSSHPubKey_args::write(::apache::thrift::protocol::TProtocol
 }
 
 
-Airavata_getSSHPubKey_pargs::~Airavata_getSSHPubKey_pargs() throw() {
+Airavata_updateNotification_pargs::~Airavata_updateNotification_pargs() 
throw() {
 }
 
 
-uint32_t 
Airavata_getSSHPubKey_pargs::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
+uint32_t 
Airavata_updateNotification_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_updateNotification_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->writeString((*(this->gatewayId)));
+  xfer += oprot->writeFieldBegin("notification", 
::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += (*(this->notification)).write(oprot);
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -2758,11 +2740,11 @@ uint32_t 
Airavata_getSSHPubKey_pargs::write(::apache::thrift::protocol::TProtoco
 }
 
 
-Airavata_getSSHPubKey_result::~Airavata_getSSHPubKey_result() throw() {
+Airavata_updateNotification_result::~Airavata_updateNotification_result() 
throw() {
 }
 
 
-uint32_t 
Airavata_getSSHPubKey_result::read(::apache::thrift::protocol::TProtocol* 
iprot) {
+uint32_t 
Airavata_updateNotification_result::read(::apache::thrift::protocol::TProtocol* 
iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -2783,14 +2765,6 @@ uint32_t 
Airavata_getSSHPubKey_result::read(::apache::thrift::protocol::TProtoco
     }
     switch (fid)
     {
-      case 0:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(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);
@@ -2815,6 +2789,14 @@ uint32_t 
Airavata_getSSHPubKey_result::read(::apache::thrift::protocol::TProtoco
           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;
@@ -2827,17 +2809,13 @@ 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_updateNotification_result::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
 
   uint32_t xfer = 0;
 
-  xfer += oprot->writeStructBegin("Airavata_getSSHPubKey_result");
+  xfer += oprot->writeStructBegin("Airavata_updateNotification_result");
 
-  if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", 
::apache::thrift::protocol::T_STRING, 0);
-    xfer += oprot->writeString(this->success);
-    xfer += oprot->writeFieldEnd();
-  } else if (this->__isset.ire) {
+  if (this->__isset.ire) {
     xfer += oprot->writeFieldBegin("ire", 
::apache::thrift::protocol::T_STRUCT, 1);
     xfer += this->ire.write(oprot);
     xfer += oprot->writeFieldEnd();
@@ -2849,6 +2827,10 @@ uint32_t 
Airavata_getSSHPubKey_result::write(::apache::thrift::protocol::TProtoc
     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();
@@ -2856,11 +2838,11 @@ uint32_t 
Airavata_getSSHPubKey_result::write(::apache::thrift::protocol::TProtoc
 }
 
 
-Airavata_getSSHPubKey_presult::~Airavata_getSSHPubKey_presult() throw() {
+Airavata_updateNotification_presult::~Airavata_updateNotification_presult() 
throw() {
 }
 
 
-uint32_t 
Airavata_getSSHPubKey_presult::read(::apache::thrift::protocol::TProtocol* 
iprot) {
+uint32_t 
Airavata_updateNotification_presult::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -2881,14 +2863,6 @@ uint32_t 
Airavata_getSSHPubKey_presult::read(::apache::thrift::protocol::TProtoc
     }
     switch (fid)
     {
-      case 0:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString((*(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);
@@ -2913,6 +2887,14 @@ uint32_t 
Airavata_getSSHPubKey_presult::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;
@@ -2926,11 +2908,11 @@ uint32_t 
Airavata_getSSHPubKey_presult::read(::apache::thrift::protocol::TProtoc
 }
 
 
-Airavata_getAllUserSSHPubKeys_args::~Airavata_getAllUserSSHPubKeys_args() 
throw() {
+Airavata_deleteNotification_args::~Airavata_deleteNotification_args() throw() {
 }
 
 
-uint32_t 
Airavata_getAllUserSSHPubKeys_args::read(::apache::thrift::protocol::TProtocol* 
iprot) {
+uint32_t 
Airavata_deleteNotification_args::read(::apache::thrift::protocol::TProtocol* 
iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -2943,7 +2925,8 @@ uint32_t 
Airavata_getAllUserSSHPubKeys_args::read(::apache::thrift::protocol::TP
   using ::apache::thrift::protocol::TProtocolException;
 
   bool isset_authzToken = false;
-  bool isset_userName = false;
+  bool isset_gatewayId = false;
+  bool isset_notificationId = false;
 
   while (true)
   {
@@ -2963,8 +2946,16 @@ uint32_t 
Airavata_getAllUserSSHPubKeys_args::read(::apache::thrift::protocol::TP
         break;
       case 2:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->userName);
-          isset_userName = true;
+          xfer += iprot->readString(this->gatewayId);
+          isset_gatewayId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->notificationId);
+          isset_notificationId = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -2980,22 +2971,28 @@ uint32_t 
Airavata_getAllUserSSHPubKeys_args::read(::apache::thrift::protocol::TP
 
   if (!isset_authzToken)
     throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_userName)
+  if (!isset_gatewayId)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_notificationId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
-uint32_t 
Airavata_getAllUserSSHPubKeys_args::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
+uint32_t 
Airavata_deleteNotification_args::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_getAllUserSSHPubKeys_args");
+  xfer += oprot->writeStructBegin("Airavata_deleteNotification_args");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->authzToken.write(oprot);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("userName", 
::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString(this->userName);
+  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString(this->gatewayId);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("notificationId", 
::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString(this->notificationId);
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -3004,21 +3001,25 @@ uint32_t 
Airavata_getAllUserSSHPubKeys_args::write(::apache::thrift::protocol::T
 }
 
 
-Airavata_getAllUserSSHPubKeys_pargs::~Airavata_getAllUserSSHPubKeys_pargs() 
throw() {
+Airavata_deleteNotification_pargs::~Airavata_deleteNotification_pargs() 
throw() {
 }
 
 
-uint32_t 
Airavata_getAllUserSSHPubKeys_pargs::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
+uint32_t 
Airavata_deleteNotification_pargs::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
   uint32_t xfer = 0;
   apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Airavata_getAllUserSSHPubKeys_pargs");
+  xfer += oprot->writeStructBegin("Airavata_deleteNotification_pargs");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->authzToken)).write(oprot);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("userName", 
::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString((*(this->userName)));
+  xfer += oprot->writeFieldBegin("gatewayId", 
::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString((*(this->gatewayId)));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("notificationId", 
::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString((*(this->notificationId)));
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -3027,11 +3028,11 @@ uint32_t 
Airavata_getAllUserSSHPubKeys_pargs::write(::apache::thrift::protocol::
 }
 
 
-Airavata_getAllUserSSHPubKeys_result::~Airavata_getAllUserSSHPubKeys_result() 
throw() {
+Airavata_deleteNotification_result::~Airavata_deleteNotification_result() 
throw() {
 }
 
 
-uint32_t 
Airavata_getAllUserSSHPubKeys_result::read(::apache::thrift::protocol::TProtocol*
 iprot) {
+uint32_t 
Airavata_deleteNotification_result::read(::apache::thrift::protocol::TProtocol* 
iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -3052,29 +3053,6 @@ uint32_t 
Airavata_getAllUserSSHPubKeys_result::read(::apache::thrift::protocol::
     }
     switch (fid)
     {
-      case 0:
-        if (ftype == ::apache::thrift::protocol::T_MAP) {
-          {
-            this->success.clear();
-            uint32_t _size11;
-            ::apache::thrift::protocol::TType _ktype12;
-            ::apache::thrift::protocol::TType _vtype13;
-            xfer += iprot->readMapBegin(_ktype12, _vtype13, _size11);
-            uint32_t _i15;
-            for (_i15 = 0; _i15 < _size11; ++_i15)
-            {
-              std::string _key16;
-              xfer += iprot->readString(_key16);
-              std::string& _val17 = this->success[_key16];
-              xfer += iprot->readString(_val17);
-            }
-            xfer += iprot->readMapEnd();
-          }
-          this->__isset.success = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
       case 1:
         if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ire.read(iprot);
@@ -3099,6 +3077,14 @@ uint32_t 
Airavata_getAllUserSSHPubKeys_result::read(::apache::thrift::protocol::
           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;
@@ -3111,26 +3097,13 @@ uint32_t 
Airavata_getAllUserSSHPubKeys_result::read(::apache::thrift::protocol::
   return xfer;
 }
 
-uint32_t 
Airavata_getAllUserSSHPubKeys_result::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
+uint32_t 
Airavata_deleteNotification_result::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
 
   uint32_t xfer = 0;
 
-  xfer += oprot->writeStructBegin("Airavata_getAllUserSSHPubKeys_result");
+  xfer += oprot->writeStructBegin("Airavata_deleteNotification_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 _iter18;
-      for (_iter18 = this->success.begin(); _iter18 != this->success.end(); 
++_iter18)
-      {
-        xfer += oprot->writeString(_iter18->first);
-        xfer += oprot->writeString(_iter18->second);
-      }
-      xfer += oprot->writeMapEnd();
-    }
-    xfer += oprot->writeFieldEnd();
-  } else if (this->__isset.ire) {
+  if (this->__isset.ire) {
     xfer += oprot->writeFieldBegin("ire", 
::apache::thrift::protocol::T_STRUCT, 1);
     xfer += this->ire.write(oprot);
     xfer += oprot->writeFieldEnd();
@@ -3142,6 +3115,10 @@ uint32_t 
Airavata_getAllUserSSHPubKeys_result::write(::apache::thrift::protocol:
     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();
@@ -3149,11 +3126,11 @@ uint32_t 
Airavata_getAllUserSSHPubKeys_result::write(::apache::thrift::protocol:
 }
 
 
-Airavata_getAllUserSSHPubKeys_presult::~Airavata_getAllUserSSHPubKeys_presult()
 throw() {
+Airavata_deleteNotification_presult::~Airavata_deleteNotification_presult() 
throw() {
 }
 
 
-uint32_t 
Airavata_getAllUserSSHPubKeys_presult::read(::apache::thrift::protocol::TProtocol*
 iprot) {
+uint32_t 
Airavata_deleteNotification_presult::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -3174,29 +3151,6 @@ uint32_t 
Airavata_getAllUserSSHPubKeys_presult::read(::apache::thrift::protocol:
     }
     switch (fid)
     {
-      case 0:
-        if (ftype == ::apache::thrift::protocol::T_MAP) {
-          {
-            (*(this->success)).clear();
-            uint32_t _size19;
-            ::apache::thrift::protocol::TType _ktype20;
-            ::apache::thrift::protocol::TType _vtype21;
-            xfer += iprot->readMapBegin(_ktype20, _vtype21, _size19);
-            uint32_t _i23;
-            for (_i23 = 0; _i23 < _size19; ++_i23)
-            {
-              std::string _key24;
-              xfer += iprot->readString(_key24);
-              std::string& _val25 = (*(this->success))[_key24];
-              xfer += iprot->readString(_val25);
-            }
-            xfer += iprot->readMapEnd();
-          }
-          this->__isset.success = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
       case 1:
         if (ftype == ::apache::thrift::protocol::T_STRUCT) {
           xfer += this->ire.read(iprot);
@@ -3221,6 +3175,14 @@ uint32_t 
Airavata_getAllUserSSHPubKeys_presult::read(::apache::thrift::protocol:
           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;
@@ -3234,11 +3196,11 @@ uint32_t 
Airavata_getAllUserSSHPubKeys_presult::read(::apache::thrift::protocol:
 }
 
 
-Airavata_getAllGatewaySSHPubKeys_args::~Airavata_getAllGatewaySSHPubKeys_args()
 throw() {
+Airavata_getNotification_args::~Airavata_getNotification_args() throw() {
 }
 
 
-uint32_t 
Airavata_getAllGatewaySSHPubKeys_args::read(::apache::thrift::protocol::TProtocol*
 iprot) {
+uint32_t 
Airavata_getNotification_args::read(::apache::thrift::protocol::TProtocol* 
iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -3252,6 +3214,7 @@ uint32_t 
Airavata_getAllGatewaySSHPubKeys_args::read(::apache::thrift::protocol:
 
   bool isset_authzToken = false;
   bool isset_gatewayId = false;
+  bool isset_notificationId = false;
 
   while (true)
   {
@@ -3277,6 +3240,14 @@ uint32_t 
Airavata_getAllGatewaySSHPubKeys_args::read(::apache::thrift::protocol:
           xfer += iprot->skip(ftype);
         }
         break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->notificationId);
+          isset_notificationId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
       default:
         xfer += iprot->skip(ftype);
         break;
@@ -3290,13 +3261,15 @@ uint32_t 
Airavata_getAllGatewaySSHPubKeys_args::read(::apache::thrift::protocol:
     throw TProtocolException(TProtocolException::INVALID_DATA);
   if (!isset_gatewayId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_notificationId)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
-uint32_t 
Airavata_getAllGatewaySSHPubKeys_args::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
+uint32_t 
Airavata_getNotification_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_getNotification_args");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->authzToken.write(oprot);
@@ -3306,20 +3279,24 @@ uint32_t 
Airavata_getAllGatewaySSHPubKeys_args::write(::apache::thrift::protocol
   xfer += oprot->writeString(this->gatewayId);
   xfer += oprot->writeFieldEnd();
 
+  xfer += oprot->writeFieldBegin("notificationId", 
::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString(this->notificationId);
+  xfer += oprot->writeFieldEnd();
+
   xfer += oprot->writeFieldStop();
   xfer += oprot->writeStructEnd();
   return xfer;
 }
 
 
-Airavata_getAllGatewaySSHPubKeys_pargs::~Airavata_getAllGatewaySSHPubKeys_pargs()
 throw() {
+Airavata_getNotification_pargs::~Airavata_getNotification_pargs() throw() {
 }
 
 
-uint32_t 
Airavata_getAllGatewaySSHPubKeys_pargs::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
+uint32_t 
Airavata_getNotification_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_getNotification_pargs");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->authzToken)).write(oprot);
@@ -3329,17 +3306,21 @@ uint32_t 
Airavata_getAllGatewaySSHPubKeys_pargs::write(::apache::thrift::protoco
   xfer += oprot->writeString((*(this->gatewayId)));
   xfer += oprot->writeFieldEnd();
 
+  xfer += oprot->writeFieldBegin("notificationId", 
::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString((*(this->notificationId)));
+  xfer += oprot->writeFieldEnd();
+
   xfer += oprot->writeFieldStop();
   xfer += oprot->writeStructEnd();
   return xfer;
 }
 
 
-Airavata_getAllGatewaySSHPubKeys_result::~Airavata_getAllGatewaySSHPubKeys_result()
 throw() {
+Airavata_getNotification_result::~Airavata_getNotification_result() throw() {
 }
 
 
-uint32_t 
Airavata_getAllGatewaySSHPubKeys_result::read(::apache::thrift::protocol::TProtocol*
 iprot) {
+uint32_t 
Airavata_getNotification_result::read(::apache::thrift::protocol::TProtocol* 
iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -3361,23 +3342,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 _size26;
-            ::apache::thrift::protocol::TType _ktype27;
-            ::apache::thrift::protocol::TType _vtype28;
-            xfer += iprot->readMapBegin(_ktype27, _vtype28, _size26);
-            uint32_t _i30;
-            for (_i30 = 0; _i30 < _size26; ++_i30)
-            {
-              std::string _key31;
-              xfer += iprot->readString(_key31);
-              std::string& _val32 = this->success[_key31];
-              xfer += iprot->readString(_val32);
-            }
-            xfer += iprot->readMapEnd();
-          }
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->success.read(iprot);
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -3407,6 +3373,14 @@ uint32_t 
Airavata_getAllGatewaySSHPubKeys_result::read(::apache::thrift::protoco
           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;
@@ -3419,24 +3393,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_getNotification_result::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
 
   uint32_t xfer = 0;
 
-  xfer += oprot->writeStructBegin("Airavata_getAllGatewaySSHPubKeys_result");
+  xfer += oprot->writeStructBegin("Airavata_getNotification_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 _iter33;
-      for (_iter33 = this->success.begin(); _iter33 != this->success.end(); 
++_iter33)
-      {
-        xfer += oprot->writeString(_iter33->first);
-        xfer += oprot->writeString(_iter33->second);
-      }
-      xfer += oprot->writeMapEnd();
-    }
+    xfer += oprot->writeFieldBegin("success", 
::apache::thrift::protocol::T_STRUCT, 0);
+    xfer += this->success.write(oprot);
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ire) {
     xfer += oprot->writeFieldBegin("ire", 
::apache::thrift::protocol::T_STRUCT, 1);
@@ -3450,6 +3415,10 @@ uint32_t 
Airavata_getAllGatewaySSHPubKeys_result::write(::apache::thrift::protoc
     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();
@@ -3457,11 +3426,11 @@ uint32_t 
Airavata_getAllGatewaySSHPubKeys_result::write(::apache::thrift::protoc
 }
 
 
-Airavata_getAllGatewaySSHPubKeys_presult::~Airavata_getAllGatewaySSHPubKeys_presult()
 throw() {
+Airavata_getNotification_presult::~Airavata_getNotification_presult() throw() {
 }
 
 
-uint32_t 
Airavata_getAllGatewaySSHPubKeys_presult::read(::apache::thrift::protocol::TProtocol*
 iprot) {
+uint32_t 
Airavata_getNotification_presult::read(::apache::thrift::protocol::TProtocol* 
iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -3483,23 +3452,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 _size34;
-            ::apache::thrift::protocol::TType _ktype35;
-            ::apache::thrift::protocol::TType _vtype36;
-            xfer += iprot->readMapBegin(_ktype35, _vtype36, _size34);
-            uint32_t _i38;
-            for (_i38 = 0; _i38 < _size34; ++_i38)
-            {
-              std::string _key39;
-              xfer += iprot->readString(_key39);
-              std::string& _val40 = (*(this->success))[_key39];
-              xfer += iprot->readString(_val40);
-            }
-            xfer += iprot->readMapEnd();
-          }
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += (*(this->success)).read(iprot);
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -3529,6 +3483,14 @@ uint32_t 
Airavata_getAllGatewaySSHPubKeys_presult::read(::apache::thrift::protoc
           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;
@@ -3542,11 +3504,11 @@ uint32_t 
Airavata_getAllGatewaySSHPubKeys_presult::read(::apache::thrift::protoc
 }
 
 
-Airavata_deleteSSHPubKey_args::~Airavata_deleteSSHPubKey_args() throw() {
+Airavata_getAllNotifications_args::~Airavata_getAllNotifications_args() 
throw() {
 }
 
 
-uint32_t 
Airavata_deleteSSHPubKey_args::read(::apache::thrift::protocol::TProtocol* 
iprot) {
+uint32_t 
Airavata_getAllNotifications_args::read(::apache::thrift::protocol::TProtocol* 
iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -3559,7 +3521,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)
@@ -3580,14 +3541,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 {
@@ -3605,27 +3558,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_getAllNotifications_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_getAllNotifications_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();
 
@@ -3635,24 +3582,20 @@ uint32_t 
Airavata_deleteSSHPubKey_args::write(::apache::thrift::protocol::TProto
 }
 
 
-Airavata_deleteSSHPubKey_pargs::~Airavata_deleteSSHPubKey_pargs() throw() {
+Airavata_getAllNotifications_pargs::~Airavata_getAllNotifications_pargs() 
throw() {
 }
 
 
-uint32_t 
Airavata_deleteSSHPubKey_pargs::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
+uint32_t 
Airavata_getAllNotifications_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_getAllNotifications_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();
 
@@ -3662,11 +3605,11 @@ uint32_t 
Airavata_deleteSSHPubKey_pargs::write(::apache::thrift::protocol::TProt
 }
 
 
-Airavata_deleteSSHPubKey_result::~Airavata_deleteSSHPubKey_result() throw() {
+Airavata_getAllNotifications_result::~Airavata_getAllNotifications_result() 
throw() {
 }
 
 
-uint32_t 
Airavata_deleteSSHPubKey_result::read(::apache::thrift::protocol::TProtocol* 
iprot) {
+uint32_t 
Airavata_getAllNotifications_result::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -3688,8 +3631,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 _size11;
+            ::apache::thrift::protocol::TType _etype14;
+            xfer += iprot->readListBegin(_etype14, _size11);
+            this->success.resize(_size11);
+            uint32_t _i15;
+            for (_i15 = 0; _i15 < _size11; ++_i15)
+            {
+              xfer += this->success[_i15].read(iprot);
+            }
+            xfer += iprot->readListEnd();
+          }
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -3719,6 +3674,14 @@ uint32_t 
Airavata_deleteSSHPubKey_result::read(::apache::thrift::protocol::TProt
           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;
@@ -3731,15 +3694,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_getAllNotifications_result::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
 
   uint32_t xfer = 0;
 
-  xfer += oprot->writeStructBegin("Airavata_deleteSSHPubKey_result");
+  xfer += oprot->writeStructBegin("Airavata_getAllNotifications_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::workspace::Notification> 
::const_iterator _iter16;
+      for (_iter16 = this->success.begin(); _iter16 != this->success.end(); 
++_iter16)
+      {
+        xfer += (*_iter16).write(oprot);
+      }
+      xfer += oprot->writeListEnd();
+    }
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ire) {
     xfer += oprot->writeFieldBegin("ire", 
::apache::thrift::protocol::T_STRUCT, 1);
@@ -3753,6 +3724,10 @@ uint32_t 
Airavata_deleteSSHPubKey_result::write(::apache::thrift::protocol::TPro
     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();
@@ -3760,11 +3735,11 @@ uint32_t 
Airavata_deleteSSHPubKey_result::write(::apache::thrift::protocol::TPro
 }
 
 
-Airavata_deleteSSHPubKey_presult::~Airavata_deleteSSHPubKey_presult() throw() {
+Airavata_getAllNotifications_presult::~Airavata_getAllNotifications_presult() 
throw() {
 }
 
 
-uint32_t 
Airavata_deleteSSHPubKey_presult::read(::apache::thrift::protocol::TProtocol* 
iprot) {
+uint32_t 
Airavata_getAllNotifications_presult::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -3786,8 +3761,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 _size17;
+            ::apache::thrift::protocol::TType _etype20;
+            xfer += iprot->readListBegin(_etype20, _size17);
+            (*(this->success)).resize(_size17);
+            uint32_t _i21;
+            for (_i21 = 0; _i21 < _size17; ++_i21)
+            {
+              xfer += (*(this->success))[_i21].read(iprot);
+            }
+            xfer += iprot->readListEnd();
+          }
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -3817,6 +3804,14 @@ uint32_t 
Airavata_deleteSSHPubKey_presult::read(::apache::thrift::protocol::TPro
           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;
@@ -3830,11 +3825,11 @@ uint32_t 
Airavata_deleteSSHPubKey_presult::read(::apache::thrift::protocol::TPro
 }
 
 
-Airavata_createProject_args::~Airavata_createProject_args() throw() {
+Airavata_generateAndRegisterSSHKeys_args::~Airavata_generateAndRegisterSSHKeys_args()
 throw() {
 }
 
 
-uint32_t 
Airavata_createProject_args::read(::apache::thrift::protocol::TProtocol* iprot) 
{
+uint32_t 
Airavata_generateAndRegisterSSHKeys_args::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -3848,7 +3843,7 @@ uint32_t 
Airavata_createProject_args::read(::apache::thrift::protocol::TProtocol
 
   bool isset_authzToken = false;
   bool isset_gatewayId = false;
-  bool isset_project = false;
+  bool isset_userName = false;
 
   while (true)
   {
@@ -3875,9 +3870,9 @@ uint32_t 
Airavata_createProject_args::read(::apache::thrift::protocol::TProtocol
         }
         break;
       case 3:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->project.read(iprot);
-          isset_project = true;
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->userName);
+          isset_userName = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -3895,15 +3890,15 @@ 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)
+  if (!isset_userName)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
-uint32_t 
Airavata_createProject_args::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
+uint32_t 
Airavata_generateAndRegisterSSHKeys_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_generateAndRegisterSSHKeys_args");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += this->authzToken.write(oprot);
@@ -3913,8 +3908,8 @@ 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->writeFieldBegin("userName", 
::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString(this->userName);
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -3923,14 +3918,14 @@ uint32_t 
Airavata_createProject_args::write(::apache::thrift::protocol::TProtoco
 }
 
 
-Airavata_createProject_pargs::~Airavata_createProject_pargs() throw() {
+Airavata_generateAndRegisterSSHKeys_pargs::~Airavata_generateAndRegisterSSHKeys_pargs()
 throw() {
 }
 
 
-uint32_t 
Airavata_createProject_pargs::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
+uint32_t 
Airavata_generateAndRegisterSSHKeys_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_generateAndRegisterSSHKeys_pargs");
 
   xfer += oprot->writeFieldBegin("authzToken", 
::apache::thrift::protocol::T_STRUCT, 1);
   xfer += (*(this->authzToken)).write(oprot);
@@ -3940,8 +3935,8 @@ 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->writeFieldBegin("userName", 
::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString((*(this->userName)));
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -3950,11 +3945,11 @@ uint32_t 
Airavata_createProject_pargs::write(::apache::thrift::protocol::TProtoc
 }
 
 
-Airavata_createProject_result::~Airavata_createProject_result() throw() {
+Airavata_generateAndRegisterSSHKeys_result::~Airavata_generateAndRegisterSSHKeys_result()
 throw() {
 }
 
 
-uint32_t 
Airavata_createProject_result::read(::apache::thrift::protocol::TProtocol* 
iprot) {
+uint32_t 
Airavata_generateAndRegisterSSHKeys_result::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -4007,14 +4002,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;
@@ -4027,11 +4014,11 @@ 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_generateAndRegisterSSHKeys_result::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
 
   uint32_t xfer = 0;
 
-  xfer += oprot->writeStructBegin("Airavata_createProject_result");
+  xfer += 
oprot->writeStructBegin("Airavata_generateAndRegisterSSHKeys_result");
 
   if (this->__isset.success) {
     xfer += oprot->writeFieldBegin("success", 
::apache::thrift::protocol::T_STRING, 0);
@@ -4049,10 +4036,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();
@@ -4060,11 +4043,11 @@ uint32_t 
Airavata_createProject_result::write(::apache::thrift::protocol::TProto
 }
 
 
-Airavata_createProject_presult::~Airavata_createProject_presult() throw() {
+Airavata_generateAndRegisterSSHKeys_presult::~Airavata_generateAndRegisterSSHKeys_presult()
 throw() {
 }
 
 
-uint32_t 
Airavata_createProject_presult::read(::apache::thrift::protocol::TProtocol* 
iprot) {
+uint32_t 
Airavata_generateAndRegisterSSHKeys_presult::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -4117,14 +4100,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;
@@ -4138,11 +4113,11 @@ uint32_t 
Airavata_createProject_presult::read(::apache::thrift::protocol::TProto
 }
 
 
-Airavata_updateProject_args::~Airavata_updateProject_args() throw() {
+Airavata_getSSHPubKey_args::~Airavata_getSSHPubKey_args() throw() {
 }
 
 
-uint32_t 
Airavata_updateProject_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;
@@ -4155,8 +4130,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)
   {
@@ -4176,16 +4151,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);
         }
@@ -4201,28 +4176,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_getSSHPubKey_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_getSSHPubKey_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();
@@ -4231,25 +4206,25 @@ uint32_t 
Airavata_updateProject_args::write(::apache::thrift::protocol::TProtoco
 }
 
 
-Airavata_updateProject_pargs::~Airavata_updateProject_pargs() throw() {
+Airavata_getSSHPubKey_pargs::~Airavata_getSSHPubKey_pargs() throw() {
 }
 
 
-uint32_t 
Airavata_updateProject_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_updateProject_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("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();
@@ -4258,11 +4233,11 @@ uint32_t 
Airavata_updateProject_pargs::write(::apache::thrift::protocol::TProtoc
 }
 
 
-Airavata_updateProject_result::~Airavata_updateProject_result() throw() {
+Airavata_getSSHPubKey_result::~Airavata_getSSHPubKey_result() throw() {
 }
 
 
-uint32_t 
Airavata_updateProject_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;
@@ -4283,6 +4258,14 @@ uint32_t 
Airavata_updateProject_result::read(::apache::thrift::protocol::TProtoc
     }
     switch (fid)
     {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(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);
@@ -4307,22 +4290,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;
@@ -4335,13 +4302,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_getSSHPubKey_result::write(::apache::thrift::protocol::TProtocol* 
oprot) const {
 
   uint32_t xfer = 0;
 
-  xfer += oprot->writeStructBegin("Airavata_updateProject_result");
+  xfer += oprot->writeStructBegin("Airavata_getSSHPubKey_result");
 
-  if (this->__isset.ire) {
+  if (this->__isset.success) {
+    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);
     xfer += this->ire.write(oprot);
     xfer += oprot->writeFieldEnd();
@@ -4353,14 +4324,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();
@@ -4368,11 +4331,11 @@ uint32_t 
Airavata_updateProject_result::write(::apache::thrift::protocol::TProto
 }
 
 
-Airavata_updateProject_presult::~Airavata_updateProject_presult() throw() {
+Airavata_getSSHPubKey_presult::~Airavata_getSSHPubKey_presult() throw() {
 }
 
 
-uint32_t 
Airavata_updateProject_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;
@@ -4393,6 +4356,14 @@ uint32_t 
Airavata_updateProject_presult::read(::apache::thrift::protocol::TProto
     }
     switch (fid)
     {
+      case 0:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString((*(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);
@@ -4417,22 +4388,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;
@@ -4446,11 +4401,11 @@ uint32_t 
Airavata_updateProject_presult::read(::apache::thrift::protocol::TProto
 }
 
 
-Airavata_getProject_args::~Airavata_getProject_args() throw() {
+Airavata_getAllUserSSHPubKeys_args::~Airavata_getAllUserSSHPubKeys_args() 
throw() {
 }
 
 
-uint32_t Airavata_getProject_args::read(::apache::thrift::protocol::TProtocol* 
iprot) {
+uint32_t 
Airavata_getAllUserSSHPubKeys_args::read(::apache::thrift::protocol::TProtocol* 
iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -4463,7 +4418,7 @@ 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_userName = false;
 
   while (true)
   {
@@ -4483,8 +4438,8 @@ 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->userName);
+          isset_userName = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -4500,22 +4455,22 @@ uint32_t 
Airavata_getProject_args::read(::apache::thrift::protocol::TProtocol* i
 
   if (!isset_authzToken)
     throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_projectId)
+  if (!isset_userName)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
 
-uint32_t 
Airavata_getProject_args::write(::apache::thrift::protocol::TProtocol* oprot) 
const {
+uint32_t 
Airavata_getAllUserSSHPubKeys_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_getAllUserSSHPubKeys_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("userName", 
::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString(this->userName);
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -4524,21 +4479,21 @@ uint32_t 
Airavata_getProject_args::write(::apache::thrift::protocol::TProtocol*
 }
 
 
-Airavata_getProject_pargs::~Airavata_getProject_pargs() throw() {
+Airavata_getAllUserSSHPubKeys_pargs::~Airavata_getAllUserSSHPubKeys_pargs() 
throw() {
 }
 
 
-uint32_t 
Airavata_getProject_pargs::write(::apache::thrift::protocol::TProtocol* oprot) 
const {
+uint32_t 
Airavata_getAllUserSSHPubKeys_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_getAllUserSSHPubKeys_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("userName", 
::apache::thrift::protocol::T_STRING, 2);
+  xfer += oprot->writeString((*(this->userName)));
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -4547,11 +4502,11 @@ uint32_t 
Airavata_getProject_pargs::write(::apache::thrift::protocol::TProtocol*
 }
 
 
-Airavata_getProject_result::~Airavata_getProject_result() throw() {
+Airavata_getAllUserSSHPubKeys_result::~Airavata_getAllUserSSHPubKeys_result() 
throw() {
 }
 
 
-uint32_t 
Airavata_getProject_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t 
Airavata_getAllUserSSHPubKeys_result::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -4573,8 +4528,23 @@ 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_MAP) {
+          {
+            this->success.clear();
+            uint32_t _size22;
+            ::apache::thrift::protocol::TType _ktype23;
+            ::apache::thrift::protocol::TType _vtype24;
+            xfer += iprot->readMapBegin(_ktype23, _vtype24, _size22);
+            uint32_t _i26;
+            for (_i26 = 0; _i26 < _size22; ++_i26)
+            {
+              std::string _key27;
+              xfer += iprot->readString(_key27);
+              std::string& _val28 = this->success[_key27];
+              xfer += iprot->readString(_val28);
+            }
+            xfer += iprot->readMapEnd();
+          }
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -4604,22 +4574,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;
@@ -4632,15 +4586,24 @@ 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_getAllUserSSHPubKeys_result::write(::apache::thrift::protocol::TProtocol*
 oprot) const {
 
   uint32_t xfer = 0;
 
-  xfer += oprot->writeStructBegin("Airavata_getProject_result");
+  xfer += oprot->writeStructBegin("Airavata_getAllUserSSHPubKeys_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_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 _iter29;
+      for (_iter29 = this->success.begin(); _iter29 != this->success.end(); 
++_iter29)
+      {
+        xfer += oprot->writeString(_iter29->first);
+        xfer += oprot->writeString(_iter29->second);
+      }
+      xfer += oprot->writeMapEnd();
+    }
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ire) {
     xfer += oprot->writeFieldBegin("ire", 
::apache::thrift::protocol::T_STRUCT, 1);
@@ -4654,14 +4617,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();
@@ -4669,11 +4624,11 @@ uint32_t 
Airavata_getProject_result::write(::apache::thrift::protocol::TProtocol
 }
 
 
-Airavata_getProject_presult::~Airavata_getProject_presult() throw() {
+Airavata_getAllUserSSHPubKeys_presult::~Airavata_getAllUserSSHPubKeys_presult()
 throw() {
 }
 
 
-uint32_t 
Airavata_getProject_presult::read(::apache::thrift::protocol::TProtocol* iprot) 
{
+uint32_t 
Airavata_getAllUserSSHPubKeys_presult::read(::apache::thrift::protocol::TProtocol*
 iprot) {
 
   apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
@@ -4695,8 +4650,23 @@ 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_MAP) {
+          {
+            (*(this->success)).clear();
+            uint32_t _size30;
+            ::apache::thrift::protocol::TType _ktype31;
+            ::apache::thrift::protocol::TType _vtype32;
+            xfer += iprot->readMapBegin(_ktype31, _vtype32, _size30);
+            uint32_t _i34;
+            for (_i34 = 0; _i34 < _size30; ++_i34)
+            {
+              std::string _key35;
+              xfer += iprot->readString(_key35);
+              std::string& _val36 = (*(this->success))[_key35];
+              xfer += iprot->readString(_val36);
+            }
+            xfer += iprot->readMapEnd();
+          }
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -4726,22 +4696,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;
@@ -4755,11 +4709,11 @@ uint32_t 
Airavata_getProject_presult::read(::apache::thrift::protocol::TProtocol
 }
 
 
-Airavata_deleteProject_args::~Airavata_deleteProject_args() throw() {
+Airavata_getAllGatewaySSHPubKeys_args::~Airavata_getAllGatewaySSHPubKeys_args()
 throw() {
 }
 
 
-uint32_t 
Airavata_deleteProject_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;
@@ -4772,7 +4726,7 @@ 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;
 
   while (true)
   {
@@ -4792,8 +4746,8 @@ 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);
         }
@@ -4809,22 +4763,22 @@ 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);
   return xfer;
 }
 
-uint32_t 
Airavata_deleteProject_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_deleteProject_args");
+  xfer += oprot->writeStructBegin("Airavata_getAllGatewaySSHPubKeys_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->writeFieldStop();
@@ -4833,21 +4787,21 @@ uint32_t 
Airavata_deleteProject_args::write(::apache::thrift::protocol::TProtoco
 }
 
 
-Airavata_deleteProject_pargs::~Airavata_deleteProject_pargs() throw() {
+Airavata_getAllGatewaySSHPubKeys_pargs::~Airavata_getAllGatewaySSHPubKeys_pargs()
 throw() {
 }
 
 
-uint32_t 
Airavata_deleteProject_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_deleteProject_pargs");
+  xfer += oprot->writeStructBegin("Airavata_getAllGatewaySSHPubKeys_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->writeFieldStop();
@@ -4856,11 +4810,11 @@ uint32_t 
Airavata_deleteProject_pargs::write(::apache::thrift::protocol::TProtoc
 }
 
 
-Airavata_deleteProject_result::~Airavata_deleteProject_result() throw() {
+Airavata_getAllGatewaySSHPubKeys_result::~Airavata_getAllGatewaySSHPubKeys_result()
 throw() {
 }
 
 
-uint32_t 
Airavata_deleteProject_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;
@@ -4882,8 +4836,23 @@ 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_MAP) {
+          {
+            this->success.clear();
+            uint32_t _size37;
+            ::apache::thrift::protocol::TType _ktype38;
+            ::apache::thrift::protocol::TType _vtype39;
+            xfer += iprot->readMapBegin(_ktype38, _vtype39, _size37);
+            uint32_t _i41;
+            for (_i41 = 0; _i41 < _size37; ++_i41)
+            {
+              std::string _key42;
+              xfer += iprot->readString(_key42);
+              std::string& _val43 = this->success[_key42];
+              xfer += iprot->readString(_val43);
+            }
+            xfer += iprot->readMapEnd();
+          }
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -4913,22 +4882,6 @@ uint32_t 
Airavata_deleteProject_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;
@@ -4941,15 +4894,24 @@ uint32_t 
Airavata_deleteProject_result::read(::apache::thrift::protocol::TProtoc
   return xfer;
 }
 
-uint32_t 
Airavata_deleteProject_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_deleteProject_result");
+  xfer += oprot->writeStructBegin("Airavata_getAllGatewaySSHPubKeys_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_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 _iter44;
+      for (_iter44 = this->success.begin(); _iter44 != this->success.end(); 
++_iter44)
+      {
+        xfer += oprot->writeString(_iter44->first);
+        xfer += oprot->writeString(_iter44->second);
+      }
+      xfer += oprot->writeMapEnd();
+    }
     xfer += oprot->writeFieldEnd();
   } else if (this->__isset.ire) {
     xfer += oprot->writeFieldBegin("ire", 
::apache::thrift::protocol::T_STRUCT, 1);
@@ -4963,14 +4925,6 @@ uint32_t 
Airavata_deleteProject_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();
@@ -4978,11 +4932,11 @@ uint32_t 
Airavata_deleteProject_result::write(::apache::thrift::protocol::TProto
 }
 
 
-Airavata_deleteProject_presult::~Airavata_deleteProject_presult() throw() {
+Airavata_getAllGatewaySSHPubKeys_presult::~Airavata_getAllGatewaySSHPubKeys_presult()
 throw() {
 }
 
 
-uint32_t 
Airavata_deleteProject_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;
@@ -5004,8 +4958,23 @@ uint32_t 
Airavata_deleteProject_presult::read(::apache::thrift::protocol::TProto
     switch (fid)
     {
       case 0:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool((*(this->success)));
+        if (ftype == ::apache::thrift::protocol::T_MAP) {
+          {
+            (*(this->success)).clear();
+            uint32_t _size45;
+            ::apache::thrift::protocol::TType _ktype46;
+            ::apache::thrift::protocol::TType _vtype47;
+            xfer += iprot->readMapBegin(_ktype46, _vtype47, _size45);
+            uint32_t _i49;
+            for (_i49 = 0; _i49 < _size45; ++_i49)
+            {
+              std::string _key50;
+              xfer += iprot->readString(_key50);
+              std::string& _val51 = (*(this->success))[_key50];
+              xfer += iprot->readString(_val51);
+            }
+            xfer += iprot->readMapEnd();
+          }
           this->__isset.success = true;
         } else {
           xfer += iprot->skip(ftype);
@@ -5035,22 +5004,6 @@ uint32_t 
Airavata_deleteProject_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;
@@ -5064,11 +5017,11 @@ uint32_t 
Airavata_deleteProject_presult::read(::apache::thrift::protocol::TProto
 }
 
 
-Airavata_getUserProjects_args::~Airavata_getUserProjects_args() throw() {
+Airavata_deleteSSHPubKey_args::~Airavata_deleteSSHPubKey_args() throw() {
 }
 
 
-uint32_t 
Airavata_getUserProjects_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;
@@ -5081,10 +5034,8 @@ uint32_t 
Airavata_getUserProjects_args::read(::apache::thrift::protocol::TProtoc
   using ::apache::thrift::protocol::TProtocolException;
 
   bool isset_authzToken = false;
+  bool isset_airavataCredStoreToken = false;
   bool isset_gatewayId = false;
-  bool isset_userName = false;
-  bool isset_limit = false;
-  bool isset_offset = false;
 
   while (true)
   {
@@ -5104,32 +5055,16 @@ uint32_t 
Airavata_getUserProjects_args::read(::apache::thrift::protocol::TProtoc
         break;
       case 2:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->gatewayId);
-          isset_gatewayId = true;
+          xfer += iprot->readString(this->airavataCredStoreToken);
+          isset_airavataCredStoreToken = true;
         } else {
           xfer += i

<TRUNCATED>

Reply via email to