airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject [18/30] airavata git commit: removing add and delete method for SSHCredentialSummary, serverhandler implemented got get method
Date Thu, 13 Oct 2016 18:33:11 GMT
http://git-wip-us.apache.org/repos/asf/airavata/blob/077fd2c8/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 f5c4276..209bcce 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
@@ -68,8 +68,6 @@ 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;
@@ -90,8 +88,6 @@ 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;
 
   }
@@ -102,8 +98,6 @@ 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;
@@ -124,8 +118,6 @@ 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;
 
   }
@@ -198,32 +190,6 @@ 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);
@@ -489,33 +455,6 @@ 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);
@@ -622,38 +561,6 @@ 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);
@@ -989,41 +896,6 @@ 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);
@@ -1074,7 +946,6 @@ 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());
@@ -1085,7 +956,6 @@ public class CredentialStoreService {
       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;
     }
@@ -1134,30 +1004,6 @@ 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");
@@ -1399,31 +1245,6 @@ 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");
@@ -1464,7 +1285,6 @@ 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());
@@ -1475,7 +1295,6 @@ public class CredentialStoreService {
       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;
     }
@@ -1588,63 +1407,6 @@ 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");
@@ -2216,64 +1978,6 @@ 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");
@@ -3770,22 +3474,22 @@ public class CredentialStoreService {
 
   }
 
-  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");
+  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 SSH_CREDENTIAL_SUMMARY_FIELD_DESC = new org.apache.thrift.protocol.TField("sshCredentialSummary", 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 addSSHCredentialSummary_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new addSSHCredentialSummary_argsTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new addCertificateCredential_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new addCertificateCredential_argsTupleSchemeFactory());
     }
 
-    public org.apache.airavata.credential.store.datamodel.SSHCredentialSummary sshCredentialSummary; // 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 {
-      SSH_CREDENTIAL_SUMMARY((short)1, "sshCredentialSummary");
+      CERTIFICATE_CREDENTIAL((short)1, "certificateCredential");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -3800,8 +3504,8 @@ public class CredentialStoreService {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
-          case 1: // SSH_CREDENTIAL_SUMMARY
-            return SSH_CREDENTIAL_SUMMARY;
+          case 1: // CERTIFICATE_CREDENTIAL
+            return CERTIFICATE_CREDENTIAL;
           default:
             return null;
         }
@@ -3845,71 +3549,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.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)));
+      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(addSSHCredentialSummary_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(addCertificateCredential_args.class, metaDataMap);
     }
 
