This is an automated email from the ASF dual-hosted git repository.
yasithdev pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airavata-portals.git
The following commit(s) were added to refs/heads/main by this push:
new 2f967f0af refactor(portal): make gateway-profile + storage-preference
serializers proto-native (Track D) (#198)
2f967f0af is described below
commit 2f967f0afa2f3dcf58ae020d1b0a456eb0c518e3
Author: Yasith Jayawardana <[email protected]>
AuthorDate: Tue Jun 9 03:57:48 2026 -0400
refactor(portal): make gateway-profile + storage-preference serializers
proto-native (Track D) (#198)
Rewrite StoragePreferenceSerializer, GatewayResourceProfileSerializer, and
the
nested ComputeResourcePreferenceSerializer to read the gRPC protobuf
directly,
emitting the same Thrift-named JSON keys.
- New ProtoEnumIntField (+ proto_enum_int_field factory) renders a proto
enum as
the Thrift integer by member name, with a name_map for the protocol enums
whose
names diverge (proto JSP_CLOUD -> Thrift CLOUD; proto
DATA_MOVEMENT_PROTOCOL_LOCAL -> Thrift LOCAL); reusable
job_submission_protocol_field / data_movement_protocol_field helpers back
the
compute-resource-preference protocol fields.
- Repoint CurrentGatewayResourceProfile (get/put) and
StoragePreferenceViewSet
(list/instance/create/update/destroy) to pass protobuf through directly,
dropping grpc_adapters.{gateway_resource_profile,storage_preference,
_compute_resource_preference} + grpc_requests equivalents and the Thrift
GatewayResourceProfile/StoragePreference imports.
Validated byte-for-byte (storage pref full/empty, gateway profile with
nested
compute prefs, incl. the divergent protocol-enum bridging JSP_CLOUD/LOCAL)
vs the
old adapter+serializer path; write paths produce equivalent protos.
manage.py
check green; api test failures unchanged vs origin/main.
---
.../django_airavata/apps/api/grpc_adapters.py | 49 -----
.../django_airavata/apps/api/grpc_requests.py | 55 -----
.../django_airavata/apps/api/serializers.py | 233 +++++++++++++++++++--
.../django_airavata/apps/api/views.py | 28 ++-
4 files changed, 230 insertions(+), 135 deletions(-)
diff --git a/airavata-django-portal/django_airavata/apps/api/grpc_adapters.py
b/airavata-django-portal/django_airavata/apps/api/grpc_adapters.py
index 2edda54b4..b74747554 100644
--- a/airavata-django-portal/django_airavata/apps/api/grpc_adapters.py
+++ b/airavata-django-portal/django_airavata/apps/api/grpc_adapters.py
@@ -471,55 +471,6 @@ def group_resource_profile(pb):
)
-def storage_preference(pb):
- """gRPC ``StoragePreference`` -> ``StoragePreferenceSerializer`` shape."""
- return SimpleNamespace(
- storageResourceId=pb.storage_resource_id,
- loginUserName=pb.login_user_name,
- fileSystemRootLocation=pb.file_system_root_location,
-
resourceSpecificCredentialStoreToken=pb.resource_specific_credential_store_token,
- )
-
-
-def _compute_resource_preference(pb):
- """gRPC ``ComputeResourcePreference`` -> auto-generated serializer
shape."""
- return SimpleNamespace(
- computeResourceId=pb.compute_resource_id,
- overridebyAiravata=pb.override_by_airavata,
- loginUserName=pb.login_user_name,
- # rendered as raw ints; bridge by name (name-divergent maps).
- preferredJobSubmissionProtocol=_thrift_enum_mapped(
- pb, 'preferred_job_submission_protocol', _JOB_SUBMISSION_PROTOCOL),
- preferredDataMovementProtocol=_thrift_enum_mapped(
- pb, 'preferred_data_movement_protocol', _DATA_MOVEMENT_PROTOCOL),
- preferredBatchQueue=pb.preferred_batch_queue,
- scratchLocation=pb.scratch_location,
- allocationProjectNumber=pb.allocation_project_number,
-
resourceSpecificCredentialStoreToken=pb.resource_specific_credential_store_token,
- usageReportingGatewayId=pb.usage_reporting_gateway_id,
- qualityOfService=pb.quality_of_service,
- reservation=pb.reservation,
- reservationStartTime=pb.reservation_start_time or None,
- reservationEndTime=pb.reservation_end_time or None,
- sshAccountProvisioner=pb.ssh_account_provisioner,
- sshAccountProvisionerConfig=dict(pb.ssh_account_provisioner_config),
-
sshAccountProvisionerAdditionalInfo=pb.ssh_account_provisioner_additional_info,
- )
-
-
-def gateway_resource_profile(pb):
- """gRPC ``GatewayResourceProfile`` -> ``GatewayResourceProfileSerializer``
shape."""
- return SimpleNamespace(
- gatewayID=pb.gateway_id,
- credentialStoreToken=pb.credential_store_token,
- computeResourcePreferences=[
- _compute_resource_preference(p) for p in
pb.compute_resource_preferences],
- storagePreferences=[storage_preference(p) for p in
pb.storage_preferences],
- identityServerTenant=pb.identity_server_tenant,
- identityServerPwdCredToken=pb.identity_server_pwd_cred_token,
- )
-
-
# --- Experiment tree -------------------------------------------------------
#
# getExperiment returns the full ExperimentModel including the processes tree
diff --git a/airavata-django-portal/django_airavata/apps/api/grpc_requests.py
b/airavata-django-portal/django_airavata/apps/api/grpc_requests.py
index 872e18a70..5af94b865 100644
--- a/airavata-django-portal/django_airavata/apps/api/grpc_requests.py
+++ b/airavata-django-portal/django_airavata/apps/api/grpc_requests.py
@@ -197,61 +197,6 @@ def _proto_enum_rev(proto_enum, rev_map, value):
return proto_enum.Value(name) if name is not None else 0
-def _compute_resource_preference(t):
- """Thrift ``ComputeResourcePreference`` -> proto message."""
- gp = _pb2("appcatalog.gatewayprofile.gateway_profile_pb2")
- cr = _pb2("appcatalog.computeresource.compute_resource_pb2")
- dm = _pb2("data.movement.data_movement_pb2")
- return gp.ComputeResourcePreference(
- compute_resource_id=t.computeResourceId or '',
- override_by_airavata=bool(t.overridebyAiravata),
- login_user_name=t.loginUserName or '',
- preferred_job_submission_protocol=_proto_enum_rev(
- cr.JobSubmissionProtocol, _JOB_SUBMISSION_PROTOCOL_REV,
- t.preferredJobSubmissionProtocol),
- preferred_data_movement_protocol=_proto_enum_rev(
- dm.DataMovementProtocol, _DATA_MOVEMENT_PROTOCOL_REV,
- t.preferredDataMovementProtocol),
- preferred_batch_queue=t.preferredBatchQueue or '',
- scratch_location=t.scratchLocation or '',
- allocation_project_number=t.allocationProjectNumber or '',
-
resource_specific_credential_store_token=t.resourceSpecificCredentialStoreToken
or '',
- usage_reporting_gateway_id=t.usageReportingGatewayId or '',
- quality_of_service=t.qualityOfService or '',
- reservation=t.reservation or '',
- reservation_start_time=t.reservationStartTime or 0,
- reservation_end_time=t.reservationEndTime or 0,
- ssh_account_provisioner=t.sshAccountProvisioner or '',
- ssh_account_provisioner_config=dict(t.sshAccountProvisionerConfig or
{}),
-
ssh_account_provisioner_additional_info=t.sshAccountProvisionerAdditionalInfo
or '',
- )
-
-
-def storage_preference(t):
- """Thrift ``StoragePreference`` -> proto ``StoragePreference``."""
- return
_pb2("appcatalog.gatewayprofile.gateway_profile_pb2").StoragePreference(
- storage_resource_id=t.storageResourceId or '',
- login_user_name=t.loginUserName or '',
- file_system_root_location=t.fileSystemRootLocation or '',
-
resource_specific_credential_store_token=t.resourceSpecificCredentialStoreToken
or '',
- )
-
-
-def gateway_resource_profile(t):
- """Thrift ``GatewayResourceProfile`` -> proto message."""
- return
_pb2("appcatalog.gatewayprofile.gateway_profile_pb2").GatewayResourceProfile(
- gateway_id=t.gatewayID or '',
- credential_store_token=t.credentialStoreToken or '',
- compute_resource_preferences=[
- _compute_resource_preference(p)
- for p in (t.computeResourcePreferences or [])],
- storage_preferences=[
- storage_preference(p) for p in (t.storagePreferences or [])],
- identity_server_tenant=t.identityServerTenant or '',
- identity_server_pwd_cred_token=t.identityServerPwdCredToken or '',
- )
-
-
# --- Experiment tree (write direction) -------------------------------------
# Reverse of grpc_adapters.experiment. The write path carries only what the
# user submitted; status/errors/processes/workflow are server-managed.
diff --git a/airavata-django-portal/django_airavata/apps/api/serializers.py
b/airavata-django-portal/django_airavata/apps/api/serializers.py
index 9d1a48e40..68d3eefd5 100644
--- a/airavata-django-portal/django_airavata/apps/api/serializers.py
+++ b/airavata-django-portal/django_airavata/apps/api/serializers.py
@@ -19,10 +19,6 @@ from airavata.model.appcatalog.computeresource.ttypes import
(
BatchQueue,
ComputeResourceDescription
)
-from airavata.model.appcatalog.gatewayprofile.ttypes import (
- GatewayResourceProfile,
- StoragePreference
-)
from airavata.model.appcatalog.groupresourceprofile.ttypes import (
ComputeResourceReservation,
GroupComputeResourcePreference,
@@ -250,17 +246,27 @@ class ProtoEnumIntField(serializers.Field):
return self._thrift_to_proto.get(int(data), 0)
-def proto_enum_int_field(enum_descriptor, thrift_enum, proto_prefix='',
**kwargs):
+def proto_enum_int_field(enum_descriptor, thrift_enum, proto_prefix='',
+ name_map=None, **kwargs):
"""Build a :class:`ProtoEnumIntField` bridging a proto enum to the Thrift
enum
integer by member NAME (stripping ``proto_prefix`` from proto-namespaced
members). Members absent from the Thrift enum map to ``None``.
+
+ ``name_map`` overrides the proto-member-name -> Thrift-member-name mapping
for
+ enums whose member names diverge beyond a simple prefix (proto3
namespacing of
+ colliding members, e.g. proto ``DATA_MOVEMENT_PROTOCOL_LOCAL`` -> Thrift
+ ``LOCAL``, proto ``JSP_CLOUD`` -> Thrift ``CLOUD``).
"""
+ name_map = name_map or {}
proto_to_thrift = {}
thrift_to_proto = {}
for v in enum_descriptor.values:
- name = v.name
- if proto_prefix and name.startswith(proto_prefix):
- name = name[len(proto_prefix):]
+ if v.name in name_map:
+ name = name_map[v.name]
+ else:
+ name = v.name
+ if proto_prefix and name.startswith(proto_prefix):
+ name = name[len(proto_prefix):]
thrift_member = getattr(thrift_enum, name, None)
if thrift_member is not None:
proto_to_thrift[v.number] = int(thrift_member)
@@ -272,6 +278,44 @@ def proto_enum_int_field(enum_descriptor, thrift_enum,
proto_prefix='', **kwargs
**kwargs)
+# proto enum member name -> Thrift member name for the protocol enums whose
names
+# diverge beyond a simple prefix (proto3 namespaces colliding members). Used by
+# the compute/storage resource and resource-preference serializers.
+_JOB_SUBMISSION_PROTOCOL_NAME_MAP = {'JSP_CLOUD': 'CLOUD'}
+_DATA_MOVEMENT_PROTOCOL_NAME_MAP = {'DATA_MOVEMENT_PROTOCOL_LOCAL': 'LOCAL'}
+
+
+def job_submission_protocol_field(**kwargs):
+ """A :class:`ProtoEnumIntField` rendering proto ``JobSubmissionProtocol``
as
+ the Thrift integer (proto ``JSP_CLOUD`` -> Thrift ``CLOUD``)."""
+ from airavata.model.appcatalog.computeresource.ttypes import (
+ JobSubmissionProtocol as _ThriftJobSubmissionProtocol,
+ )
+ from
airavata_sdk.generated.org.apache.airavata.model.appcatalog.computeresource
import ( # noqa: E501
+ compute_resource_pb2,
+ )
+ return proto_enum_int_field(
+ compute_resource_pb2.JobSubmissionProtocol.DESCRIPTOR,
+ _ThriftJobSubmissionProtocol, proto_prefix='JOB_SUBMISSION_PROTOCOL_',
+ name_map=_JOB_SUBMISSION_PROTOCOL_NAME_MAP, **kwargs)
+
+
+def data_movement_protocol_field(**kwargs):
+ """A :class:`ProtoEnumIntField` rendering proto ``DataMovementProtocol`` as
+ the Thrift integer (proto ``DATA_MOVEMENT_PROTOCOL_LOCAL`` -> Thrift
``LOCAL``;
+ proto-only ``GRID_FTP`` -> None)."""
+ from airavata.model.data.movement.ttypes import (
+ DataMovementProtocol as _ThriftDataMovementProtocol,
+ )
+ from airavata_sdk.generated.org.apache.airavata.model.data.movement import
(
+ data_movement_pb2,
+ )
+ return proto_enum_int_field(
+ data_movement_pb2.DataMovementProtocol.DESCRIPTOR,
+ _ThriftDataMovementProtocol, proto_prefix='DATA_MOVEMENT_PROTOCOL_',
+ name_map=_DATA_MOVEMENT_PROTOCOL_NAME_MAP, **kwargs)
+
+
class StoredJSONField(serializers.JSONField):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -2046,30 +2090,189 @@ class
CredentialSummarySerializer(serializers.Serializer):
self.context['request'], credential_summary.token)
-class StoragePreferenceSerializer(
- thrift_utils.create_serializer_class(StoragePreference)):
+def _gateway_profile_pb2():
+ from
airavata_sdk.generated.org.apache.airavata.model.appcatalog.gatewayprofile
import ( # noqa: E501
+ gateway_profile_pb2,
+ )
+ return gateway_profile_pb2
+
+
+class StoragePreferenceSerializer(serializers.Serializer):
+ """Proto-native serializer for the gRPC ``StoragePreference`` message."""
+
+ storageResourceId = serializers.CharField(
+ source='storage_resource_id', allow_blank=True, allow_null=True,
+ required=False)
+ loginUserName = serializers.CharField(
+ source='login_user_name', allow_blank=True, allow_null=True,
+ required=False)
+ fileSystemRootLocation = serializers.CharField(
+ source='file_system_root_location', allow_blank=True, allow_null=True,
+ required=False)
+ resourceSpecificCredentialStoreToken = serializers.CharField(
+ source='resource_specific_credential_store_token', allow_blank=True,
+ allow_null=True, required=False)
url = FullyEncodedHyperlinkedIdentityField(
view_name='django_airavata_api:storage-preference-detail',
- lookup_field='storageResourceId',
+ lookup_field='storage_resource_id',
lookup_url_kwarg='storage_resource_id')
def to_representation(self, instance):
ret = super().to_representation(instance)
- # Convert empty string to null
+ # Convert empty string to null (preserves the old serializer's
behavior)
if ret['resourceSpecificCredentialStoreToken'] == '':
ret['resourceSpecificCredentialStoreToken'] = None
return ret
+ def create(self, validated_data):
+ gp = _gateway_profile_pb2()
+ return gp.StoragePreference(
+ storage_resource_id=validated_data.get(
+ 'storage_resource_id', '') or '',
+ login_user_name=validated_data.get('login_user_name', '') or '',
+ file_system_root_location=validated_data.get(
+ 'file_system_root_location', '') or '',
+ resource_specific_credential_store_token=validated_data.get(
+ 'resource_specific_credential_store_token', '') or '',
+ )
+
+ def update(self, instance, validated_data):
+ return self.create(validated_data)
+
+
+class ComputeResourcePreferenceSerializer(serializers.Serializer):
+ """Proto-native serializer for the gRPC ``ComputeResourcePreference``
message."""
+
+ computeResourceId = serializers.CharField(
+ source='compute_resource_id', allow_blank=True, allow_null=True,
+ required=False)
+ overridebyAiravata = serializers.BooleanField(
+ source='override_by_airavata', required=False, default=False)
+ loginUserName = serializers.CharField(
+ source='login_user_name', allow_blank=True, allow_null=True,
+ required=False)
+ preferredJobSubmissionProtocol = job_submission_protocol_field(
+ source='preferred_job_submission_protocol', required=False,
+ allow_null=True)
+ preferredDataMovementProtocol = data_movement_protocol_field(
+ source='preferred_data_movement_protocol', required=False,
+ allow_null=True)
+ preferredBatchQueue = serializers.CharField(
+ source='preferred_batch_queue', allow_blank=True, allow_null=True,
+ required=False)
+ scratchLocation = serializers.CharField(
+ source='scratch_location', allow_blank=True, allow_null=True,
+ required=False)
+ allocationProjectNumber = serializers.CharField(
+ source='allocation_project_number', allow_blank=True, allow_null=True,
+ required=False)
+ resourceSpecificCredentialStoreToken = serializers.CharField(
+ source='resource_specific_credential_store_token', allow_blank=True,
+ allow_null=True, required=False)
+ usageReportingGatewayId = serializers.CharField(
+ source='usage_reporting_gateway_id', allow_blank=True, allow_null=True,
+ required=False)
+ qualityOfService = serializers.CharField(
+ source='quality_of_service', allow_blank=True, allow_null=True,
+ required=False)
+ reservation = serializers.CharField(
+ allow_blank=True, allow_null=True, required=False)
+ reservationStartTime = ProtoIntOrNoneField(source='reservation_start_time')
+ reservationEndTime = ProtoIntOrNoneField(source='reservation_end_time')
+ sshAccountProvisioner = serializers.CharField(
+ source='ssh_account_provisioner', allow_blank=True, allow_null=True,
+ required=False)
+ sshAccountProvisionerConfig = serializers.DictField(
+ source='ssh_account_provisioner_config', required=False)
+ sshAccountProvisionerAdditionalInfo = serializers.CharField(
+ source='ssh_account_provisioner_additional_info', allow_blank=True,
+ allow_null=True, required=False)
+
+ def create(self, validated_data):
+ gp = _gateway_profile_pb2()
+ return gp.ComputeResourcePreference(
+ compute_resource_id=validated_data.get(
+ 'compute_resource_id', '') or '',
+ override_by_airavata=bool(
+ validated_data.get('override_by_airavata', False)),
+ login_user_name=validated_data.get('login_user_name', '') or '',
+ preferred_job_submission_protocol=validated_data.get(
+ 'preferred_job_submission_protocol', 0) or 0,
+ preferred_data_movement_protocol=validated_data.get(
+ 'preferred_data_movement_protocol', 0) or 0,
+ preferred_batch_queue=validated_data.get(
+ 'preferred_batch_queue', '') or '',
+ scratch_location=validated_data.get('scratch_location', '') or '',
+ allocation_project_number=validated_data.get(
+ 'allocation_project_number', '') or '',
+ resource_specific_credential_store_token=validated_data.get(
+ 'resource_specific_credential_store_token', '') or '',
+ usage_reporting_gateway_id=validated_data.get(
+ 'usage_reporting_gateway_id', '') or '',
+ quality_of_service=validated_data.get('quality_of_service', '') or
'',
+ reservation=validated_data.get('reservation', '') or '',
+ reservation_start_time=validated_data.get(
+ 'reservation_start_time', 0) or 0,
+ reservation_end_time=validated_data.get(
+ 'reservation_end_time', 0) or 0,
+ ssh_account_provisioner=validated_data.get(
+ 'ssh_account_provisioner', '') or '',
+ ssh_account_provisioner_config=dict(
+ validated_data.get('ssh_account_provisioner_config', {}) or
{}),
+ ssh_account_provisioner_additional_info=validated_data.get(
+ 'ssh_account_provisioner_additional_info', '') or '',
+ )
+
+ def update(self, instance, validated_data):
+ return self.create(validated_data)
+
+
+class GatewayResourceProfileSerializer(serializers.Serializer):
+ """Proto-native serializer for the gRPC ``GatewayResourceProfile``
message."""
-class GatewayResourceProfileSerializer(
- thrift_utils.create_serializer_class(GatewayResourceProfile)):
- storagePreferences = StoragePreferenceSerializer(many=True)
+ gatewayID = serializers.CharField(
+ source='gateway_id', allow_blank=True, allow_null=True, required=False)
+ credentialStoreToken = serializers.CharField(
+ source='credential_store_token', allow_blank=True, allow_null=True,
+ required=False)
+ computeResourcePreferences = ComputeResourcePreferenceSerializer(
+ source='compute_resource_preferences', many=True, required=False)
+ storagePreferences = StoragePreferenceSerializer(
+ source='storage_preferences', many=True, required=False)
+ identityServerTenant = serializers.CharField(
+ source='identity_server_tenant', allow_blank=True, allow_null=True,
+ required=False)
+ identityServerPwdCredToken = serializers.CharField(
+ source='identity_server_pwd_cred_token', allow_blank=True,
+ allow_null=True, required=False)
userHasWriteAccess = serializers.SerializerMethodField()
def get_userHasWriteAccess(self, gatewayResourceProfile):
request = self.context['request']
return request.is_gateway_admin
+ def create(self, validated_data):
+ gp = _gateway_profile_pb2()
+ return gp.GatewayResourceProfile(
+ gateway_id=validated_data.get('gateway_id', '') or '',
+ credential_store_token=validated_data.get(
+ 'credential_store_token', '') or '',
+ compute_resource_preferences=[
+ ComputeResourcePreferenceSerializer().create(p)
+ for p in validated_data.get(
+ 'compute_resource_preferences', []) or []],
+ storage_preferences=[
+ StoragePreferenceSerializer().create(p)
+ for p in validated_data.get('storage_preferences', []) or []],
+ identity_server_tenant=validated_data.get(
+ 'identity_server_tenant', '') or '',
+ identity_server_pwd_cred_token=validated_data.get(
+ 'identity_server_pwd_cred_token', '') or '',
+ )
+
+ def update(self, instance, validated_data):
+ return self.create(validated_data)
+
class StorageResourceSerializer(
thrift_utils.create_serializer_class(StorageResourceDescription)):
diff --git a/airavata-django-portal/django_airavata/apps/api/views.py
b/airavata-django-portal/django_airavata/apps/api/views.py
index d018394b6..f53e88445 100644
--- a/airavata-django-portal/django_airavata/apps/api/views.py
+++ b/airavata-django-portal/django_airavata/apps/api/views.py
@@ -1495,7 +1495,7 @@ class CredentialSummaryViewSet(APIBackedViewSet):
class CurrentGatewayResourceProfile(APIView):
def get(self, request, format=None):
- gateway_resource_profile = grpc_adapters.gateway_resource_profile(
+ gateway_resource_profile = (
request.airavata.compute.get_gateway_resource_profile(
settings.GATEWAY_ID))
serializer = serializers.GatewayResourceProfileSerializer(
@@ -1508,8 +1508,7 @@ class CurrentGatewayResourceProfile(APIView):
if serializer.is_valid():
gateway_resource_profile = serializer.save()
request.airavata.compute.update_gateway_resource_profile(
- settings.GATEWAY_ID,
-
grpc_requests.gateway_resource_profile(gateway_resource_profile))
+ settings.GATEWAY_ID, gateway_resource_profile)
return Response(serializer.data, status=status.HTTP_201_CREATED)
else:
return Response(serializer.errors,
status=status.HTTP_400_BAD_REQUEST)
@@ -1555,34 +1554,31 @@ class StoragePreferenceViewSet(APIBackedViewSet):
lookup_field = 'storage_resource_id'
def get_list(self):
- return [
- grpc_adapters.storage_preference(p)
- for p in
self.request.airavata.compute.get_all_gateway_storage_preferences(
- settings.GATEWAY_ID)
- ]
+ return list(
+ self.request.airavata.compute.get_all_gateway_storage_preferences(
+ settings.GATEWAY_ID))
def get_instance(self, lookup_value):
- return grpc_adapters.storage_preference(
- self.request.airavata.compute.get_gateway_storage_preference(
- settings.GATEWAY_ID, lookup_value))
+ return self.request.airavata.compute.get_gateway_storage_preference(
+ settings.GATEWAY_ID, lookup_value)
def perform_create(self, serializer):
storage_preference = serializer.save()
self.request.airavata.compute.add_gateway_storage_preference(
settings.GATEWAY_ID,
- storage_preference.storageResourceId,
- grpc_requests.storage_preference(storage_preference))
+ storage_preference.storage_resource_id,
+ storage_preference)
def perform_update(self, serializer):
storage_preference = serializer.save()
self.request.airavata.compute.update_gateway_storage_preference(
settings.GATEWAY_ID,
- storage_preference.storageResourceId,
- grpc_requests.storage_preference(storage_preference))
+ storage_preference.storage_resource_id,
+ storage_preference)
def perform_destroy(self, instance):
self.request.airavata.compute.delete_gateway_storage_preference(
- settings.GATEWAY_ID, instance.storageResourceId)
+ settings.GATEWAY_ID, instance.storage_resource_id)
class ParserViewSet(mixins.CreateModelMixin,
