You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2018/09/26 23:39:34 UTC

[airavata-django-portal] branch master updated (daf1f76 -> 20134ca)

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.


    from daf1f76  AIRAVATA-2840 SSH Credential selector with copy public key and new button
     new 750104d  AIRAVATA-2840 Regenerate Thrift stubs
     new 20134ca  AIRAVATA-2840 Updates for API changes

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 airavata/api/Airavata-remote                       |  24 ++---
 airavata/api/Airavata.py                           | 113 ++++-----------------
 airavata/model/credential/store/ttypes.py          |   3 +-
 .../django_airavata_api/js/service_config.js       |   3 +
 django_airavata/apps/api/views.py                  |  11 +-
 5 files changed, 42 insertions(+), 112 deletions(-)


[airavata-django-portal] 01/02: AIRAVATA-2840 Regenerate Thrift stubs

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git

commit 750104d1cafd308f1ba0ee6e5a68928e608b7ac7
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Sep 26 19:26:42 2018 -0400

    AIRAVATA-2840 Regenerate Thrift stubs
---
 airavata/api/Airavata-remote              |  24 +++----
 airavata/api/Airavata.py                  | 113 ++++++------------------------
 airavata/model/credential/store/ttypes.py |   3 +-
 3 files changed, 34 insertions(+), 106 deletions(-)

diff --git a/airavata/api/Airavata-remote b/airavata/api/Airavata-remote
index 83fe696..895e181 100755
--- a/airavata/api/Airavata-remote
+++ b/airavata/api/Airavata-remote
@@ -40,10 +40,10 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
     print('   getAllNotifications(AuthzToken authzToken, string gatewayId)')
     print('  string generateAndRegisterSSHKeys(AuthzToken authzToken, string description)')
     print('  string registerPwdCredential(AuthzToken authzToken, string loginUserName, string password, string description)')
-    print('  CredentialSummary getCredentialSummary(AuthzToken authzToken, SummaryType type, string tokenId)')
+    print('  CredentialSummary getCredentialSummary(AuthzToken authzToken, string tokenId)')
     print('   getAllCredentialSummaries(AuthzToken authzToken, SummaryType type)')
-    print('  bool deleteSSHPubKey(AuthzToken authzToken, string airavataCredStoreToken, string gatewayId)')
-    print('  bool deletePWDCredential(AuthzToken authzToken, string airavataCredStoreToken, string gatewayId)')
+    print('  bool deleteSSHPubKey(AuthzToken authzToken, string airavataCredStoreToken)')
+    print('  bool deletePWDCredential(AuthzToken authzToken, string airavataCredStoreToken)')
     print('  string createProject(AuthzToken authzToken, string gatewayId, Project project)')
     print('  void updateProject(AuthzToken authzToken, string projectId, Project updatedProject)')
     print('  Project getProject(AuthzToken authzToken, string projectId)')
@@ -387,10 +387,10 @@ elif cmd == 'registerPwdCredential':
     pp.pprint(client.registerPwdCredential(eval(args[0]), args[1], args[2], args[3],))
 
 elif cmd == 'getCredentialSummary':
-    if len(args) != 3:
-        print('getCredentialSummary requires 3 args')
+    if len(args) != 2:
+        print('getCredentialSummary requires 2 args')
         sys.exit(1)
-    pp.pprint(client.getCredentialSummary(eval(args[0]), eval(args[1]), args[2],))
+    pp.pprint(client.getCredentialSummary(eval(args[0]), args[1],))
 
 elif cmd == 'getAllCredentialSummaries':
     if len(args) != 2:
@@ -399,16 +399,16 @@ elif cmd == 'getAllCredentialSummaries':
     pp.pprint(client.getAllCredentialSummaries(eval(args[0]), eval(args[1]),))
 
 elif cmd == 'deleteSSHPubKey':
-    if len(args) != 3:
-        print('deleteSSHPubKey requires 3 args')
+    if len(args) != 2:
+        print('deleteSSHPubKey requires 2 args')
         sys.exit(1)
