15407: Fixes handling of runtime constraints and scheduling params.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

diff --git a/src/models/runtime-constraints.ts b/src/models/runtime-constraints.ts
index a780fd3575c71e93efc1c267681a3b896a8d42a4..89101c6ea3dd52e35e00ff0ab8f8f576a8d4140e 100644 (file)
--- a/src/models/runtime-constraints.ts
+++ b/src/models/runtime-constraints.ts
@@ -5,6 +5,6 @@
 export interface RuntimeConstraints {
     ram: number;
     vcpus: number;
-    keepCacheRam?: number;
+    keep_cache_ram?: number;
     API: boolean;
 }

diff --git a/src/models/scheduling-parameters.ts b/src/models/scheduling-parameters.ts
index 50ce4156a13fe689cacd02efb95762a6c5f4afdb..f2167c970b424d785905bec65bac9fd74317549a 100644 (file)
--- a/src/models/scheduling-parameters.ts
+++ b/src/models/scheduling-parameters.ts
@@ -5,5 +5,5 @@
 export interface SchedulingParameters {
     partitions?: string[];
     preemptible?: boolean;
-    maxRunTime?: number;
+    max_run_time?: number;
 }

diff --git a/src/store/processes/processes-actions.ts b/src/store/processes/processes-actions.ts
index 6f1d23b0b2e9258538e9d4680f81805c26589adf..c6bc1418dcbf6bd8df9b13b598d1109b2d65a87a 100644 (file)
--- a/src/store/processes/processes-actions.ts
+++ b/src/store/processes/processes-actions.ts
@@ -95,10 +95,10 @@ export const reRunProcess = (processUuid: string, workflowUuid: string) =>
 
             const advancedInitialData: RunProcessAdvancedFormData = {
                 output: process.outputName,
-                runtime: process.schedulingParameters.maxRunTime,
+                runtime: process.schedulingParameters.max_run_time,
                 ram: process.runtimeConstraints.ram,
                 vcpus: process.runtimeConstraints.vcpus,
-                keepCacheRam: process.runtimeConstraints.keepCacheRam,
+                keep_cache_ram: process.runtimeConstraints.keep_cache_ram,
                 api: process.runtimeConstraints.API
             };
             dispatch<any>(initialize(RUN_PROCESS_ADVANCED_FORM, advancedInitialData));

diff --git a/src/store/run-process-panel/run-process-panel-actions.ts b/src/store/run-process-panel/run-process-panel-actions.ts
index 5b082b8c28eaffc19199f8f757fd5fa4f0b4a5eb..b543b160704bae5b8aa4ab60b23c62692e322b48 100644 (file)
--- a/src/store/run-process-panel/run-process-panel-actions.ts
+++ b/src/store/run-process-panel/run-process-panel-actions.ts
@@ -135,7 +135,7 @@ export const runProcess = async (dispatch: Dispatch<any>, getState: () => RootSt
                 api: advancedForm[API_FIELD],
             },
             schedulingParameters: {
-                maxRunTime: advancedForm[RUNTIME_FIELD]
+                max_run_time: advancedForm[RUNTIME_FIELD]
             },
             containerImage: 'arvados/jobs',
             cwd: '/var/spool/cwl',

diff --git a/src/views/run-process-panel/run-process-advanced-form.tsx b/src/views/run-process-panel/run-process-advanced-form.tsx
index 30ff494c1ebbae138811432817fc298244ab5a73..d63ff30ffb08cfa83787b35989e65fbac42f967c 100644 (file)
--- a/src/views/run-process-panel/run-process-advanced-form.tsx
+++ b/src/views/run-process-panel/run-process-advanced-form.tsx
@@ -20,7 +20,7 @@ export const OUTPUT_FIELD = 'output';
 export const RUNTIME_FIELD = 'runtime';
 export const RAM_FIELD = 'ram';
 export const VCPUS_FIELD = 'vcpus';
-export const KEEP_CACHE_RAM_FIELD = 'keepCacheRam';
+export const KEEP_CACHE_RAM_FIELD = 'keep_cache_ram';
 export const API_FIELD = 'api';
 
 export interface RunProcessAdvancedFormData {
@@ -93,7 +93,7 @@ export const RunProcessAdvancedForm =
                                 parse={IntInput.parse}
                                 format={IntInput.format}
                                 type='number'
-                                validate={keepCacheRamValdation} />
+                                validate={keepCacheRamValidation} />
                         </Grid>
                         <Grid item xs={12} md={6}>
                             <Field
@@ -112,5 +112,5 @@ export const RunProcessAdvancedForm =
 
 const ramValidation = [min(0)];
 const vcpusValidation = [min(1)];
-const keepCacheRamValdation = [optional(min(0))];
+const keepCacheRamValidation = [optional(min(0))];
 const runtimeValidation = [optional(min(1))];