-    public addSSHCredentialSummary_args() {
+    public addCertificateCredential_args() {
     }
 
-    public addSSHCredentialSummary_args(
-      org.apache.airavata.credential.store.datamodel.SSHCredentialSummary sshCredentialSummary)
+    public addCertificateCredential_args(
+      org.apache.airavata.credential.store.datamodel.CertificateCredential certificateCredential)
     {
       this();
-      this.sshCredentialSummary = sshCredentialSummary;
+      this.certificateCredential = certificateCredential;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public addSSHCredentialSummary_args(addSSHCredentialSummary_args other) {
-      if (other.isSetSshCredentialSummary()) {
-        this.sshCredentialSummary = new org.apache.airavata.credential.store.datamodel.SSHCredentialSummary(other.sshCredentialSummary);
+    public addCertificateCredential_args(addCertificateCredential_args other) {
+      if (other.isSetCertificateCredential()) {
+        this.certificateCredential = new org.apache.airavata.credential.store.datamodel.CertificateCredential(other.certificateCredential);
       }
     }
 
-    public addSSHCredentialSummary_args deepCopy() {
-      return new addSSHCredentialSummary_args(this);
+    public addCertificateCredential_args deepCopy() {
+      return new addCertificateCredential_args(this);
     }
 
     @Override
     public void clear() {
-      this.sshCredentialSummary = null;
+      this.certificateCredential = null;
     }
 
-    public org.apache.airavata.credential.store.datamodel.SSHCredentialSummary getSshCredentialSummary() {
-      return this.sshCredentialSummary;
+    public org.apache.airavata.credential.store.datamodel.CertificateCredential getCertificateCredential() {
+      return this.certificateCredential;
     }
 
-    public addSSHCredentialSummary_args setSshCredentialSummary(org.apache.airavata.credential.store.datamodel.SSHCredentialSummary sshCredentialSummary) {
-      this.sshCredentialSummary = sshCredentialSummary;
+    public addCertificateCredential_args setCertificateCredential(org.apache.airavata.credential.store.datamodel.CertificateCredential certificateCredential) {
+      this.certificateCredential = certificateCredential;
       return this;
     }
 
-    public void unsetSshCredentialSummary() {
-      this.sshCredentialSummary = null;
+    public void unsetCertificateCredential() {
+      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;
+    /** Returns true if field certificateCredential is set (has been assigned a value) and false otherwise */
+    public boolean isSetCertificateCredential() {
+      return this.certificateCredential != null;
     }
 
-    public void setSshCredentialSummaryIsSet(boolean value) {
+    public void setCertificateCredentialIsSet(boolean value) {
       if (!value) {
-        this.sshCredentialSummary = null;
+        this.certificateCredential = null;
       }
     }
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case SSH_CREDENTIAL_SUMMARY:
+      case CERTIFICATE_CREDENTIAL:
         if (value == null) {
-          unsetSshCredentialSummary();
+          unsetCertificateCredential();
         } else {
-          setSshCredentialSummary((org.apache.airavata.credential.store.datamodel.SSHCredentialSummary)value);
+          setCertificateCredential((org.apache.airavata.credential.store.datamodel.CertificateCredential)value);
         }
         break;
 
@@ -3918,8 +3622,8 @@ public class CredentialStoreService {
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case SSH_CREDENTIAL_SUMMARY:
-        return getSshCredentialSummary();
+      case CERTIFICATE_CREDENTIAL:
+        return getCertificateCredential();
 
       }
       throw new IllegalStateException();
@@ -3932,9 +3636,9 @@ public class CredentialStoreService {
       }
 
       switch (field) {
-      case SSH_CREDENTIAL_SUMMARY:
-        return isSetSshCredentialSummary();
-      }
+      case CERTIFICATE_CREDENTIAL:
+        return isSetCertificateCredential();
+      }
       throw new IllegalStateException();
     }
 
@@ -3942,21 +3646,21 @@ public class CredentialStoreService {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof addSSHCredentialSummary_args)
-        return this.equals((addSSHCredentialSummary_args)that);
+      if (that instanceof addCertificateCredential_args)
+        return this.equals((addCertificateCredential_args)that);
       return false;
     }
 
-    public boolean equals(addSSHCredentialSummary_args that) {
+    public boolean equals(addCertificateCredential_args that) {
       if (that == null)
         return false;
 
-      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))
+      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.sshCredentialSummary.equals(that.sshCredentialSummary))
+        if (!this.certificateCredential.equals(that.certificateCredential))
           return false;
       }
 
@@ -3967,28 +3671,28 @@ public class CredentialStoreService {
     public int hashCode() {
       List<Object> list = new ArrayList<Object>();
 
-      boolean present_sshCredentialSummary = true && (isSetSshCredentialSummary());
-      list.add(present_sshCredentialSummary);
-      if (present_sshCredentialSummary)
-        list.add(sshCredentialSummary);
+      boolean present_certificateCredential = true && (isSetCertificateCredential());
+      list.add(present_certificateCredential);
+      if (present_certificateCredential)
+        list.add(certificateCredential);
 
       return list.hashCode();
     }
 
     @Override
-    public int compareTo(addSSHCredentialSummary_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(isSetSshCredentialSummary()).compareTo(other.isSetSshCredentialSummary());
+      lastComparison = Boolean.valueOf(isSetCertificateCredential()).compareTo(other.isSetCertificateCredential());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetSshCredentialSummary()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sshCredentialSummary, other.sshCredentialSummary);
+      if (isSetCertificateCredential()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.certificateCredential, other.certificateCredential);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -4010,14 +3714,14 @@ public class CredentialStoreService {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("addSSHCredentialSummary_args(");
+      StringBuilder sb = new StringBuilder("addCertificateCredential_args(");
       boolean first = true;
 
-      sb.append("sshCredentialSummary:");
-      if (this.sshCredentialSummary == null) {
+      sb.append("certificateCredential:");
+      if (this.certificateCredential == null) {
         sb.append("null");
       } else {
-        sb.append(this.sshCredentialSummary);
+        sb.append(this.certificateCredential);
       }
       first = false;
       sb.append(")");
@@ -4026,12 +3730,12 @@ public class CredentialStoreService {
 
     public void validate() throws org.apache.thrift.TException {
       // check for required fields
-      if (sshCredentialSummary == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required field 'sshCredentialSummary' 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 (sshCredentialSummary != null) {
-        sshCredentialSummary.validate();
+      if (certificateCredential != null) {
+        certificateCredential.validate();
       }
     }
 
@@ -4051,15 +3755,15 @@ public class CredentialStoreService {
       }
     }
 
-    private static class addSSHCredentialSummary_argsStandardSchemeFactory implements SchemeFactory {
-      public addSSHCredentialSummary_argsStandardScheme getScheme() {
-        return new addSSHCredentialSummary_argsStandardScheme();
+    private static class addCertificateCredential_argsStandardSchemeFactory implements SchemeFactory {
+      public addCertificateCredential_argsStandardScheme getScheme() {
+        return new addCertificateCredential_argsStandardScheme();
       }
     }
 
-    private static class addSSHCredentialSummary_argsStandardScheme extends StandardScheme<addSSHCredentialSummary_args> {
+    private static class addCertificateCredential_argsStandardScheme extends StandardScheme<addCertificateCredential_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, addSSHCredentialSummary_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)
@@ -4069,11 +3773,11 @@ public class CredentialStoreService {
             break;
           }
           switch (schemeField.id) {
-            case 1: // SSH_CREDENTIAL_SUMMARY
+            case 1: // CERTIFICATE_CREDENTIAL
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.sshCredentialSummary = new org.apache.airavata.credential.store.datamodel.SSHCredentialSummary();
-                struct.sshCredentialSummary.read(iprot);
-                struct.setSshCredentialSummaryIsSet(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);
               }
@@ -4089,13 +3793,13 @@ public class CredentialStoreService {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, addSSHCredentialSummary_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.sshCredentialSummary != null) {
-          oprot.writeFieldBegin(SSH_CREDENTIAL_SUMMARY_FIELD_DESC);
-          struct.sshCredentialSummary.write(oprot);
+        if (struct.certificateCredential != null) {
+          oprot.writeFieldBegin(CERTIFICATE_CREDENTIAL_FIELD_DESC);
+          struct.certificateCredential.write(oprot);
           oprot.writeFieldEnd();
         }
         oprot.writeFieldStop();
@@ -4104,41 +3808,41 @@ public class CredentialStoreService {
 
     }
 
-    private static class addSSHCredentialSummary_argsTupleSchemeFactory implements SchemeFactory {
-      public addSSHCredentialSummary_argsTupleScheme getScheme() {
-        return new addSSHCredentialSummary_argsTupleScheme();
+    private static class addCertificateCredential_argsTupleSchemeFactory implements SchemeFactory {
+      public addCertificateCredential_argsTupleScheme getScheme() {
+        return new addCertificateCredential_argsTupleScheme();
       }
     }
 
-    private static class addSSHCredentialSummary_argsTupleScheme extends TupleScheme<addSSHCredentialSummary_args> {
+    private static class addCertificateCredential_argsTupleScheme extends TupleScheme<addCertificateCredential_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, addSSHCredentialSummary_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.sshCredentialSummary.write(oprot);
+        struct.certificateCredential.write(oprot);
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, addSSHCredentialSummary_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.sshCredentialSummary = new org.apache.airavata.credential.store.datamodel.SSHCredentialSummary();
-        struct.sshCredentialSummary.read(iprot);
-        struct.setSshCredentialSummaryIsSet(true);
+        struct.certificateCredential = new org.apache.airavata.credential.store.datamodel.CertificateCredential();
+        struct.certificateCredential.read(iprot);
+        struct.setCertificateCredentialIsSet(true);
       }
     }
 
   }
 
-  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");
+  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 addSSHCredentialSummary_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new addSSHCredentialSummary_resultTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new addCertificateCredential_resultStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new addCertificateCredential_resultTupleSchemeFactory());
     }
 
     public String success; // required
@@ -4214,13 +3918,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(addSSHCredentialSummary_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(addCertificateCredential_result.class, metaDataMap);
     }
 
-    public addSSHCredentialSummary_result() {
+    public addCertificateCredential_result() {
     }
 
-    public addSSHCredentialSummary_result(
+    public addCertificateCredential_result(
       String success,
       org.apache.airavata.credential.store.exception.CredentialStoreException csException)
     {
@@ -4232,7 +3936,7 @@ public class CredentialStoreService {
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public addSSHCredentialSummary_result(addSSHCredentialSummary_result other) {
+    public addCertificateCredential_result(addCertificateCredential_result other) {
       if (other.isSetSuccess()) {
         this.success = other.success;
       }
@@ -4241,8 +3945,8 @@ public class CredentialStoreService {
       }
     }
 
-    public addSSHCredentialSummary_result deepCopy() {
-      return new addSSHCredentialSummary_result(this);
+    public addCertificateCredential_result deepCopy() {
+      return new addCertificateCredential_result(this);
     }
 
     @Override
@@ -4255,7 +3959,7 @@ public class CredentialStoreService {
       return this.success;
     }
 
-    public addSSHCredentialSummary_result setSuccess(String success) {
+    public addCertificateCredential_result setSuccess(String success) {
       this.success = success;
       return this;
     }
@@ -4279,7 +3983,7 @@ public class CredentialStoreService {
       return this.csException;
     }
 
-    public addSSHCredentialSummary_result setCsException(org.apache.airavata.credential.store.exception.CredentialStoreException csException) {
+    public addCertificateCredential_result setCsException(org.apache.airavata.credential.store.exception.CredentialStoreException csException) {
       this.csException = csException;
       return this;
     }
@@ -4351,12 +4055,12 @@ public class CredentialStoreService {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof addSSHCredentialSummary_result)
-        return this.equals((addSSHCredentialSummary_result)that);
+      if (that instanceof addCertificateCredential_result)
+        return this.equals((addCertificateCredential_result)that);
       return false;
     }
 
-    public boolean equals(addSSHCredentialSummary_result that) {
+    public boolean equals(addCertificateCredential_result that) {
       if (that == null)
         return false;
 
@@ -4399,7 +4103,7 @@ public class CredentialStoreService {
     }
 
     @Override
-    public int compareTo(addSSHCredentialSummary_result other) {
+    public int compareTo(addCertificateCredential_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -4443,7 +4147,7 @@ public class CredentialStoreService {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("addSSHCredentialSummary_result(");
+      StringBuilder sb = new StringBuilder("addCertificateCredential_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -4486,15 +4190,15 @@ public class CredentialStoreService {
       }
     }
 
-    private static class addSSHCredentialSummary_resultStandardSchemeFactory implements SchemeFactory {
-      public addSSHCredentialSummary_resultStandardScheme getScheme() {
-        return new addSSHCredentialSummary_resultStandardScheme();
+    private static class addCertificateCredential_resultStandardSchemeFactory implements SchemeFactory {
+      public addCertificateCredential_resultStandardScheme getScheme() {
+        return new addCertificateCredential_resultStandardScheme();
       }
     }
 
-    private static class addSSHCredentialSummary_resultStandardScheme extends StandardScheme<addSSHCredentialSummary_result> {
+    private static class addCertificateCredential_resultStandardScheme extends StandardScheme<addCertificateCredential_result> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, addSSHCredentialSummary_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, addCertificateCredential_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -4532,7 +4236,7 @@ public class CredentialStoreService {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, addSSHCredentialSummary_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, addCertificateCredential_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -4552,16 +4256,16 @@ public class CredentialStoreService {
 
     }
 
-    private static class addSSHCredentialSummary_resultTupleSchemeFactory implements SchemeFactory {
-      public addSSHCredentialSummary_resultTupleScheme getScheme() {
-        return new addSSHCredentialSummary_resultTupleScheme();
+    private static class addCertificateCredential_resultTupleSchemeFactory implements SchemeFactory {
+      public addCertificateCredential_resultTupleScheme getScheme() {
+        return new addCertificateCredential_resultTupleScheme();
       }
     }
 
-    private static class addSSHCredentialSummary_resultTupleScheme extends TupleScheme<addSSHCredentialSummary_result> {
+    private static class addCertificateCredential_resultTupleScheme extends TupleScheme<addCertificateCredential_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, addSSHCredentialSummary_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, addCertificateCredential_result struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetSuccess()) {
@@ -4580,7 +4284,7 @@ public class CredentialStoreService {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, addSSHCredentialSummary_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, addCertificateCredential_result struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
@@ -4597,22 +4301,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 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");
 
-    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 PASSWORD_CREDENTIAL_FIELD_DESC = new org.apache.thrift.protocol.TField("passwordCredential", 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 addPasswordCredential_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new addPasswordCredential_argsTupleSchemeFactory());
     }
 
-    public org.apache.airavata.credential.store.datamodel.CertificateCredential certificateCredential; // required
+    public org.apache.airavata.credential.store.datamodel.PasswordCredential passwordCredential; // 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");
+      PASSWORD_CREDENTIAL((short)1, "passwordCredential");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -4627,8 +4331,8 @@ public class CredentialStoreService {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
-          case 1: // CERTIFICATE_CREDENTIAL
-            return CERTIFICATE_CREDENTIAL;
+          case 1: // PASSWORD_CREDENTIAL
+            return PASSWORD_CREDENTIAL;
           default:
             return null;
         }
@@ -4672,71 +4376,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.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)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(addCertificateCredential_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(addPasswordCredential_args.class, metaDataMap);
     }
 
-    public addCertificateCredential_args() {
+    public addPasswordCredential_args() {
     }
 
-    public addCertificateCredential_args(
-      org.apache.airavata.credential.store.datamodel.CertificateCredential certificateCredential)
+    public addPasswordCredential_args(
+      org.apache.airavata.credential.store.datamodel.PasswordCredential passwordCredential)
     {
       this();
-      this.certificateCredential = certificateCredential;
+      this.passwordCredential = passwordCredential;
     }
 
     /**
      * 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 addPasswordCredential_args(addPasswordCredential_args other) {
+      if (other.isSetPasswordCredential()) {
+        this.passwordCredential = new org.apache.airavata.credential.store.datamodel.PasswordCredential(other.passwordCredential);
       }
     }
 
-    public addCertificateCredential_args deepCopy() {
-      return new addCertificateCredential_args(this);
+    public addPasswordCredential_args deepCopy() {
+      return new addPasswordCredential_args(this);
     }
 
     @Override
     public void clear() {
-      this.certificateCredential = null;
+      this.passwordCredential = null;
     }
 
-    public org.apache.airavata.credential.store.datamodel.CertificateCredential getCertificateCredential() {
-      return this.certificateCredential;
+    public org.apache.airavata.credential.store.datamodel.PasswordCredential getPasswordCredential() {
+      return this.passwordCredential;
     }
 
-    public addCertificateCredential_args setCertificateCredential(org.apache.airavata.credential.store.datamodel.CertificateCredential certificateCredential) {
-      this.certificateCredential = certificateCredential;
+    public addPasswordCredential_args setPasswordCredential(org.apache.airavata.credential.store.datamodel.PasswordCredential passwordCredential) {
+      this.passwordCredential = passwordCredential;
       return this;
     }
 
-    public void unsetCertificateCredential() {
-      this.certificateCredential = null;
+    public void unsetPasswordCredential() {
+      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;
+    /** Returns true if field passwordCredential is set (has been assigned a value) and false otherwise */
+    public boolean isSetPasswordCredential() {
+      return this.passwordCredential != null;
     }
 
-    public void setCertificateCredentialIsSet(boolean value) {
+    public void setPasswordCredentialIsSet(boolean value) {
       if (!value) {
-        this.certificateCredential = null;
+        this.passwordCredential = null;
       }
     }
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case CERTIFICATE_CREDENTIAL:
+      case PASSWORD_CREDENTIAL:
         if (value == null) {
-          unsetCertificateCredential();
+          unsetPasswordCredential();
         } else {
-          setCertificateCredential((org.apache.airavata.credential.store.datamodel.CertificateCredential)value);
+          setPasswordCredential((org.apache.airavata.credential.store.datamodel.PasswordCredential)value);
         }
         break;
 
@@ -4745,8 +4449,8 @@ public class CredentialStoreService {
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case CERTIFICATE_CREDENTIAL:
-        return getCertificateCredential();
+      case PASSWORD_CREDENTIAL:
+        return getPasswordCredential();
 
       }
       throw new IllegalStateException();
@@ -4759,8 +4463,8 @@ public class CredentialStoreService {
       }
 
       switch (field) {
-      case CERTIFICATE_CREDENTIAL:
-        return isSetCertificateCredential();
+      case PASSWORD_CREDENTIAL:
+        return isSetPasswordCredential();
       }
       throw new IllegalStateException();
     }
@@ -4769,21 +4473,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 addPasswordCredential_args)
+        return this.equals((addPasswordCredential_args)that);
       return false;
     }
 
-    public boolean equals(addCertificateCredential_args that) {
+    public boolean equals(addPasswordCredential_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_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))
           return false;
-        if (!this.certificateCredential.equals(that.certificateCredential))
+        if (!this.passwordCredential.equals(that.passwordCredential))
           return false;
       }
 
@@ -4794,28 +4498,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_passwordCredential = true && (isSetPasswordCredential());
+      list.add(present_passwordCredential);
+      if (present_passwordCredential)
+        list.add(passwordCredential);
 
       return list.hashCode();
     }
 
     @Override
-    public int compareTo(addCertificateCredential_args other) {
+    public int compareTo(addPasswordCredential_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(isSetPasswordCredential()).compareTo(other.isSetPasswordCredential());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetCertificateCredential()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.certificateCredential, other.certificateCredential);
+      if (isSetPasswordCredential()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.passwordCredential, other.passwordCredential);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -4837,14 +4541,14 @@ public class CredentialStoreService {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("addCertificateCredential_args(");
+      StringBuilder sb = new StringBuilder("addPasswordCredential_args(");
       boolean first = true;
 
-      sb.append("certificateCredential:");
-      if (this.certificateCredential == null) {
+      sb.append("passwordCredential:");
+      if (this.passwordCredential == null) {
         sb.append("null");
       } else {
-        sb.append(this.certificateCredential);
+        sb.append(this.passwordCredential);
       }
       first = false;
       sb.append(")");
@@ -4853,12 +4557,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 (passwordCredential == null) {
+        throw new org.apache.thrift.protocol.TProtocolException("Required field 'passwordCredential' was not present! Struct: " + toString());
       }
       // check for sub-struct validity
-      if (certificateCredential != null) {
-        certificateCredential.validate();
+      if (passwordCredential != null) {
+        passwordCredential.validate();
       }
     }
 
@@ -4878,15 +4582,15 @@ public class CredentialStoreService {
       }
     }
 
-    private static class addCertificateCredential_argsStandardSchemeFactory implements SchemeFactory {
-      public addCertificateCredential_argsStandardScheme getScheme() {
-        return new addCertificateCredential_argsStandardScheme();
+    private static class addPasswordCredential_argsStandardSchemeFactory implements SchemeFactory {
+      public addPasswordCredential_argsStandardScheme getScheme() {
+        return new addPasswordCredential_argsStandardScheme();
       }
     }
 
-    private static class addCertificateCredential_argsStandardScheme extends StandardScheme<addCertificateCredential_args> {
+    private static class addPasswordCredential_argsStandardScheme extends StandardScheme<addPasswordCredential_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, addPasswordCredential_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -4896,11 +4600,11 @@ public class CredentialStoreService {
             break;
           }
           switch (schemeField.id) {
-            case 1: // CERTIFICATE_CREDENTIAL
+            case 1: // PASSWORD_CREDENTIAL
               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.passwordCredential = new org.apache.airavata.credential.store.datamodel.PasswordCredential();
+                struct.passwordCredential.read(iprot);
+                struct.setPasswordCredentialIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
@@ -4916,13 +4620,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, addPasswordCredential_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.passwordCredential != null) {
+          oprot.writeFieldBegin(PASSWORD_CREDENTIAL_FIELD_DESC);
+          struct.passwordCredential.write(oprot);
           oprot.writeFieldEnd();
         }
         oprot.writeFieldStop();
@@ -4931,41 +4635,41 @@ public class CredentialStoreService {
 
     }
 
-    private static class addCertificateCredential_argsTupleSchemeFactory implements SchemeFactory {
-      public addCertificateCredential_argsTupleScheme getScheme() {
-        return new addCertificateCredential_argsTupleScheme();
+    private static class addPasswordCredential_argsTupleSchemeFactory implements SchemeFactory {
+      public addPasswordCredential_argsTupleScheme getScheme() {
+        return new addPasswordCredential_argsTupleScheme();
       }
     }
 
-    private static class addCertificateCredential_argsTupleScheme extends TupleScheme<addCertificateCredential_args> {
+    private static class addPasswordCredential_argsTupleScheme extends TupleScheme<addPasswordCredential_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, addPasswordCredential_args struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
-        struct.certificateCredential.write(oprot);
+        struct.passwordCredential.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, addPasswordCredential_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.passwordCredential = new org.apache.airavata.credential.store.datamodel.PasswordCredential();
+        struct.passwordCredential.read(iprot);
+        struct.setPasswordCredentialIsSet(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 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");
+
     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 addPasswordCredential_resultStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new addPasswordCredential_resultTupleSchemeFactory());
     }
 
     public String success; // required
@@ -5041,13 +4745,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(addPasswordCredential_result.class, metaDataMap);
     }
 
-    public addCertificateCredential_result() {
+    public addPasswordCredential_result() {
     }
 
-    public addCertificateCredential_result(
+    public addPasswordCredential_result(
       String success,
       org.apache.airavata.credential.store.exception.CredentialStoreException csException)
     {
@@ -5059,7 +4763,7 @@ public class CredentialStoreService {
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public addCertificateCredential_result(addCertificateCredential_result other) {
+    public addPasswordCredential_result(addPasswordCredential_result other) {
       if (other.isSetSuccess()) {
         this.success = other.success;
       }
@@ -5068,8 +4772,8 @@ public class CredentialStoreService {
       }
     }
 
-    public addCertificateCredential_result deepCopy() {
-      return new addCertificateCredential_result(this);
+    public addPasswordCredential_result deepCopy() {
+      return new addPasswordCredential_result(this);
     }
 
     @Override
@@ -5082,7 +4786,7 @@ public class CredentialStoreService {
       return this.success;
     }
 
-    public addCertificateCredential_result setSuccess(String success) {
+    public addPasswordCredential_result setSuccess(String success) {
       this.success = success;
       return this;
     }
@@ -5106,7 +4810,7 @@ public class CredentialStoreService {
       return this.csException;
     }
 
-    public addCertificateCredential_result setCsException(org.apache.airavata.credential.store.exception.CredentialStoreException csException) {
+    public addPasswordCredential_result setCsException(org.apache.airavata.credential.store.exception.CredentialStoreException csException) {
       this.csException = csException;
       return this;
     }
@@ -5178,12 +4882,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 addPasswordCredential_result)
+        return this.equals((addPasswordCredential_result)that);
       return false;
     }
 
-    public boolean equals(addCertificateCredential_result that) {
+    public boolean equals(addPasswordCredential_result that) {
       if (that == null)
         return false;
 
@@ -5226,7 +4930,7 @@ public class CredentialStoreService {
     }
 
     @Override
-    public int compareTo(addCertificateCredential_result other) {
+    public int compareTo(addPasswordCredential_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -5270,7 +4974,7 @@ public class CredentialStoreService {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("addCertificateCredential_result(");
+      StringBuilder sb = new StringBuilder("addPasswordCredential_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -5313,15 +5017,15 @@ public class CredentialStoreService {
       }
     }
 
-    private static class addCertificateCredential_resultStandardSchemeFactory implements SchemeFactory {
-      public addCertificateCredential_resultStandardScheme getScheme() {
-        return new addCertificateCredential_resultStandardScheme();
+    private static class addPasswordCredential_resultStandardSchemeFactory implements SchemeFactory {
+      public addPasswordCredential_resultStandardScheme getScheme() {
+        return new addPasswordCredential_resultStandardScheme();
       }
     }
 
-    private static class addCertificateCredential_resultStandardScheme extends StandardScheme<addCertificateCredential_result> {
+    private static class addPasswordCredential_resultStandardScheme extends StandardScheme<addPasswordCredential_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, addPasswordCredential_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -5359,7 +5063,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, addPasswordCredential_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -5379,16 +5083,16 @@ public class CredentialStoreService {
 
     }
 
-    private static class addCertificateCredential_resultTupleSchemeFactory implements SchemeFactory {
-      public addCertificateCredential_resultTupleScheme getScheme() {
-        return new addCertificateCredential_resultTupleScheme();
+    private static class addPasswordCredential_resultTupleSchemeFactory implements SchemeFactory {
+      public addPasswordCredential_resultTupleScheme getScheme() {
+        return new addPasswordCredential_resultTupleScheme();
       }
     }
 
-    private static class addCertificateCredential_resultTupleScheme extends TupleScheme<addCertificateCredential_result> {
+    private static class addPasswordCredential_resultTupleScheme extends TupleScheme<addPasswordCredential_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, addPasswordCredential_result struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetSuccess()) {
@@ -5407,7 +5111,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, addPasswordCredential_result struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
@@ -5424,22 +5128,25 @@ 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 getSSHCredential_args implements org.apache.thrift.TBase<getSSHCredential_args, getSSHCredential_args._Fields>, java.io.Serializable, Cloneable, Comparable<getSSHCredential_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getSSHCredential_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 TOKEN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("tokenId", org.apache.thrift.protocol.TType.STRING, (short)1);
+    private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)2);
 
     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 getSSHCredential_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new getSSHCredential_argsTupleSchemeFactory());
     }
 
-    public org.apache.airavata.credential.store.datamodel.PasswordCredential passwordCredential; // required
+    public String tokenId; // required
+    public String gatewayId; // 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");
+      TOKEN_ID((short)1, "tokenId"),
+      GATEWAY_ID((short)2, "gatewayId");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -5454,8 +5161,10 @@ public class CredentialStoreService {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
-          case 1: // PASSWORD_CREDENTIAL
-            return PASSWORD_CREDENTIAL;
+          case 1: // TOKEN_ID
+            return TOKEN_ID;
+          case 2: // GATEWAY_ID
+            return GATEWAY_ID;
           default:
             return null;
         }
@@ -5499,71 +5208,111 @@ 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.TOKEN_ID, new org.apache.thrift.meta_data.FieldMetaData("tokenId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(addPasswordCredential_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getSSHCredential_args.class, metaDataMap);
     }
 
-    public addPasswordCredential_args() {
+    public getSSHCredential_args() {
     }
 
-    public addPasswordCredential_args(
-      org.apache.airavata.credential.store.datamodel.PasswordCredential passwordCredential)
+    public getSSHCredential_args(
+      String tokenId,
+      String gatewayId)
     {
       this();
-      this.passwordCredential = passwordCredential;
+      this.tokenId = tokenId;
+      this.gatewayId = gatewayId;
     }
 
     /**
      * 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 getSSHCredential_args(getSSHCredential_args other) {
+      if (other.isSetTokenId()) {
+        this.tokenId = other.tokenId;
+      }
+      if (other.isSetGatewayId()) {
+        this.gatewayId = other.gatewayId;
       }
     }
 
-    public addPasswordCredential_args deepCopy() {
-      return new addPasswordCredential_args(this);
+    public getSSHCredential_args deepCopy() {
+      return new getSSHCredential_args(this);
     }
 
     @Override
     public void clear() {
-      this.passwordCredential = null;
+      this.tokenId = null;
+      this.gatewayId = null;
     }
 
-    public org.apache.airavata.credential.store.datamodel.PasswordCredential getPasswordCredential() {
-      return this.passwordCredential;
+    public String getTokenId() {
+      return this.tokenId;
     }
 
-    public addPasswordCredential_args setPasswordCredential(org.apache.airavata.credential.store.datamodel.PasswordCredential passwordCredential) {
-      this.passwordCredential = passwordCredential;
+    public getSSHCredential_args setTokenId(String tokenId) {
+      this.tokenId = tokenId;
       return this;
     }
 
-    public void unsetPasswordCredential() {
-      this.passwordCredential = null;
+    public void unsetTokenId() {
+      this.tokenId = 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 tokenId is set (has been assigned a value) and false otherwise */
+    public boolean isSetTokenId() {
+      return this.tokenId != null;
     }
 
-    public void setPasswordCredentialIsSet(boolean value) {
+    public void setTokenIdIsSet(boolean value) {
       if (!value) {
-        this.passwordCredential = null;
+        this.tokenId = null;
+      }
+    }
+
+    public String getGatewayId() {
+      return this.gatewayId;
+    }
+
+    public getSSHCredential_args setGatewayId(String gatewayId) {
+      this.gatewayId = gatewayId;
+      return this;
+    }
+
+    public void unsetGatewayId() {
+      this.gatewayId = null;
+    }
+
+    /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */
+    public boolean isSetGatewayId() {
+      return this.gatewayId != null;
+    }
+
+    public void setGatewayIdIsSet(boolean value) {
+      if (!value) {
+        this.gatewayId = null;
       }
     }
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case PASSWORD_CREDENTIAL:
+      case TOKEN_ID:
         if (value == null) {
-          unsetPasswordCredential();
+          unsetTokenId();
         } else {
-          setPasswordCredential((org.apache.airavata.credential.store.datamodel.PasswordCredential)value);
+          setTokenId((String)value);
+        }
+        break;
+
+      case GATEWAY_ID:
+        if (value == null) {
+          unsetGatewayId();
+        } else {
+          setGatewayId((String)value);
         }
         break;
 
@@ -5572,8 +5321,11 @@ public class CredentialStoreService {
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case PASSWORD_CREDENTIAL:
-        return getPasswordCredential();
+      case TOKEN_ID:
+        return getTokenId();
+
+      case GATEWAY_ID:
+        return getGatewayId();
 
       }
       throw new IllegalStateException();
@@ -5586,8 +5338,10 @@ public class CredentialStoreService {
       }
 
       switch (field) {
-      case PASSWORD_CREDENTIAL:
-        return isSetPasswordCredential();
+      case TOKEN_ID:
+        return isSetTokenId();
+      case GATEWAY_ID:
+        return isSetGatewayId();
       }
       throw new IllegalStateException();
     }
@@ -5596,21 +5350,30 @@ 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 getSSHCredential_args)
+        return this.equals((getSSHCredential_args)that);
       return false;
     }
 
-    public boolean equals(addPasswordCredential_args that) {
+    public boolean equals(getSSHCredential_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_tokenId = true && this.isSetTokenId();
+      boolean that_present_tokenId = true && that.isSetTokenId();
+      if (this_present_tokenId || that_present_tokenId) {
+        if (!(this_present_tokenId && that_present_tokenId))
           return false;
-        if (!this.passwordCredential.equals(that.passwordCredential))
+        if (!this.tokenId.equals(that.tokenId))
+          return false;
+      }
+
+      boolean this_present_gatewayId = true && this.isSetGatewayId();
+      boolean that_present_gatewayId = true && that.isSetGatewayId();
+      if (this_present_gatewayId || that_present_gatewayId) {
+        if (!(this_present_gatewayId && that_present_gatewayId))
+          return false;
+        if (!this.gatewayId.equals(that.gatewayId))
           return false;
       }
 
@@ -5621,28 +5384,43 @@ public class CredentialStoreService {
     public int hashCode() {
       List<Object> list

<TRUNCATED>

Mime
View raw message