-    pp.pprint(client.deleteSSHPubKey(eval(args[0]), args[1], args[2],))
+    pp.pprint(client.deleteSSHPubKey(eval(args[0]), args[1],))
 
 elif cmd == 'deletePWDCredential':
-    if len(args) != 3:
-        print('deletePWDCredential requires 3 args')
+    if len(args) != 2:
+        print('deletePWDCredential requires 2 args')
         sys.exit(1)
-    pp.pprint(client.deletePWDCredential(eval(args[0]), args[1], args[2],))
+    pp.pprint(client.deletePWDCredential(eval(args[0]), args[1],))
 
 elif cmd == 'createProject':
     if len(args) != 3:
diff --git a/airavata/api/Airavata.py b/airavata/api/Airavata.py
index 3923df7..9f7a0ba 100644
--- a/airavata/api/Airavata.py
+++ b/airavata/api/Airavata.py
@@ -255,11 +255,10 @@ class Iface(object):
         """
         pass
 
-    def getCredentialSummary(self, authzToken, type, tokenId):
+    def getCredentialSummary(self, authzToken, tokenId):
         """
         Parameters:
          - authzToken
-         - type
          - tokenId
         """
         pass
@@ -272,32 +271,19 @@ class Iface(object):
         """
         pass
 
-    def deleteSSHPubKey(self, authzToken, airavataCredStoreToken, gatewayId):
+    def deleteSSHPubKey(self, authzToken, airavataCredStoreToken):
         """
-
-        Delete a Gateway
-
-        @param gatewayId
-           The gateway Id of the Gateway to be deleted.
-
-        @return boolean
-           Boolean identifier for the success or failure of the deletion operation.
-
-
-
         Parameters:
          - authzToken
          - airavataCredStoreToken
-         - gatewayId
         """
         pass
 
-    def deletePWDCredential(self, authzToken, airavataCredStoreToken, gatewayId):
+    def deletePWDCredential(self, authzToken, airavataCredStoreToken):
         """
         Parameters:
          - authzToken
          - airavataCredStoreToken
-         - gatewayId
         """
         pass
 
@@ -4346,21 +4332,19 @@ class Client(Iface):
             raise result.ase
         raise TApplicationException(TApplicationException.MISSING_RESULT, "registerPwdCredential failed: unknown result")
 
-    def getCredentialSummary(self, authzToken, type, tokenId):
+    def getCredentialSummary(self, authzToken, tokenId):
         """
         Parameters:
          - authzToken
-         - type
          - tokenId
         """
-        self.send_getCredentialSummary(authzToken, type, tokenId)
+        self.send_getCredentialSummary(authzToken, tokenId)
         return self.recv_getCredentialSummary()
 
-    def send_getCredentialSummary(self, authzToken, type, tokenId):
+    def send_getCredentialSummary(self, authzToken, tokenId):
         self._oprot.writeMessageBegin('getCredentialSummary', TMessageType.CALL, self._seqid)
         args = getCredentialSummary_args()
         args.authzToken = authzToken
-        args.type = type
         args.tokenId = tokenId
         args.write(self._oprot)
         self._oprot.writeMessageEnd()
@@ -4428,33 +4412,20 @@ class Client(Iface):
             raise result.ase
         raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllCredentialSummaries failed: unknown result")
 
-    def deleteSSHPubKey(self, authzToken, airavataCredStoreToken, gatewayId):
+    def deleteSSHPubKey(self, authzToken, airavataCredStoreToken):
         """
-
-        Delete a Gateway
-
-        @param gatewayId
-           The gateway Id of the Gateway to be deleted.
-
-        @return boolean
-           Boolean identifier for the success or failure of the deletion operation.
-
-
-
         Parameters:
          - authzToken
          - airavataCredStoreToken
-         - gatewayId
         """
-        self.send_deleteSSHPubKey(authzToken, airavataCredStoreToken, gatewayId)
+        self.send_deleteSSHPubKey(authzToken, airavataCredStoreToken)
         return self.recv_deleteSSHPubKey()
 
