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
The following commit(s) were added to refs/heads/master by this push:
new f29307f AIRAVATA-2598 Moved Thrift serializer into api app
f29307f is described below
commit f29307fea1274ce59ef13fa7c4fc66246b1aefdb
Author: Marcus Christie <[email protected]>
AuthorDate: Fri Dec 15 09:53:01 2017 -0500
AIRAVATA-2598 Moved Thrift serializer into api app
---
django_airavata/apps/api/serializers.py | 6 +++---
.../apps/api/thrift_utils.py | 0
django_airavata/apps/api/views.py | 16 ++++++++--------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/django_airavata/apps/api/serializers.py
b/django_airavata/apps/api/serializers.py
index 9f7a583..77d27a8 100644
--- a/django_airavata/apps/api/serializers.py
+++ b/django_airavata/apps/api/serializers.py
@@ -8,7 +8,7 @@ from airavata.model.experiment.ttypes import ExperimentModel
from airavata.model.workspace.ttypes import Project
from airavata.model.appcatalog.appdeployment.ttypes import ApplicationModule
from airavata.model.appcatalog.computeresource.ttypes import BatchQueue
-import thrift_django_serializer
+from . import thrift_utils
from django.conf import settings
@@ -227,7 +227,7 @@ class SetEnvPathsSerializer(CustomSerializer):
raise Exception("Not implemented")
-class
ApplicationDeploymentDescriptionSerializer(thrift_django_serializer.create_serializer_class(ApplicationDeploymentDescription)):
+class
ApplicationDeploymentDescriptionSerializer(thrift_utils.create_serializer_class(ApplicationDeploymentDescription)):
url =
FullyEncodedHyperlinkedIdentityField(view_name='django_airavata_api:application-deployment-detail',
lookup_field='appDeploymentId', lookup_url_kwarg='app_deployment_id')
# Default values returned in these results have been overridden with app
deployment defaults for any that exist
queues =
FullyEncodedHyperlinkedIdentityField(view_name='django_airavata_api:application-deployment-queues',
lookup_field='appDeploymentId', lookup_url_kwarg='app_deployment_id')
@@ -240,5 +240,5 @@ class
ComputeResourceDescriptionSerializer(CustomSerializer):
resourceDescription=serializers.CharField()
enabled=serializers.BooleanField()
-class
BatchQueueSerializer(thrift_django_serializer.create_serializer_class(BatchQueue)):
+class BatchQueueSerializer(thrift_utils.create_serializer_class(BatchQueue)):
pass
diff --git a/thrift_django_serializer.py
b/django_airavata/apps/api/thrift_utils.py
similarity index 100%
rename from thrift_django_serializer.py
rename to django_airavata/apps/api/thrift_utils.py
diff --git a/django_airavata/apps/api/views.py
b/django_airavata/apps/api/views.py
index fc79e70..3c832c0 100644
--- a/django_airavata/apps/api/views.py
+++ b/django_airavata/apps/api/views.py
@@ -1,5 +1,6 @@
from . import serializers
+from . import thrift_utils
from rest_framework import status, mixins, pagination
from rest_framework.decorators import api_view
@@ -24,7 +25,6 @@ from airavata.model.appcatalog.appinterface.ttypes import
ApplicationInterfaceDe
from airavata.model.appcatalog.computeresource.ttypes import
ComputeResourceDescription
from airavata.model.credential.store.ttypes import
CredentialOwnerType,SummaryType,CredentialSummary
-import thrift_django_serializer
from collections import OrderedDict
import logging
@@ -265,7 +265,7 @@ class ApplicationModuleViewSet(APIBackedViewSet):
if app_module_id in app_interface.applicationModules:
app_interfaces.append(app_interface)
if len(app_interfaces) == 1:
- serializer = thrift_django_serializer.create_serializer(
+ serializer = thrift_utils.create_serializer(
ApplicationInterfaceDescription, instance=app_interfaces[0],
context={'request': request})
return Response(serializer.data)
elif len(app_interfaces) > 1:
@@ -397,7 +397,7 @@ class ComputeResourceDetails(APIView):
def get(self, request, format=None):
details =
request.airavata_client.getComputeResource(request.authz_token,
request.query_params["id"])
- serializer =
thrift_django_serializer.create_serializer(ComputeResourceDescription,
instance=details,
+ serializer =
thrift_utils.create_serializer(ComputeResourceDescription, instance=details,
context={'request': request})
print(details)
return Response(serializer.data)
@@ -408,7 +408,7 @@ class ComputeResourcesQueues(APIView):
def get(self, request, format=None):
details =
request.airavata_client.getComputeResource(request.authz_token,
request.query_params["id"])
- serializer =
thrift_django_serializer.create_serializer(ComputeResourceDescription,
instance=details,
+ serializer =
thrift_utils.create_serializer(ComputeResourceDescription, instance=details,
context={'request': request})
data = serializer.data
return Response([queue["queueName"] for queue in data["batchQueues"]])
@@ -417,7 +417,7 @@ class ComputeResourcesQueues(APIView):
class ApplicationInterfaceList(APIView):
def get(self, request, format=None):
gateway_id = settings.GATEWAY_ID
- serializer =
thrift_django_serializer.create_serializer(ApplicationInterfaceDescription,
+ serializer =
thrift_utils.create_serializer(ApplicationInterfaceDescription,
instance=request.airavata_client.getAllApplicationInterfaces(
request.authz_token, gateway_id),
context={'request': request},many=True)
@@ -432,7 +432,7 @@ class FetchApplicationInterface(APIView):
request.authz_token, gateway_id):
app_modules=app_interface.applicationModules
if request.query_params["id"] in app_modules:
- return
Response(thrift_django_serializer.create_serializer(ApplicationInterfaceDescription,
+ return
Response(thrift_utils.create_serializer(ApplicationInterfaceDescription,
instance=app_interface,
context={'request': request}).data)
return Response(status=status.HTTP_400_BAD_REQUEST)
@@ -444,7 +444,7 @@ class FetchApplicationDeployment(APIView):
gateway_id = settings.GATEWAY_ID
app_deployments=[app_deployment for app_deployment in
request.airavata_client.getAllApplicationDeployments(
request.authz_token, gateway_id) if request.query_params["id"]
== app_deployment.appModuleId]
-
serializer=thrift_django_serializer.create_serializer(ApplicationDeploymentDescription,
+
serializer=thrift_utils.create_serializer(ApplicationDeploymentDescription,
instance=app_deployments,
context={'request':
request},many=True)
return Response(serializer.data)
@@ -454,7 +454,7 @@ class FetchSSHPubKeys(APIView):
def get(self,request,format=None):
gateway_id = settings.GATEWAY_ID
-
serializer=thrift_django_serializer.create_serializer(CredentialSummary,instance=request.airavata_client.getAllCredentialSummaryForGateway
(request.authz_token,SummaryType.SSH,gateway_id),context={'request':
request},many=True)
+
serializer=thrift_utils.create_serializer(CredentialSummary,instance=request.airavata_client.getAllCredentialSummaryForGateway
(request.authz_token,SummaryType.SSH,gateway_id),context={'request':
request},many=True)
return Response(serializer.data)
class GenerateRegisterSSHKeys(APIView):
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
