projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '14436-bugfix-expanding-collection-files-tree'
[arvados-workbench2.git]
/
src
/
models
/
container-request.ts
diff --git
a/src/models/container-request.ts
b/src/models/container-request.ts
index 162e0f57e454879d693dc5882545643503625369..f7342d23d77d32460d9bcb7140250107e90a420f 100644
(file)
--- a/
src/models/container-request.ts
+++ b/
src/models/container-request.ts
@@
-3,25
+3,28
@@
// SPDX-License-Identifier: AGPL-3.0
import { Resource, ResourceKind } from "./resource";
// SPDX-License-Identifier: AGPL-3.0
import { Resource, ResourceKind } from "./resource";
+import { MountType } from "~/models/mount-types";
+import { RuntimeConstraints } from './runtime-constraints';
+import { SchedulingParameters } from './scheduling-parameters';
export enum ContainerRequestState {
export enum ContainerRequestState {
- U
ncommitted
= "Uncommitted",
- C
ommitted
= "Committed",
- F
inal
= "Final"
+ U
NCOMMITTED
= "Uncommitted",
+ C
OMMITTED
= "Committed",
+ F
INAL
= "Final"
}
export interface ContainerRequestResource extends Resource {
}
export interface ContainerRequestResource extends Resource {
- kind: ResourceKind.C
ontainerRequest
;
+ kind: ResourceKind.C
ONTAINER_REQUEST
;
name: string;
description: string;
properties: any;
state: ContainerRequestState;
name: string;
description: string;
properties: any;
state: ContainerRequestState;
- requestingContainerUuid: string;
- containerUuid: string;
+ requestingContainerUuid: string
| null
;
+ containerUuid: string
| null
;
containerCountMax: number;
containerCountMax: number;
- mounts:
any
;
- runtimeConstraints:
any
;
- schedulingParameters:
any
;
+ mounts:
{[path: string]: MountType}
;
+ runtimeConstraints:
RuntimeConstraints
;
+ schedulingParameters:
SchedulingParameters
;
containerImage: string;
environment: any;
cwd: string;
containerImage: string;
environment: any;
cwd: string;
@@
-29,11
+32,11
@@
export interface ContainerRequestResource extends Resource {
outputPath: string;
outputName: string;
outputTtl: number;
outputPath: string;
outputName: string;
outputTtl: number;
- priority: number;
+ priority: number
| null
;
expiresAt: string;
useExisting: boolean;
expiresAt: string;
useExisting: boolean;
- logUuid: string;
- outputUuid: string;
+ logUuid: string
| null
;
+ outputUuid: string
| null
;
filters: string;
filters: string;
-
-}
\ No newline at end of file
+ containerCount: number;
+}