-    def send_deleteSSHPubKey(self, authzToken, airavataCredStoreToken, gatewayId):
+    def send_deleteSSHPubKey(self, authzToken, airavataCredStoreToken):
         self._oprot.writeMessageBegin('deleteSSHPubKey', TMessageType.CALL, self._seqid)
         args = deleteSSHPubKey_args()
         args.authzToken = authzToken
         args.airavataCredStoreToken = airavataCredStoreToken
-        args.gatewayId = gatewayId
         args.write(self._oprot)
         self._oprot.writeMessageEnd()
         self._oprot.trans.flush()
@@ -4482,22 +4453,20 @@ class Client(Iface):
             raise result.ae
         raise TApplicationException(TApplicationException.MISSING_RESULT, "deleteSSHPubKey failed: unknown result")
 
-    def deletePWDCredential(self, authzToken, airavataCredStoreToken, gatewayId):
+    def deletePWDCredential(self, authzToken, airavataCredStoreToken):
         """
         Parameters:
          - authzToken
          - airavataCredStoreToken
-         - gatewayId
         """
-        self.send_deletePWDCredential(authzToken, airavataCredStoreToken, gatewayId)
+        self.send_deletePWDCredential(authzToken, airavataCredStoreToken)
         return self.recv_deletePWDCredential()
 
-    def send_deletePWDCredential(self, authzToken, airavataCredStoreToken, gatewayId):
+    def send_deletePWDCredential(self, authzToken, airavataCredStoreToken):
         self._oprot.writeMessageBegin('deletePWDCredential', TMessageType.CALL, self._seqid)
         args = deletePWDCredential_args()
         args.authzToken = authzToken
         args.airavataCredStoreToken = airavataCredStoreToken
-        args.gatewayId = gatewayId
         args.write(self._oprot)
         self._oprot.writeMessageEnd()
         self._oprot.trans.flush()
@@ -14149,7 +14118,7 @@ class Processor(Iface, TProcessor):
         iprot.readMessageEnd()
         result = getCredentialSummary_result()
         try:
-            result.success = self._handler.getCredentialSummary(args.authzToken, args.type, args.tokenId)
+            result.success = self._handler.getCredentialSummary(args.authzToken, args.tokenId)
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
@@ -14208,7 +14177,7 @@ class Processor(Iface, TProcessor):
         iprot.readMessageEnd()
         result = deleteSSHPubKey_result()
         try:
-            result.success = self._handler.deleteSSHPubKey(args.authzToken, args.airavataCredStoreToken, args.gatewayId)
+            result.success = self._handler.deleteSSHPubKey(args.authzToken, args.airavataCredStoreToken)
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
@@ -14239,7 +14208,7 @@ class Processor(Iface, TProcessor):
         iprot.readMessageEnd()
         result = deletePWDCredential_result()
         try:
-            result.success = self._handler.deletePWDCredential(args.authzToken, args.airavataCredStoreToken, args.gatewayId)
+            result.success = self._handler.deletePWDCredential(args.authzToken, args.airavataCredStoreToken)
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
@@ -22562,20 +22531,17 @@ class getCredentialSummary_args(object):
     """
     Attributes:
      - authzToken
-     - type
      - tokenId
     """
 
     thrift_spec = (
         None,  # 0
         (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.I32, 'type', None, None, ),  # 2
-        (3, TType.STRING, 'tokenId', 'UTF8', None, ),  # 3
+        (2, TType.STRING, 'tokenId', 'UTF8', None, ),  # 2
     )
 
-    def __init__(self, authzToken=None, type=None, tokenId=None,):
+    def __init__(self, authzToken=None, tokenId=None,):
         self.authzToken = authzToken
-        self.type = type
         self.tokenId = tokenId
 
     def read(self, iprot):
@@ -22594,11 +22560,6 @@ class getCredentialSummary_args(object):
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
-                if ftype == TType.I32:
-                    self.type = iprot.readI32()
-                else:
-                    iprot.skip(ftype)
-            elif fid == 3:
                 if ftype == TType.STRING:
                     self.tokenId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
