Merge branch 'vayu/meta2' into 'develop'

Vayu/meta2 See merge request core/sevenbridges-python!93
sbg · Sep 9, 2021 · 860409d · 860409d
2 parents da38008 + 5703352
commit 860409d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/sevenbridges/models/task.py b/sevenbridges/models/task.py
@@ -312,10 +312,15 @@ def _serialize_execution_settings(self, execution_settings):
             'use_memoization',
             self.execution_settings.get('use_memoization', None)
         )
+        use_elastic_disc = execution_settings.get(
+            'use_elastic_disc',
+            self.execution_settings.get('use_elastic_disc', None)
+        )
         serialized_es_mapping = {
             'instance_type': instance_type,
             'max_parallel_instances': max_parallel_instances,
-            'use_memoization': use_memoization
+            'use_memoization': use_memoization,
+            'use_elastic_disc': use_elastic_disc
         }
         serialized_es = dict()
         for key, value in serialized_es_mapping.items():

diff --git a/sevenbridges/models/volume.py b/sevenbridges/models/volume.py
@@ -38,7 +38,7 @@ class Volume(Resource):
     name = StringField(read_only=False)
     description = StringField(read_only=False)
     access_mode = StringField(read_only=False)
-    service = CompoundField(VolumeService, read_only=True)
+    service = CompoundField(VolumeService, read_only=False)
     created_on = DateTimeField(read_only=True)
     modified_on = DateTimeField(read_only=True)
     active = BooleanField(read_only=True)

diff --git a/tests/test_tasks.py b/tests/test_tasks.py
@@ -89,7 +89,8 @@ def test_create_task(api, given, verifier, run):
     execution_settings = {
         'instance_type': generator.name(),
         'max_parallel_instances': 1,
-        'use_memoization': True
+        'use_memoization': True,
+        'use_elastic_disc': True
     }
     given.task.can_be_created(
         batch_by=batch_by, batch_input='FastQC', app=app_id, project=project.id