http://git-wip-us.apache.org/repos/asf/airavata/blob/5aa40b8a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
----------------------------------------------------------------------
diff --git 
a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
 
b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
index 565e9c6..f5c4276 100644
--- 
a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
+++ 
b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
@@ -50,7 +50,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-08-09")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-10-10")
 public class CredentialStoreService {
 
   public interface Iface {
@@ -68,12 +68,16 @@ public class CredentialStoreService {
      */
     public String 
addSSHCredential(org.apache.airavata.credential.store.datamodel.SSHCredential 
sshCredential) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
+    public String 
addSSHCredentialSummary(org.apache.airavata.credential.store.datamodel.SSHCredentialSummary
 sshCredentialSummary) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
+
     public String 
addCertificateCredential(org.apache.airavata.credential.store.datamodel.CertificateCredential
 certificateCredential) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
     public String 
addPasswordCredential(org.apache.airavata.credential.store.datamodel.PasswordCredential
 passwordCredential) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
     public org.apache.airavata.credential.store.datamodel.SSHCredential 
getSSHCredential(String tokenId, String gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
+    public org.apache.airavata.credential.store.datamodel.SSHCredentialSummary 
getSSHCredentialSummary(String tokenId, String gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
+
     public 
org.apache.airavata.credential.store.datamodel.CertificateCredential 
getCertificateCredential(String tokenId, String gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
     public org.apache.airavata.credential.store.datamodel.PasswordCredential 
getPasswordCredential(String tokenId, String gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
@@ -86,6 +90,8 @@ public class CredentialStoreService {
 
     public boolean deleteSSHCredential(String tokenId, String gatewayId) 
throws org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
+    public boolean deleteSSHCredentialSummary(String tokenId, String 
gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
+
     public boolean deletePWDCredential(String tokenId, String gatewayId) 
throws org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
   }
@@ -96,12 +102,16 @@ public class CredentialStoreService {
 
     public void 
addSSHCredential(org.apache.airavata.credential.store.datamodel.SSHCredential 
sshCredential, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
 
+    public void 
addSSHCredentialSummary(org.apache.airavata.credential.store.datamodel.SSHCredentialSummary
 sshCredentialSummary, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
+
     public void 
addCertificateCredential(org.apache.airavata.credential.store.datamodel.CertificateCredential
 certificateCredential, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
     public void 
addPasswordCredential(org.apache.airavata.credential.store.datamodel.PasswordCredential
 passwordCredential, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
 
     public void getSSHCredential(String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
+    public void getSSHCredentialSummary(String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+
     public void getCertificateCredential(String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
     public void getPasswordCredential(String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
@@ -114,6 +124,8 @@ public class CredentialStoreService {
 
     public void deleteSSHCredential(String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
+    public void deleteSSHCredentialSummary(String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+
     public void deletePWDCredential(String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
   }
@@ -186,6 +198,32 @@ public class CredentialStoreService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "addSSHCredential failed: unknown result");
     }
 
+    public String 
addSSHCredentialSummary(org.apache.airavata.credential.store.datamodel.SSHCredentialSummary
 sshCredentialSummary) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
+    {
+      send_addSSHCredentialSummary(sshCredentialSummary);
+      return recv_addSSHCredentialSummary();
+    }
+
+    public void 
send_addSSHCredentialSummary(org.apache.airavata.credential.store.datamodel.SSHCredentialSummary
 sshCredentialSummary) throws org.apache.thrift.TException
+    {
+      addSSHCredentialSummary_args args = new addSSHCredentialSummary_args();
+      args.setSshCredentialSummary(sshCredentialSummary);
+      sendBase("addSSHCredentialSummary", args);
+    }
+
+    public String recv_addSSHCredentialSummary() throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
+    {
+      addSSHCredentialSummary_result result = new 
addSSHCredentialSummary_result();
+      receiveBase(result, "addSSHCredentialSummary");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.csException != null) {
+        throw result.csException;
+      }
+      throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "addSSHCredentialSummary failed: unknown result");
+    }
+
     public String 
addCertificateCredential(org.apache.airavata.credential.store.datamodel.CertificateCredential
 certificateCredential) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
     {
       send_addCertificateCredential(certificateCredential);
@@ -265,6 +303,33 @@ public class CredentialStoreService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getSSHCredential failed: unknown result");
     }
 
+    public org.apache.airavata.credential.store.datamodel.SSHCredentialSummary 
getSSHCredentialSummary(String tokenId, String gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
+    {
+      send_getSSHCredentialSummary(tokenId, gatewayId);
+      return recv_getSSHCredentialSummary();
+    }
+
+    public void send_getSSHCredentialSummary(String tokenId, String gatewayId) 
throws org.apache.thrift.TException
+    {
+      getSSHCredentialSummary_args args = new getSSHCredentialSummary_args();
+      args.setTokenId(tokenId);
+      args.setGatewayId(gatewayId);
+      sendBase("getSSHCredentialSummary", args);
+    }
+
+    public org.apache.airavata.credential.store.datamodel.SSHCredentialSummary 
recv_getSSHCredentialSummary() throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
+    {
+      getSSHCredentialSummary_result result = new 
getSSHCredentialSummary_result();
+      receiveBase(result, "getSSHCredentialSummary");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.csException != null) {
+        throw result.csException;
+      }
+      throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getSSHCredentialSummary failed: unknown result");
+    }
+
     public 
org.apache.airavata.credential.store.datamodel.CertificateCredential 
getCertificateCredential(String tokenId, String gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
     {
       send_getCertificateCredential(tokenId, gatewayId);
@@ -424,6 +489,33 @@ public class CredentialStoreService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "deleteSSHCredential failed: unknown result");
     }
 
+    public boolean deleteSSHCredentialSummary(String tokenId, String 
gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
+    {
+      send_deleteSSHCredentialSummary(tokenId, gatewayId);
+      return recv_deleteSSHCredentialSummary();
+    }
+
+    public void send_deleteSSHCredentialSummary(String tokenId, String 
gatewayId) throws org.apache.thrift.TException
+    {
+      deleteSSHCredentialSummary_args args = new 
deleteSSHCredentialSummary_args();
+      args.setTokenId(tokenId);
+      args.setGatewayId(gatewayId);
+      sendBase("deleteSSHCredentialSummary", args);
+    }
+
+    public boolean recv_deleteSSHCredentialSummary() throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
+    {
+      deleteSSHCredentialSummary_result result = new 
deleteSSHCredentialSummary_result();
+      receiveBase(result, "deleteSSHCredentialSummary");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.csException != null) {
+        throw result.csException;
+      }
+      throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "deleteSSHCredentialSummary failed: unknown result");
+    }
+
     public boolean deletePWDCredential(String tokenId, String gatewayId) 
throws org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
     {
       send_deletePWDCredential(tokenId, gatewayId);
@@ -530,6 +622,38 @@ public class CredentialStoreService {
       }
     }
 
+    public void 
addSSHCredentialSummary(org.apache.airavata.credential.store.datamodel.SSHCredentialSummary
 sshCredentialSummary, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      addSSHCredentialSummary_call method_call = new 
addSSHCredentialSummary_call(sshCredentialSummary, resultHandler, this, 
___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class addSSHCredentialSummary_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private 
org.apache.airavata.credential.store.datamodel.SSHCredentialSummary 
sshCredentialSummary;
+      public 
addSSHCredentialSummary_call(org.apache.airavata.credential.store.datamodel.SSHCredentialSummary
 sshCredentialSummary, org.apache.thrift.async.AsyncMethodCallback 
resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.sshCredentialSummary = sshCredentialSummary;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
+        prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("addSSHCredentialSummary", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
+        addSSHCredentialSummary_args args = new addSSHCredentialSummary_args();
+        args.setSshCredentialSummary(sshCredentialSummary);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public String getResult() throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException {
+        if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = 
new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = 
client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_addSSHCredentialSummary();
+      }
+    }
+
     public void 
addCertificateCredential(org.apache.airavata.credential.store.datamodel.CertificateCredential
 certificateCredential, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException {
       checkReady();
       addCertificateCredential_call method_call = new 
addCertificateCredential_call(certificateCredential, resultHandler, this, 
___protocolFactory, ___transport);
@@ -629,6 +753,41 @@ public class CredentialStoreService {
       }
     }
 
+    public void getSSHCredentialSummary(String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+      checkReady();
+      getSSHCredentialSummary_call method_call = new 
getSSHCredentialSummary_call(tokenId, gatewayId, resultHandler, this, 
___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class getSSHCredentialSummary_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private String tokenId;
+      private String gatewayId;
+      public getSSHCredentialSummary_call(String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.tokenId = tokenId;
+        this.gatewayId = gatewayId;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
+        prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getSSHCredentialSummary", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getSSHCredentialSummary_args args = new getSSHCredentialSummary_args();
+        args.setTokenId(tokenId);
+        args.setGatewayId(gatewayId);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public 
org.apache.airavata.credential.store.datamodel.SSHCredentialSummary getResult() 
throws org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException {
+        if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = 
new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = 
client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_getSSHCredentialSummary();
+      }
+    }
+
     public void getCertificateCredential(String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
       getCertificateCredential_call method_call = new 
getCertificateCredential_call(tokenId, gatewayId, resultHandler, this, 
___protocolFactory, ___transport);
@@ -830,6 +989,41 @@ public class CredentialStoreService {
       }
     }
 
+    public void deleteSSHCredentialSummary(String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+      checkReady();
+      deleteSSHCredentialSummary_call method_call = new 
deleteSSHCredentialSummary_call(tokenId, gatewayId, resultHandler, this, 
___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class deleteSSHCredentialSummary_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private String tokenId;
+      private String gatewayId;
+      public deleteSSHCredentialSummary_call(String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.tokenId = tokenId;
+        this.gatewayId = gatewayId;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
+        prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("deleteSSHCredentialSummary", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
+        deleteSSHCredentialSummary_args args = new 
deleteSSHCredentialSummary_args();
+        args.setTokenId(tokenId);
+        args.setGatewayId(gatewayId);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public boolean getResult() throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException {
+        if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = 
new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = 
client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_deleteSSHCredentialSummary();
+      }
+    }
+
     public void deletePWDCredential(String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
       deletePWDCredential_call method_call = new 
deletePWDCredential_call(tokenId, gatewayId, resultHandler, this, 
___protocolFactory, ___transport);
@@ -880,15 +1074,18 @@ public class CredentialStoreService {
     private static <I extends Iface> Map<String,  
org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> 
getProcessMap(Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  
org.apache.thrift.TBase>> processMap) {
       processMap.put("getCSServiceVersion", new getCSServiceVersion());
       processMap.put("addSSHCredential", new addSSHCredential());
+      processMap.put("addSSHCredentialSummary", new addSSHCredentialSummary());
       processMap.put("addCertificateCredential", new 
addCertificateCredential());
       processMap.put("addPasswordCredential", new addPasswordCredential());
       processMap.put("getSSHCredential", new getSSHCredential());
+      processMap.put("getSSHCredentialSummary", new getSSHCredentialSummary());
       processMap.put("getCertificateCredential", new 
getCertificateCredential());
       processMap.put("getPasswordCredential", new getPasswordCredential());
       processMap.put("getAllSSHKeysForUser", new getAllSSHKeysForUser());
       processMap.put("getAllSSHKeysForGateway", new getAllSSHKeysForGateway());
       processMap.put("getAllPWDCredentialsForGateway", new 
getAllPWDCredentialsForGateway());
       processMap.put("deleteSSHCredential", new deleteSSHCredential());
+      processMap.put("deleteSSHCredentialSummary", new 
deleteSSHCredentialSummary());
       processMap.put("deletePWDCredential", new deletePWDCredential());
       return processMap;
     }
@@ -937,6 +1134,30 @@ public class CredentialStoreService {
       }
     }
 
+    public static class addSSHCredentialSummary<I extends Iface> extends 
org.apache.thrift.ProcessFunction<I, addSSHCredentialSummary_args> {
+      public addSSHCredentialSummary() {
+        super("addSSHCredentialSummary");
+      }
+
+      public addSSHCredentialSummary_args getEmptyArgsInstance() {
+        return new addSSHCredentialSummary_args();
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public addSSHCredentialSummary_result getResult(I iface, 
addSSHCredentialSummary_args args) throws org.apache.thrift.TException {
+        addSSHCredentialSummary_result result = new 
addSSHCredentialSummary_result();
+        try {
+          result.success = 
iface.addSSHCredentialSummary(args.sshCredentialSummary);
+        } catch 
(org.apache.airavata.credential.store.exception.CredentialStoreException 
csException) {
+          result.csException = csException;
+        }
+        return result;
+      }
+    }
+
     public static class addCertificateCredential<I extends Iface> extends 
org.apache.thrift.ProcessFunction<I, addCertificateCredential_args> {
       public addCertificateCredential() {
         super("addCertificateCredential");
@@ -1009,6 +1230,30 @@ public class CredentialStoreService {
       }
     }
 
+    public static class getSSHCredentialSummary<I extends Iface> extends 
org.apache.thrift.ProcessFunction<I, getSSHCredentialSummary_args> {
+      public getSSHCredentialSummary() {
+        super("getSSHCredentialSummary");
+      }
+
+      public getSSHCredentialSummary_args getEmptyArgsInstance() {
+        return new getSSHCredentialSummary_args();
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public getSSHCredentialSummary_result getResult(I iface, 
getSSHCredentialSummary_args args) throws org.apache.thrift.TException {
+        getSSHCredentialSummary_result result = new 
getSSHCredentialSummary_result();
+        try {
+          result.success = iface.getSSHCredentialSummary(args.tokenId, 
args.gatewayId);
+        } catch 
(org.apache.airavata.credential.store.exception.CredentialStoreException 
csException) {
+          result.csException = csException;
+        }
+        return result;
+      }
+    }
+
     public static class getCertificateCredential<I extends Iface> extends 
org.apache.thrift.ProcessFunction<I, getCertificateCredential_args> {
       public getCertificateCredential() {
         super("getCertificateCredential");
@@ -1154,6 +1399,31 @@ public class CredentialStoreService {
       }
     }
 
+    public static class deleteSSHCredentialSummary<I extends Iface> extends 
org.apache.thrift.ProcessFunction<I, deleteSSHCredentialSummary_args> {
+      public deleteSSHCredentialSummary() {
+        super("deleteSSHCredentialSummary");
+      }
+
+      public deleteSSHCredentialSummary_args getEmptyArgsInstance() {
+        return new deleteSSHCredentialSummary_args();
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public deleteSSHCredentialSummary_result getResult(I iface, 
deleteSSHCredentialSummary_args args) throws org.apache.thrift.TException {
+        deleteSSHCredentialSummary_result result = new 
deleteSSHCredentialSummary_result();
+        try {
+          result.success = iface.deleteSSHCredentialSummary(args.tokenId, 
args.gatewayId);
+          result.setSuccessIsSet(true);
+        } catch 
(org.apache.airavata.credential.store.exception.CredentialStoreException 
csException) {
+          result.csException = csException;
+        }
+        return result;
+      }
+    }
+
     public static class deletePWDCredential<I extends Iface> extends 
org.apache.thrift.ProcessFunction<I, deletePWDCredential_args> {
       public deletePWDCredential() {
         super("deletePWDCredential");
@@ -1194,15 +1464,18 @@ public class CredentialStoreService {
     private static <I extends AsyncIface> Map<String,  
org.apache.thrift.AsyncProcessFunction<I, ? extends  
org.apache.thrift.TBase,?>> getProcessMap(Map<String,  
org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, 
?>> processMap) {
       processMap.put("getCSServiceVersion", new getCSServiceVersion());
       processMap.put("addSSHCredential", new addSSHCredential());
+      processMap.put("addSSHCredentialSummary", new addSSHCredentialSummary());
       processMap.put("addCertificateCredential", new 
addCertificateCredential());
       processMap.put("addPasswordCredential", new addPasswordCredential());
       processMap.put("getSSHCredential", new getSSHCredential());
+      processMap.put("getSSHCredentialSummary", new getSSHCredentialSummary());
       processMap.put("getCertificateCredential", new 
getCertificateCredential());
       processMap.put("getPasswordCredential", new getPasswordCredential());
       processMap.put("getAllSSHKeysForUser", new getAllSSHKeysForUser());
       processMap.put("getAllSSHKeysForGateway", new getAllSSHKeysForGateway());
       processMap.put("getAllPWDCredentialsForGateway", new 
getAllPWDCredentialsForGateway());
       processMap.put("deleteSSHCredential", new deleteSSHCredential());
+      processMap.put("deleteSSHCredentialSummary", new 
deleteSSHCredentialSummary());
       processMap.put("deletePWDCredential", new deletePWDCredential());
       return processMap;
     }
@@ -1315,6 +1588,63 @@ public class CredentialStoreService {
       }
     }
 
+    public static class addSSHCredentialSummary<I extends AsyncIface> extends 
org.apache.thrift.AsyncProcessFunction<I, addSSHCredentialSummary_args, String> 
{
+      public addSSHCredentialSummary() {
+        super("addSSHCredentialSummary");
+      }
+
+      public addSSHCredentialSummary_args getEmptyArgsInstance() {
+        return new addSSHCredentialSummary_args();
+      }
+
+      public AsyncMethodCallback<String> getResultHandler(final 
AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<String>() { 
+          public void onComplete(String o) {
+            addSSHCredentialSummary_result result = new 
addSSHCredentialSummary_result();
+            result.success = o;
+            try {
+              fcall.sendResponse(fb,result, 
org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+              return;
+            } catch (Exception e) {
+              LOGGER.error("Exception writing to internal frame buffer", e);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            addSSHCredentialSummary_result result = new 
addSSHCredentialSummary_result();
+            if (e instanceof 
org.apache.airavata.credential.store.exception.CredentialStoreException) {
+                        result.csException = 
(org.apache.airavata.credential.store.exception.CredentialStoreException) e;
+                        result.setCsExceptionIsSet(true);
+                        msg = result;
+            }
+             else 
+            {
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TBase)new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR,
 e.getMessage());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+              return;
+            } catch (Exception ex) {
+              LOGGER.error("Exception writing to internal frame buffer", ex);
+            }
+            fb.close();
+          }
+        };
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public void start(I iface, addSSHCredentialSummary_args args, 
org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws 
TException {
+        iface.addSSHCredentialSummary(args.sshCredentialSummary,resultHandler);
+      }
+    }
+
     public static class addCertificateCredential<I extends AsyncIface> extends 
org.apache.thrift.AsyncProcessFunction<I, addCertificateCredential_args, 
String> {
       public addCertificateCredential() {
         super("addCertificateCredential");
@@ -1486,20 +1816,20 @@ public class CredentialStoreService {
       }
     }
 
-    public static class getCertificateCredential<I extends AsyncIface> extends 
org.apache.thrift.AsyncProcessFunction<I, getCertificateCredential_args, 
org.apache.airavata.credential.store.datamodel.CertificateCredential> {
-      public getCertificateCredential() {
-        super("getCertificateCredential");
+    public static class getSSHCredentialSummary<I extends AsyncIface> extends 
org.apache.thrift.AsyncProcessFunction<I, getSSHCredentialSummary_args, 
org.apache.airavata.credential.store.datamodel.SSHCredentialSummary> {
+      public getSSHCredentialSummary() {
+        super("getSSHCredentialSummary");
       }
 
-      public getCertificateCredential_args getEmptyArgsInstance() {
-        return new getCertificateCredential_args();
+      public getSSHCredentialSummary_args getEmptyArgsInstance() {
+        return new getSSHCredentialSummary_args();
       }
 
-      public 
AsyncMethodCallback<org.apache.airavata.credential.store.datamodel.CertificateCredential>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public 
AsyncMethodCallback<org.apache.airavata.credential.store.datamodel.SSHCredentialSummary>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new 
AsyncMethodCallback<org.apache.airavata.credential.store.datamodel.CertificateCredential>()
 { 
-          public void 
onComplete(org.apache.airavata.credential.store.datamodel.CertificateCredential 
o) {
-            getCertificateCredential_result result = new 
getCertificateCredential_result();
+        return new 
AsyncMethodCallback<org.apache.airavata.credential.store.datamodel.SSHCredentialSummary>()
 { 
+          public void 
onComplete(org.apache.airavata.credential.store.datamodel.SSHCredentialSummary 
o) {
+            getSSHCredentialSummary_result result = new 
getSSHCredentialSummary_result();
             result.success = o;
             try {
               fcall.sendResponse(fb,result, 
org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -1512,7 +1842,7 @@ public class CredentialStoreService {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            getCertificateCredential_result result = new 
getCertificateCredential_result();
+            getSSHCredentialSummary_result result = new 
getSSHCredentialSummary_result();
             if (e instanceof 
org.apache.airavata.credential.store.exception.CredentialStoreException) {
                         result.csException = 
(org.apache.airavata.credential.store.exception.CredentialStoreException) e;
                         result.setCsExceptionIsSet(true);
@@ -1538,25 +1868,82 @@ public class CredentialStoreService {
         return false;
       }
 
-      public void start(I iface, getCertificateCredential_args args, 
org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.credential.store.datamodel.CertificateCredential>
 resultHandler) throws TException {
-        iface.getCertificateCredential(args.tokenId, 
args.gatewayId,resultHandler);
+      public void start(I iface, getSSHCredentialSummary_args args, 
org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.credential.store.datamodel.SSHCredentialSummary>
 resultHandler) throws TException {
+        iface.getSSHCredentialSummary(args.tokenId, 
args.gatewayId,resultHandler);
       }
     }
 
-    public static class getPasswordCredential<I extends AsyncIface> extends 
org.apache.thrift.AsyncProcessFunction<I, getPasswordCredential_args, 
org.apache.airavata.credential.store.datamodel.PasswordCredential> {
-      public getPasswordCredential() {
-        super("getPasswordCredential");
+    public static class getCertificateCredential<I extends AsyncIface> extends 
org.apache.thrift.AsyncProcessFunction<I, getCertificateCredential_args, 
org.apache.airavata.credential.store.datamodel.CertificateCredential> {
+      public getCertificateCredential() {
+        super("getCertificateCredential");
       }
 
-      public getPasswordCredential_args getEmptyArgsInstance() {
-        return new getPasswordCredential_args();
+      public getCertificateCredential_args getEmptyArgsInstance() {
+        return new getCertificateCredential_args();
       }
 
-      public 
AsyncMethodCallback<org.apache.airavata.credential.store.datamodel.PasswordCredential>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public 
AsyncMethodCallback<org.apache.airavata.credential.store.datamodel.CertificateCredential>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new 
AsyncMethodCallback<org.apache.airavata.credential.store.datamodel.PasswordCredential>()
 { 
-          public void 
onComplete(org.apache.airavata.credential.store.datamodel.PasswordCredential o) 
{
-            getPasswordCredential_result result = new 
getPasswordCredential_result();
+        return new 
AsyncMethodCallback<org.apache.airavata.credential.store.datamodel.CertificateCredential>()
 { 
+          public void 
onComplete(org.apache.airavata.credential.store.datamodel.CertificateCredential 
o) {
+            getCertificateCredential_result result = new 
getCertificateCredential_result();
+            result.success = o;
+            try {
+              fcall.sendResponse(fb,result, 
org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+              return;
+            } catch (Exception e) {
+              LOGGER.error("Exception writing to internal frame buffer", e);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            getCertificateCredential_result result = new 
getCertificateCredential_result();
+            if (e instanceof 
org.apache.airavata.credential.store.exception.CredentialStoreException) {
+                        result.csException = 
(org.apache.airavata.credential.store.exception.CredentialStoreException) e;
+                        result.setCsExceptionIsSet(true);
+                        msg = result;
+            }
+             else 
+            {
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TBase)new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR,
 e.getMessage());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+              return;
+            } catch (Exception ex) {
+              LOGGER.error("Exception writing to internal frame buffer", ex);
+            }
+            fb.close();
+          }
+        };
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public void start(I iface, getCertificateCredential_args args, 
org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.credential.store.datamodel.CertificateCredential>
 resultHandler) throws TException {
+        iface.getCertificateCredential(args.tokenId, 
args.gatewayId,resultHandler);
+      }
+    }
+
+    public static class getPasswordCredential<I extends AsyncIface> extends 
org.apache.thrift.AsyncProcessFunction<I, getPasswordCredential_args, 
org.apache.airavata.credential.store.datamodel.PasswordCredential> {
+      public getPasswordCredential() {
+        super("getPasswordCredential");
+      }
+
+      public getPasswordCredential_args getEmptyArgsInstance() {
+        return new getPasswordCredential_args();
+      }
+
+      public 
AsyncMethodCallback<org.apache.airavata.credential.store.datamodel.PasswordCredential>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new 
AsyncMethodCallback<org.apache.airavata.credential.store.datamodel.PasswordCredential>()
 { 
+          public void 
onComplete(org.apache.airavata.credential.store.datamodel.PasswordCredential o) 
{
+            getPasswordCredential_result result = new 
getPasswordCredential_result();
             result.success = o;
             try {
               fcall.sendResponse(fb,result, 
org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -1829,6 +2216,64 @@ public class CredentialStoreService {
       }
     }
 
+    public static class deleteSSHCredentialSummary<I extends AsyncIface> 
extends org.apache.thrift.AsyncProcessFunction<I, 
deleteSSHCredentialSummary_args, Boolean> {
+      public deleteSSHCredentialSummary() {
+        super("deleteSSHCredentialSummary");
+      }
+
+      public deleteSSHCredentialSummary_args getEmptyArgsInstance() {
+        return new deleteSSHCredentialSummary_args();
+      }
+
+      public AsyncMethodCallback<Boolean> getResultHandler(final 
AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<Boolean>() { 
+          public void onComplete(Boolean o) {
+            deleteSSHCredentialSummary_result result = new 
deleteSSHCredentialSummary_result();
+            result.success = o;
+            result.setSuccessIsSet(true);
+            try {
+              fcall.sendResponse(fb,result, 
org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+              return;
+            } catch (Exception e) {
+              LOGGER.error("Exception writing to internal frame buffer", e);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            deleteSSHCredentialSummary_result result = new 
deleteSSHCredentialSummary_result();
+            if (e instanceof 
org.apache.airavata.credential.store.exception.CredentialStoreException) {
+                        result.csException = 
(org.apache.airavata.credential.store.exception.CredentialStoreException) e;
+                        result.setCsExceptionIsSet(true);
+                        msg = result;
+            }
+             else 
+            {
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TBase)new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR,
 e.getMessage());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+              return;
+            } catch (Exception ex) {
+              LOGGER.error("Exception writing to internal frame buffer", ex);
+            }
+            fb.close();
+          }
+        };
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public void start(I iface, deleteSSHCredentialSummary_args args, 
org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws 
TException {
+        iface.deleteSSHCredentialSummary(args.tokenId, 
args.gatewayId,resultHandler);
+      }
+    }
+
     public static class deletePWDCredential<I extends AsyncIface> extends 
org.apache.thrift.AsyncProcessFunction<I, deletePWDCredential_args, Boolean> {
       public deletePWDCredential() {
         super("deletePWDCredential");
@@ -3325,22 +3770,22 @@ public class CredentialStoreService {
 
   }
 
-  public static class addCertificateCredential_args implements 
org.apache.thrift.TBase<addCertificateCredential_args, 
addCertificateCredential_args._Fields>, java.io.Serializable, Cloneable, 
Comparable<addCertificateCredential_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("addCertificateCredential_args");
+  public static class addSSHCredentialSummary_args implements 
org.apache.thrift.TBase<addSSHCredentialSummary_args, 
addSSHCredentialSummary_args._Fields>, java.io.Serializable, Cloneable, 
Comparable<addSSHCredentialSummary_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("addSSHCredentialSummary_args");
 
-    private static final org.apache.thrift.protocol.TField 
CERTIFICATE_CREDENTIAL_FIELD_DESC = new 
org.apache.thrift.protocol.TField("certificateCredential", 
org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField 
SSH_CREDENTIAL_SUMMARY_FIELD_DESC = new 
org.apache.thrift.protocol.TField("sshCredentialSummary", 
org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes 
= new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new 
addCertificateCredential_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new 
addCertificateCredential_argsTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new 
addSSHCredentialSummary_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new 
addSSHCredentialSummary_argsTupleSchemeFactory());
     }
 
-    public 
org.apache.airavata.credential.store.datamodel.CertificateCredential 
certificateCredential; // required
+    public org.apache.airavata.credential.store.datamodel.SSHCredentialSummary 
sshCredentialSummary; // required
 
     /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      CERTIFICATE_CREDENTIAL((short)1, "certificateCredential");
+      SSH_CREDENTIAL_SUMMARY((short)1, "sshCredentialSummary");
 
       private static final Map<String, _Fields> byName = new HashMap<String, 
_Fields>();
 
@@ -3355,8 +3800,8 @@ public class CredentialStoreService {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
-          case 1: // CERTIFICATE_CREDENTIAL
-            return CERTIFICATE_CREDENTIAL;
+          case 1: // SSH_CREDENTIAL_SUMMARY
+            return SSH_CREDENTIAL_SUMMARY;
           default:
             return null;
         }
@@ -3400,71 +3845,71 @@ public class CredentialStoreService {
     public static final Map<_Fields, 
org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.CERTIFICATE_CREDENTIAL, new 
org.apache.thrift.meta_data.FieldMetaData("certificateCredential", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
-          new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 org.apache.airavata.credential.store.datamodel.CertificateCredential.class)));
+      tmpMap.put(_Fields.SSH_CREDENTIAL_SUMMARY, new 
org.apache.thrift.meta_data.FieldMetaData("sshCredentialSummary", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
+          new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 org.apache.airavata.credential.store.datamodel.SSHCredentialSummary.class)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(addCertificateCredential_args.class,
 metaDataMap);
+      
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(addSSHCredentialSummary_args.class,
 metaDataMap);
     }
 
-    public addCertificateCredential_args() {
+    public addSSHCredentialSummary_args() {
     }
 
-    public addCertificateCredential_args(
-      org.apache.airavata.credential.store.datamodel.CertificateCredential 
certificateCredential)
+    public addSSHCredentialSummary_args(
+      org.apache.airavata.credential.store.datamodel.SSHCredentialSummary 
sshCredentialSummary)
     {
       this();
-      this.certificateCredential = certificateCredential;
+      this.sshCredentialSummary = sshCredentialSummary;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public addCertificateCredential_args(addCertificateCredential_args other) {
-      if (other.isSetCertificateCredential()) {
-        this.certificateCredential = new 
org.apache.airavata.credential.store.datamodel.CertificateCredential(other.certificateCredential);
+    public addSSHCredentialSummary_args(addSSHCredentialSummary_args other) {
+      if (other.isSetSshCredentialSummary()) {
+        this.sshCredentialSummary = new 
org.apache.airavata.credential.store.datamodel.SSHCredentialSummary(other.sshCredentialSummary);
       }
     }
 
-    public addCertificateCredential_args deepCopy() {
-      return new addCertificateCredential_args(this);
+    public addSSHCredentialSummary_args deepCopy() {
+      return new addSSHCredentialSummary_args(this);
     }
 
     @Override
     public void clear() {
-      this.certificateCredential = null;
+      this.sshCredentialSummary = null;
     }
 
-    public 
org.apache.airavata.credential.store.datamodel.CertificateCredential 
getCertificateCredential() {
-      return this.certificateCredential;
+    public org.apache.airavata.credential.store.datamodel.SSHCredentialSummary 
getSshCredentialSummary() {
+      return this.sshCredentialSummary;
     }
 
-    public addCertificateCredential_args 
setCertificateCredential(org.apache.airavata.credential.store.datamodel.CertificateCredential
 certificateCredential) {
-      this.certificateCredential = certificateCredential;
+    public addSSHCredentialSummary_args 
setSshCredentialSummary(org.apache.airavata.credential.store.datamodel.SSHCredentialSummary
 sshCredentialSummary) {
+      this.sshCredentialSummary = sshCredentialSummary;
       return this;
     }
 
-    public void unsetCertificateCredential() {
-      this.certificateCredential = null;
+    public void unsetSshCredentialSummary() {
+      this.sshCredentialSummary = null;
     }
 
-    /** Returns true if field certificateCredential is set (has been assigned 
a value) and false otherwise */
-    public boolean isSetCertificateCredential() {
-      return this.certificateCredential != null;
+    /** Returns true if field sshCredentialSummary is set (has been assigned a 
value) and false otherwise */
+    public boolean isSetSshCredentialSummary() {
+      return this.sshCredentialSummary != null;
     }
 
-    public void setCertificateCredentialIsSet(boolean value) {
+    public void setSshCredentialSummaryIsSet(boolean value) {
       if (!value) {
-        this.certificateCredential = null;
+        this.sshCredentialSummary = null;
       }
     }
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case CERTIFICATE_CREDENTIAL:
+      case SSH_CREDENTIAL_SUMMARY:
         if (value == null) {
-          unsetCertificateCredential();
+          unsetSshCredentialSummary();
         } else {
-          
setCertificateCredential((org.apache.airavata.credential.store.datamodel.CertificateCredential)value);
+          
setSshCredentialSummary((org.apache.airavata.credential.store.datamodel.SSHCredentialSummary)value);
         }
         break;
 
@@ -3473,8 +3918,8 @@ public class CredentialStoreService {
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case CERTIFICATE_CREDENTIAL:
-        return getCertificateCredential();
+      case SSH_CREDENTIAL_SUMMARY:
+        return getSshCredentialSummary();
 
       }
       throw new IllegalStateException();
@@ -3487,8 +3932,8 @@ public class CredentialStoreService {
       }
 
       switch (field) {
-      case CERTIFICATE_CREDENTIAL:
-        return isSetCertificateCredential();
+      case SSH_CREDENTIAL_SUMMARY:
+        return isSetSshCredentialSummary();
       }
       throw new IllegalStateException();
     }
@@ -3497,21 +3942,21 @@ public class CredentialStoreService {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof addCertificateCredential_args)
-        return this.equals((addCertificateCredential_args)that);
+      if (that instanceof addSSHCredentialSummary_args)
+        return this.equals((addSSHCredentialSummary_args)that);
       return false;
     }
 
-    public boolean equals(addCertificateCredential_args that) {
+    public boolean equals(addSSHCredentialSummary_args that) {
       if (that == null)
         return false;
 
-      boolean this_present_certificateCredential = true && 
this.isSetCertificateCredential();
-      boolean that_present_certificateCredential = true && 
that.isSetCertificateCredential();
-      if (this_present_certificateCredential || 
that_present_certificateCredential) {
-        if (!(this_present_certificateCredential && 
that_present_certificateCredential))
+      boolean this_present_sshCredentialSummary = true && 
this.isSetSshCredentialSummary();
+      boolean that_present_sshCredentialSummary = true && 
that.isSetSshCredentialSummary();
+      if (this_present_sshCredentialSummary || 
that_present_sshCredentialSummary) {
+        if (!(this_present_sshCredentialSummary && 
that_present_sshCredentialSummary))
           return false;
-        if (!this.certificateCredential.equals(that.certificateCredential))
+        if (!this.sshCredentialSummary.equals(that.sshCredentialSummary))
           return false;
       }
 
@@ -3522,28 +3967,28 @@ public class CredentialStoreService {
     public int hashCode() {
       List<Object> list = new ArrayList<Object>();
 
-      boolean present_certificateCredential = true && 
(isSetCertificateCredential());
-      list.add(present_certificateCredential);
-      if (present_certificateCredential)
-        list.add(certificateCredential);
+      boolean present_sshCredentialSummary = true && 
(isSetSshCredentialSummary());
+      list.add(present_sshCredentialSummary);
+      if (present_sshCredentialSummary)
+        list.add(sshCredentialSummary);
 
       return list.hashCode();
     }
 
     @Override
-    public int compareTo(addCertificateCredential_args other) {
+    public int compareTo(addSSHCredentialSummary_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
 
-      lastComparison = 
Boolean.valueOf(isSetCertificateCredential()).compareTo(other.isSetCertificateCredential());
+      lastComparison = 
Boolean.valueOf(isSetSshCredentialSummary()).compareTo(other.isSetSshCredentialSummary());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetCertificateCredential()) {
-        lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.certificateCredential, 
other.certificateCredential);
+      if (isSetSshCredentialSummary()) {
+        lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.sshCredentialSummary, 
other.sshCredentialSummary);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -3565,14 +4010,14 @@ public class CredentialStoreService {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("addCertificateCredential_args(");
+      StringBuilder sb = new StringBuilder("addSSHCredentialSummary_args(");
       boolean first = true;
 
-      sb.append("certificateCredential:");
-      if (this.certificateCredential == null) {
+      sb.append("sshCredentialSummary:");
+      if (this.sshCredentialSummary == null) {
         sb.append("null");
       } else {
-        sb.append(this.certificateCredential);
+        sb.append(this.sshCredentialSummary);
       }
       first = false;
       sb.append(")");
@@ -3581,12 +4026,12 @@ public class CredentialStoreService {
 
     public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      if (certificateCredential == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'certificateCredential' was not present! Struct: " + toString());
+      if (sshCredentialSummary == null) {
+        throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'sshCredentialSummary' was not present! Struct: " + toString());
       }
       // check for sub-struct validity
-      if (certificateCredential != null) {
-        certificateCredential.validate();
+      if (sshCredentialSummary != null) {
+        sshCredentialSummary.validate();
       }
     }
 
@@ -3606,15 +4051,15 @@ public class CredentialStoreService {
       }
     }
 
-    private static class addCertificateCredential_argsStandardSchemeFactory 
implements SchemeFactory {
-      public addCertificateCredential_argsStandardScheme getScheme() {
-        return new addCertificateCredential_argsStandardScheme();
+    private static class addSSHCredentialSummary_argsStandardSchemeFactory 
implements SchemeFactory {
+      public addSSHCredentialSummary_argsStandardScheme getScheme() {
+        return new addSSHCredentialSummary_argsStandardScheme();
       }
     }
 
-    private static class addCertificateCredential_argsStandardScheme extends 
StandardScheme<addCertificateCredential_args> {
+    private static class addSSHCredentialSummary_argsStandardScheme extends 
StandardScheme<addSSHCredentialSummary_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
addCertificateCredential_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
addSSHCredentialSummary_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -3624,11 +4069,11 @@ public class CredentialStoreService {
             break;
           }
           switch (schemeField.id) {
-            case 1: // CERTIFICATE_CREDENTIAL
+            case 1: // SSH_CREDENTIAL_SUMMARY
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) 
{
-                struct.certificateCredential = new 
org.apache.airavata.credential.store.datamodel.CertificateCredential();
-                struct.certificateCredential.read(iprot);
-                struct.setCertificateCredentialIsSet(true);
+                struct.sshCredentialSummary = new 
org.apache.airavata.credential.store.datamodel.SSHCredentialSummary();
+                struct.sshCredentialSummary.read(iprot);
+                struct.setSshCredentialSummaryIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
               }
@@ -3644,13 +4089,13 @@ public class CredentialStoreService {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
addCertificateCredential_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, 
addSSHCredentialSummary_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
-        if (struct.certificateCredential != null) {
-          oprot.writeFieldBegin(CERTIFICATE_CREDENTIAL_FIELD_DESC);
-          struct.certificateCredential.write(oprot);
+        if (struct.sshCredentialSummary != null) {
+          oprot.writeFieldBegin(SSH_CREDENTIAL_SUMMARY_FIELD_DESC);
+          struct.sshCredentialSummary.write(oprot);
           oprot.writeFieldEnd();
         }
         oprot.writeFieldStop();
@@ -3659,41 +4104,41 @@ public class CredentialStoreService {
 
     }
 
-    private static class addCertificateCredential_argsTupleSchemeFactory 
implements SchemeFactory {
-      public addCertificateCredential_argsTupleScheme getScheme() {
-        return new addCertificateCredential_argsTupleScheme();
+    private static class addSSHCredentialSummary_argsTupleSchemeFactory 
implements SchemeFactory {
+      public addSSHCredentialSummary_argsTupleScheme getScheme() {
+        return new addSSHCredentialSummary_argsTupleScheme();
       }
     }
 
-    private static class addCertificateCredential_argsTupleScheme extends 
TupleScheme<addCertificateCredential_args> {
+    private static class addSSHCredentialSummary_argsTupleScheme extends 
TupleScheme<addSSHCredentialSummary_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, 
addCertificateCredential_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, 
addSSHCredentialSummary_args struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
-        struct.certificateCredential.write(oprot);
+        struct.sshCredentialSummary.write(oprot);
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, 
addCertificateCredential_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, 
addSSHCredentialSummary_args struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
-        struct.certificateCredential = new 
org.apache.airavata.credential.store.datamodel.CertificateCredential();
-        struct.certificateCredential.read(iprot);
-        struct.setCertificateCredentialIsSet(true);
+        struct.sshCredentialSummary = new 
org.apache.airavata.credential.store.datamodel.SSHCredentialSummary();
+        struct.sshCredentialSummary.read(iprot);
+        struct.setSshCredentialSummaryIsSet(true);
       }
     }
 
   }
 
-  public static class addCertificateCredential_result implements 
org.apache.thrift.TBase<addCertificateCredential_result, 
addCertificateCredential_result._Fields>, java.io.Serializable, Cloneable, 
Comparable<addCertificateCredential_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("addCertificateCredential_result");
+  public static class addSSHCredentialSummary_result implements 
org.apache.thrift.TBase<addSSHCredentialSummary_result, 
addSSHCredentialSummary_result._Fields>, java.io.Serializable, Cloneable, 
Comparable<addSSHCredentialSummary_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("addSSHCredentialSummary_result");
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC 
= new org.apache.thrift.protocol.TField("success", 
org.apache.thrift.protocol.TType.STRING, (short)0);
     private static final org.apache.thrift.protocol.TField 
CS_EXCEPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("csException", 
org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes 
= new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new 
addCertificateCredential_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new 
addCertificateCredential_resultTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new 
addSSHCredentialSummary_resultStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new 
addSSHCredentialSummary_resultTupleSchemeFactory());
     }
 
     public String success; // required
@@ -3769,13 +4214,13 @@ public class CredentialStoreService {
       tmpMap.put(_Fields.CS_EXCEPTION, new 
org.apache.thrift.meta_data.FieldMetaData("csException", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(addCertificateCredential_result.class,
 metaDataMap);
+      
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(addSSHCredentialSummary_result.class,
 metaDataMap);
     }
 
-    public addCertificateCredential_result() {
+    public addSSHCredentialSummary_result() {
     }
 
-    public addCertificateCredential_result(
+    public addSSHCredentialSummary_result(
       String success,
       org.apache.airavata.credential.store.exception.CredentialStoreException 
csException)
     {
@@ -3787,7 +4232,7 @@ public class CredentialStoreService {
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public addCertificateCredential_result(addCertificateCredential_result 
other) {
+    public addSSHCredentialSummary_result(addSSHCredentialSummary_result 
other) {
       if (other.isSetSuccess()) {
         this.success = other.success;
       }
@@ -3796,8 +4241,8 @@ public class CredentialStoreService {
       }
     }
 
-    public addCertificateCredential_result deepCopy() {
-      return new addCertificateCredential_result(this);
+    public addSSHCredentialSummary_result deepCopy() {
+      return new addSSHCredentialSummary_result(this);
     }
 
     @Override
@@ -3810,7 +4255,7 @@ public class CredentialStoreService {
       return this.success;
     }
 
-    public addCertificateCredential_result setSuccess(String success) {
+    public addSSHCredentialSummary_result setSuccess(String success) {
       this.success = success;
       return this;
     }
@@ -3834,7 +4279,7 @@ public class CredentialStoreService {
       return this.csException;
     }
 
-    public addCertificateCredential_result 
setCsException(org.apache.airavata.credential.store.exception.CredentialStoreException
 csException) {
+    public addSSHCredentialSummary_result 
setCsException(org.apache.airavata.credential.store.exception.CredentialStoreException
 csException) {
       this.csException = csException;
       return this;
     }
@@ -3906,12 +4351,12 @@ public class CredentialStoreService {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof addCertificateCredential_result)
-        return this.equals((addCertificateCredential_result)that);
+      if (that instanceof addSSHCredentialSummary_result)
+        return this.equals((addSSHCredentialSummary_result)that);
       return false;
     }
 
-    public boolean equals(addCertificateCredential_result that) {
+    public boolean equals(addSSHCredentialSummary_result that) {
       if (that == null)
         return false;
 
@@ -3954,7 +4399,7 @@ public class CredentialStoreService {
     }
 
     @Override
-    public int compareTo(addCertificateCredential_result other) {
+    public int compareTo(addSSHCredentialSummary_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -3998,7 +4443,7 @@ public class CredentialStoreService {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("addCertificateCredential_result(");
+      StringBuilder sb = new StringBuilder("addSSHCredentialSummary_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -4041,15 +4486,15 @@ public class CredentialStoreService {
       }
     }
 
-    private static class addCertificateCredential_resultStandardSchemeFactory 
implements SchemeFactory {
-      public addCertificateCredential_resultStandardScheme getScheme() {
-        return new addCertificateCredential_resultStandardScheme();
+    private static class addSSHCredentialSummary_resultStandardSchemeFactory 
implements SchemeFactory {
+      public addSSHCredentialSummary_resultStandardScheme getScheme() {
+        return new addSSHCredentialSummary_resultStandardScheme();
       }
     }
 
-    private static class addCertificateCredential_resultStandardScheme extends 
StandardScheme<addCertificateCredential_result> {
+    private static class addSSHCredentialSummary_resultStandardScheme extends 
StandardScheme<addSSHCredentialSummary_result> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
addCertificateCredential_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
addSSHCredentialSummary_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -4087,7 +4532,7 @@ public class CredentialStoreService {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
addCertificateCredential_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, 
addSSHCredentialSummary_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -4107,16 +4552,16 @@ public class CredentialStoreService {
 
     }
 
-    private static class addCertificateCredential_resultTupleSchemeFactory 
implements SchemeFactory {
-      public addCertificateCredential_resultTupleScheme getScheme() {
-        return new addCertificateCredential_resultTupleScheme();
+    private static class addSSHCredentialSummary_resultTupleSchemeFactory 
implements SchemeFactory {
+      public addSSHCredentialSummary_resultTupleScheme getScheme() {
+        return new addSSHCredentialSummary_resultTupleScheme();
       }
     }
 
-    private static class addCertificateCredential_resultTupleScheme extends 
TupleScheme<addCertificateCredential_result> {
+    private static class addSSHCredentialSummary_resultTupleScheme extends 
TupleScheme<addSSHCredentialSummary_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, 
addCertificateCredential_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, 
addSSHCredentialSummary_result struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetSuccess()) {
@@ -4135,7 +4580,7 @@ public class CredentialStoreService {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, 
addCertificateCredential_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, 
addSSHCredentialSummary_result struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
@@ -4152,22 +4597,22 @@ public class CredentialStoreService {
 
   }
 
-  public static class addPasswordCredential_args implements 
org.apache.thrift.TBase<addPasswordCredential_args, 
addPasswordCredential_args._Fields>, java.io.Serializable, Cloneable, 
Comparable<addPasswordCredential_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("addPasswordCredential_args");
+  public static class addCertificateCredential_args implements 
org.apache.thrift.TBase<addCertificateCredential_args, 
addCertificateCredential_args._Fields>, java.io.Serializable, Cloneable, 
Comparable<addCertificateCredential_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("addCertificateCredential_args");
 
-    private static final org.apache.thrift.protocol.TField 
PASSWORD_CREDENTIAL_FIELD_DESC = new 
org.apache.thrift.protocol.TField("passwordCredential", 
org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField 
CERTIFICATE_CREDENTIAL_FIELD_DESC = new 
org.apache.thrift.protocol.TField("certificateCredential", 
org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes 
= new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new 
addPasswordCredential_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new 
addPasswordCredential_argsTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new 
addCertificateCredential_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new 
addCertificateCredential_argsTupleSchemeFactory());
     }
 
-    public org.apache.airavata.credential.store.datamodel.PasswordCredential 
passwordCredential; // required
+    public 
org.apache.airavata.credential.store.datamodel.CertificateCredential 
certificateCredential; // required
 
     /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      PASSWORD_CREDENTIAL((short)1, "passwordCredential");
+      CERTIFICATE_CREDENTIAL((short)1, "certificateCredential");
 
       private static final Map<String, _Fields> byName = new HashMap<String, 
_Fields>();
 
@@ -4182,8 +4627,8 @@ public class CredentialStoreService {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
-          case 1: // PASSWORD_CREDENTIAL
-            return PASSWORD_CREDENTIAL;
+          case 1: // CERTIFICATE_CREDENTIAL
+            return CERTIFICATE_CREDENTIAL;
           default:
             return null;
         }
@@ -4227,71 +4672,71 @@ public class CredentialStoreService {
     public static final Map<_Fields, 
org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.PASSWORD_CREDENTIAL, new 
org.apache.thrift.meta_data.FieldMetaData("passwordCredential", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
-          new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 org.apache.airavata.credential.store.datamodel.PasswordCredential.class)));
+      tmpMap.put(_Fields.CERTIFICATE_CREDENTIAL, new 
org.apache.thrift.meta_data.FieldMetaData("certificateCredential", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
+          new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 org.apache.airavata.credential.store.datamodel.CertificateCredential.class)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(addPasswordCredential_args.class,
 metaDataMap);
+      
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(addCertificateCredential_args.class,
 metaDataMap);
     }
 
-    public addPasswordCredential_args() {
+    public addCertificateCredential_args() {
     }
 
-    public addPasswordCredential_args(
-      org.apache.airavata.credential.store.datamodel.PasswordCredential 
passwordCredential)
+    public addCertificateCredential_args(
+      org.apache.airavata.credential.store.datamodel.CertificateCredential 
certificateCredential)
     {
       this();
-      this.passwordCredential = passwordCredential;
+      this.certificateCredential = certificateCredential;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public addPasswordCredential_args(addPasswordCredential_args other) {
-      if (other.isSetPasswordCredential()) {
-        this.passwordCredential = new 
org.apache.airavata.credential.store.datamodel.PasswordCredential(other.passwordCredential);
+    public addCertificateCredential_args(addCertificateCredential_args other) {
+      if (other.isSetCertificateCredential()) {
+        this.certificateCredential = new 
org.apache.airavata.credential.store.datamodel.CertificateCredential(other.certificateCredential);
       }
     }
 
-    public addPasswordCredential_args deepCopy() {
-      return new addPasswordCredential_args(this);
+    public addCertificateCredential_args deepCopy() {
+      return new addCertificateCredential_args(this);
     }
 
     @Override
     public void clear() {
-      this.passwordCredential = null;
+      this.certificateCredential = null;
     }
 
-    public org.apache.airavata.credential.store.datamodel.PasswordCredential 
getPasswordCredential() {
-      return this.passwordCredential;
+    public 
org.apache.airavata.credential.store.datamodel.CertificateCredential 
getCertificateCredential() {
+      return this.certificateCredential;
     }
 
-    public addPasswordCredential_args 
setPasswordCredential(org.apache.airavata.credential.store.datamodel.PasswordCredential
 passwordCredential) {
-      this.passwordCredential = passwordCredential;
+    public addCertificateCredential_args 
setCertificateCredential(org.apache.airavata.credential.store.datamodel.CertificateCredential
 certificateCredential) {
+      this.certificateCredential = certificateCredential;
       return this;
     }
 
-    public void unsetPasswordCredential() {
-      this.passwordCredential = null;
+    public void unsetCertificateCredential() {
+      this.certificateCredential = null;
     }
 
-    /** Returns true if field passwordCredential is set (has been assigned a 
value) and false otherwise */
-    public boolean isSetPasswordCredential() {
-      return this.passwordCredential != null;
+    /** Returns true if field certificateCredential is set (has been assigned 
a value) and false otherwise */
+    public boolean isSetCertificateCredential() {
+      return this.certificateCredential != null;
     }
 
-    public void setPasswordCredentialIsSet(boolean value) {
+    public void setCertificateCredentialIsSet(boolean value) {
       if (!value) {
-        this.passwordCredential = null;
+        this.certificateCredential = null;
       }
     }
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case PASSWORD_CREDENTIAL:
+      case CERTIFICATE_CREDENTIAL:
         if (value == null) {
-          unsetPasswordCredential();
+          unsetCertificateCredential();
         } else {
-          
setPasswordCredential((org.apache.airavata.credential.store.datamodel.PasswordCredential)value);
+          
setCertificateCredential((org.apache.airavata.credential.store.datamodel.CertificateCredential)value);
         }
         break;
 
@@ -4300,8 +4745,8 @@ public class CredentialStoreService {
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case PASSWORD_CREDENTIAL:
-        return getPasswordCredential();
+      case CERTIFICATE_CREDENTIAL:
+        return getCertificateCredential();
 
       }
       throw new IllegalStateException();
@@ -4314,8 +4759,8 @@ public class CredentialStoreService {
       }
 
       switch (field) {
-      case PASSWORD_CREDENTIAL:
-        return isSetPasswordCredential();
+      case CERTIFICATE_CREDENTIAL:
+        return isSetCertificateCredential();
       }
       throw new IllegalStateException();
     }
@@ -4324,21 +4769,21 @@ public class CredentialStoreService {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof addPasswordCredential_args)
-        return this.equals((addPasswordCredential_args)that);
+      if (that instanceof addCertificateCredential_args)
+        return this.equals((addCertificateCredential_args)that);
       return false;
     }
 
-    public boolean equals(addPasswordCredential_args that) {
+    public boolean equals(addCertificateCredential_args that) {
       if (that == null)
         return false;
 
-      boolean this_present_passwordCredential = true && 
this.isSetPasswordCredential();
-      boolean that_present_passwordCredential = true && 
that.isSetPasswordCredential();
-      if (this_present_passwordCredential || that_present_passwordCredential) {
-        if (!(this_present_passwordCredential && 
that_present_passwordCredential))
+      boolean this_present_certificateCredential = true && 
this.isSetCertificateCredential();
+      boolean that_present_certificateCredential = true && 
that.isSetCertificateCredential();
+      if (this_present_certificateCredential || 
that_present_certificateCredential) {
+        if (!(this_present_certificateCredential && 
that_present_certificateCredential))
           return false;
-        if (!this.passwordCredential.equals(that.passwordCredential))
+        if (!this.certificateCredential.equals(that.certificateCredential))
           return false;
       }
 
@@ -4349,28 +4794,28 @@ public class CredentialStoreService {
     public int hashCode() {
       List<Object> list = new ArrayList<Object>();
 
-      boolean present_passwordCredential = true && (isSetPasswordCredential());
-      list.add(present_passwordCredential);
-      if (present_passwordCredential)
-        list.add(passwordCredential);
+      boolean present_certificateCredential = true && 
(isSetCertificateCredential());
+      list.add(present_certificateCredential);
+      if (present_certificateCredential)
+        list.add(certificateCredential);
 
       return list.hashCode();
     }
 
     @Override
-    public int compareTo(addPasswordCredential_args other) {
+    public int compareTo(addCertificateCredential_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
 
-      lastComparison = 
Boolean.valueOf(isSetPasswordCredential()).compareTo(other.isSetPasswordCredential());
+      lastComparison = 
Boolean.valueOf(isSetCertificateCredential()).compareTo(other.isSetCertificateCredential());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetPasswordCredential()) {
-        lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.passwordCredential, 
other.passwordCredential);
+      if (isSetCertificateCredential()) {
+        lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.certificateCredential, 
other.certificateCredential);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -4392,14 +4837,14 @@ public class CredentialStoreService {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("addPasswordCredential_args(");
+      StringBuilder sb = new StringBuilder("addCertificateCredential_args(");
       boolean first = true;
 
-      sb.append("passwordCredential:");
-      if (this.passwordCredential == null) {
+      sb.append("certificateCredential:");
+      if (this.certificateCredential == null) {
         sb.append("null");
       } else {
-        sb.append(this.passwordCredential);
+        sb.append(this.certificateCredential);
       }
       first = false;
       sb.append(")");
@@ -4408,12 +4853,12 @@ public class CredentialStoreService {
 
     public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      if (passwordCredential == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'passwordCredential' was not present! Struct: " + toString());
+      if (certificateCredential == null) {
+        throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'certificateCredential' was not present! Struct: " + toString());
       }
       // check for sub-struct validity
-      if (passwordCredential != null) {
-        passwordCredential.validate();
+      if (certificateCredential != null) {
+        certificateCredential.validate();
       }
     }
 
@@ -4433,15 +4878,15 @@ public class CredentialStoreService {
       }
     }
 
-    private static class addPasswordCredential_argsStandardSchemeFactory 
implements SchemeFactory {
-      public addPasswordCredential_argsStandardScheme getScheme() {
-        return new addPasswordCredential_argsStandardScheme();
+    private static class addCertificateCredential_argsStandardSchemeFactory 
implements SchemeFactory {
+      public addCertificateCredential_argsStandardScheme getScheme() {
+        return new addCertificateCredential_argsStandardScheme();
       }
     }
 
-    private static class addPasswordCredential_argsStandardScheme extends 
StandardScheme<addPasswordCredential_args> {
+    private static class addCertificateCredential_argsStandardScheme extends 
StandardScheme<addCertificateCredential_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
addPasswordCredential_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
addCertificateCredential_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -4451,11 +4896,11 @@ public class CredentialStoreService {
             break;
           }
           switch (schemeField.id) {
-            case 1: // PASSWORD_CREDENTIAL
+            case 1: // CERTIFICATE_CREDENTIAL
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) 
{
-                struct.passwordCredential = new 
org.apache.airavata.credential.store.datamodel.PasswordCredential();
-                struct.passwordCredential.read(iprot);
-                struct.setPasswordCredentialIsSet(true);
+                struct.certificateCredential = new 
org.apache.airavata.credential.store.datamodel.CertificateCredential();
+                struct.certificateCredential.read(iprot);
+                struct.setCertificateCredentialIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
               }
@@ -4471,13 +4916,13 @@ public class CredentialStoreService {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
addPasswordCredential_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, 
addCertificateCredential_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
-        if (struct.passwordCredential != null) {
-          oprot.writeFieldBegin(PASSWORD_CREDENTIAL_FIELD_DESC);
-          struct.passwordCredential.write(oprot);
+        if (struct.certificateCredential != null) {
+          oprot.writeFieldBegin(CERTIFICATE_CREDENTIAL_FIELD_DESC);
+          struct.certificateCredential.write(oprot);
           oprot.writeFieldEnd();
         }
         oprot.writeFieldStop();
@@ -4486,41 +4931,41 @@ public class CredentialStoreService {
 
     }
 
-    private static class addPasswordCredential_argsTupleSchemeFactory 
implements SchemeFactory {
-      public addPasswordCredential_argsTupleScheme getScheme() {
-        return new addPasswordCredential_argsTupleScheme();
+    private static class addCertificateCredential_argsTupleSchemeFactory 
implements SchemeFactory {
+      public addCertificateCredential_argsTupleScheme getScheme() {
+        return new addCertificateCredential_argsTupleScheme();
       }
     }
 
-    private static class addPasswordCredential_argsTupleScheme extends 
TupleScheme<addPasswordCredential_args> {
+    private static class addCertificateCredential_argsTupleScheme extends 
TupleScheme<addCertificateCredential_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, 
addPasswordCredential_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, 
addCertificateCredential_args struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
-        struct.passwordCredential.write(oprot);
+        struct.certificateCredential.write(oprot);
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, 
addPasswordCredential_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, 
addCertificateCredential_args struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
-        struct.passwordCredential = new 
org.apache.airavata.credential.store.datamodel.PasswordCredential();
-        struct.passwordCredential.read(iprot);
-        struct.setPasswordCredentialIsSet(true);
+        struct.certificateCredential = new 
org.apache.airavata.credential.store.datamodel.CertificateCredential();
+        struct.certificateCredential.read(iprot);
+        struct.setCertificateCredentialIsSet(true);
       }
     }
 
   }
 
-  public static class addPasswordCredential_result implements 
org.apache.thrift.TBase<addPasswordCredential_result, 
addPasswordCredential_result._Fields>, java.io.Serializable, Cloneable, 
Comparable<addPasswordCredential_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("addPasswordCredential_result");
+  public static class addCertificateCredential_result implements 
org.apache.thrift.TBase<addCertificateCredential_result, 
addCertificateCredential_result._Fields>, java.io.Serializable, Cloneable, 
Comparable<addCertificateCredential_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("addCertificateCredential_result");
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC 
= new org.apache.thrift.protocol.TField("success", 
org.apache.thrift.protocol.TType.STRING, (short)0);
     private static final org.apache.thrift.protocol.TField 
CS_EXCEPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("csException", 
org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes 
= new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new 
addPasswordCredential_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new 
addPasswordCredential_resultTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new 
addCertificateCredential_resultStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new 
addCertificateCredential_resultTupleSchemeFactory());
     }
 
     public String success; // required
@@ -4596,13 +5041,13 @@ public class CredentialStoreService {
       tmpMap.put(_Fields.CS_EXCEPTION, new 
org.apache.thrift.meta_data.FieldMetaData("csException", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(addPasswordCredential_result.class,
 metaDataMap);
+      
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(addCertificateCredential_result.class,
 metaDataMap);
     }
 
-    public addPasswordCredential_result() {
+    public addCertificateCredential_result() {
     }
 
-    public addPasswordCredential_result(
+    public addCertificateCredential_result(
       String success,
       org.apache.airavata.credential.store.exception.CredentialStoreException 
csException)
     {
@@ -4614,7 +5059,7 @

<TRUNCATED>

Reply via email to