@@ -22617,12 +22578,8 @@ class getCredentialSummary_args(object):
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
-        if self.type is not None:
-            oprot.writeFieldBegin('type', TType.I32, 2)
-            oprot.writeI32(self.type)
-            oprot.writeFieldEnd()
         if self.tokenId is not None:
-            oprot.writeFieldBegin('tokenId', TType.STRING, 3)
+            oprot.writeFieldBegin('tokenId', TType.STRING, 2)
             oprot.writeString(self.tokenId.encode('utf-8') if sys.version_info[0] == 2 else self.tokenId)
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
@@ -22631,8 +22588,6 @@ class getCredentialSummary_args(object):
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
-        if self.type is None:
-            raise TProtocolException(message='Required field type is unset!')
         if self.tokenId is None:
             raise TProtocolException(message='Required field tokenId is unset!')
         return
@@ -22950,20 +22905,17 @@ class deleteSSHPubKey_args(object):
     Attributes:
      - authzToken
      - airavataCredStoreToken
-     - gatewayId
     """
 
     thrift_spec = (
         None,  # 0
         (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'airavataCredStoreToken', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 3
     )
 
-    def __init__(self, authzToken=None, airavataCredStoreToken=None, gatewayId=None,):
+    def __init__(self, authzToken=None, airavataCredStoreToken=None,):
         self.authzToken = authzToken
         self.airavataCredStoreToken = airavataCredStoreToken
-        self.gatewayId = gatewayId
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -22985,11 +22937,6 @@ class deleteSSHPubKey_args(object):
                     self.airavataCredStoreToken = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
-            elif fid == 3:
-                if ftype == TType.STRING:
-                    self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                else:
-                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -23008,10 +22955,6 @@ class deleteSSHPubKey_args(object):
             oprot.writeFieldBegin('airavataCredStoreToken', TType.STRING, 2)
             oprot.writeString(self.airavataCredStoreToken.encode('utf-8') if sys.version_info[0] == 2 else self.airavataCredStoreToken)
             oprot.writeFieldEnd()
-        if self.gatewayId is not None:
-            oprot.writeFieldBegin('gatewayId', TType.STRING, 3)
-            oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
-            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
@@ -23020,8 +22963,6 @@ class deleteSSHPubKey_args(object):
             raise TProtocolException(message='Required field authzToken is unset!')
         if self.airavataCredStoreToken is None:
             raise TProtocolException(message='Required field airavataCredStoreToken is unset!')
-        if self.gatewayId is None:
-            raise TProtocolException(message='Required field gatewayId is unset!')
         return
 
     def __repr__(self):
@@ -23152,20 +23093,17 @@ class deletePWDCredential_args(object):
     Attributes:
      - authzToken
      - airavataCredStoreToken
-     - gatewayId
     """
 
     thrift_spec = (
         None,  # 0
         (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'airavataCredStoreToken', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 3
     )
 
-    def __init__(self, authzToken=None, airavataCredStoreToken=None, gatewayId=None,):
+    def __init__(self, authzToken=None, airavataCredStoreToken=None,):
         self.authzToken = authzToken
         self.airavataCredStoreToken = airavataCredStoreToken
-        self.gatewayId = gatewayId
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -23187,11 +23125,6 @@ class deletePWDCredential_args(object):
                     self.airavataCredStoreToken = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
-            elif fid == 3:
-                if ftype == TType.STRING:
-                    self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                else:
-                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -23210,10 +23143,6 @@ class deletePWDCredential_args(object):
             oprot.writeFieldBegin('airavataCredStoreToken', TType.STRING, 2)
             oprot.writeString(self.airavataCredStoreToken.encode('utf-8') if sys.version_info[0] == 2 else self.airavataCredStoreToken)
             oprot.writeFieldEnd()
-        if self.gatewayId is not None:
-            oprot.writeFieldBegin('gatewayId', TType.STRING, 3)
-            oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
-            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
@@ -23222,8 +23151,6 @@ class deletePWDCredential_args(object):
             raise TProtocolException(message='Required field authzToken is unset!')
         if self.airavataCredStoreToken is None:
             raise TProtocolException(message='Required field airavataCredStoreToken is unset!')
-        if self.gatewayId is None:
-            raise TProtocolException(message='Required field gatewayId is unset!')
         return
 
     def __repr__(self):
diff --git a/airavata/model/credential/store/ttypes.py b/airavata/model/credential/store/ttypes.py
index e4d52ad..86e716f 100644
--- a/airavata/model/credential/store/ttypes.py
+++ b/airavata/model/credential/store/ttypes.py
@@ -188,7 +188,8 @@ class CredentialSummary(object):
     Attributes:
      - type
      - gatewayId
-     - username
+     - username: The username corresponds to the Credential's `portalUserName` which is the username of the user that
+    created the credential.
      - publicKey
      - persistedTime
      - token


[airavata-django-portal] 02/02: AIRAVATA-2840 Updates for API changes

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git

commit 20134ca415d30bbf45334d526adc9f8227031a34
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Sep 26 19:37:48 2018 -0400

    AIRAVATA-2840 Updates for API changes
---
 .../apps/api/static/django_airavata_api/js/service_config.js  |  3 +++
 django_airavata/apps/api/views.py                             | 11 +++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/django_airavata/apps/api/static/django_airavata_api/js/service_config.js b/django_airavata/apps/api/static/django_airavata_api/js/service_config.js
index 63bb0fc..d1f52f9 100644
--- a/django_airavata/apps/api/static/django_airavata_api/js/service_config.js
+++ b/django_airavata/apps/api/static/django_airavata_api/js/service_config.js
@@ -140,6 +140,9 @@ export default {
         name: "list"
       },
       {
+        name: "retrieve"
+      },
+      {
         name: "delete"
       },
       {
diff --git a/django_airavata/apps/api/views.py b/django_airavata/apps/api/views.py
index aec34a9..805c35d 100644
--- a/django_airavata/apps/api/views.py
+++ b/django_airavata/apps/api/views.py
@@ -790,9 +790,8 @@ class CredentialSummaryViewSet(APIBackedViewSet):
         return ssh_creds + pwd_creds
 
     def get_instance(self, lookup_value):
-        # FIXME: assuming SSH type, need to remove type from signature
         return self.request.airavata_client.getCredentialSummary(
-            self.authz_token, SummaryType.SSH, lookup_value)
+            self.authz_token, lookup_value)
 
     @action(detail=False)
     def ssh(self, request):
@@ -818,7 +817,7 @@ class CredentialSummaryViewSet(APIBackedViewSet):
         token_id = self.request.airavata_client.generateAndRegisterSSHKeys(
             request.authz_token, description)
         credential_summary = self.request.airavata_client.getCredentialSummary(
-            request.authz_token, SummaryType.SSH, token_id)
+            request.authz_token, token_id)
         serializer = self.get_serializer(credential_summary)
         return Response(serializer.data)
 
@@ -835,14 +834,14 @@ class CredentialSummaryViewSet(APIBackedViewSet):
         token_id = self.request.airavata_client.registerPwdCredential(
             request.authz_token, username, password, description)
         credential_summary = self.request.airavata_client.getCredentialSummary(
-            request.authz_token, SummaryType.PASSWD, token_id)
+            request.authz_token, token_id)
         serializer = self.get_serializer(credential_summary)
         return Response(serializer.data)
 
     def perform_destroy(self, instance):
         if instance.type == SummaryType.SSH:
             self.request.airavata_client.deleteSSHPubKey(
-                self.authz_token, instance.token, settings.GATEWAY_ID)
+                self.authz_token, instance.token)
         elif instance.type == SummaryType.PASSWD:
             self.request.airavata_client.deletePWDCredential(
-                self.authz_token, instance.token, settings.GATEWAY_ID)
+                self.authz_token, instance.token)