Merge branch '21535-multi-wf-delete'

[arvados.git] / sdk / go / arvados / container.go

diff --git a/sdk/go/arvados/container.go b/sdk/go/arvados/container.go
index 384bebb5997ee86b1b1be2396498f1554ee32ecc..70038a18f79a82dca29b3dc937f2edfcc2fbb12a 100644 (file)
--- a/sdk/go/arvados/container.go
+++ b/sdk/go/arvados/container.go
@@ -19,9 +19,11 @@ type Container struct {
        Cwd                       string                 `json:"cwd"`
        Environment               map[string]string      `json:"environment"`
        LockedByUUID              string                 `json:"locked_by_uuid"`
+       LockCount                 int                    `json:"lock_count"`
        Mounts                    map[string]Mount       `json:"mounts"`
        Output                    string                 `json:"output"`
        OutputPath                string                 `json:"output_path"`
+       OutputGlob                []string               `json:"output_glob"`
        Priority                  int64                  `json:"priority"`
        RuntimeConstraints        RuntimeConstraints     `json:"runtime_constraints"`
        State                     ContainerState         `json:"state"`
@@ -36,6 +38,10 @@ type Container struct {
        RuntimeUserUUID           string                 `json:"runtime_user_uuid"`
        RuntimeAuthScopes         []string               `json:"runtime_auth_scopes"`
        RuntimeToken              string                 `json:"runtime_token"`
+       AuthUUID                  string                 `json:"auth_uuid"`
+       Log                       string                 `json:"log"`
+       Cost                      float64                `json:"cost"`
+       SubrequestsCost           float64                `json:"subrequests_cost"`
 }
 
 // ContainerRequest is an arvados#container_request resource.
@@ -63,6 +69,7 @@ type ContainerRequest struct {
        Cwd                     string                 `json:"cwd"`
        Command                 []string               `json:"command"`
        OutputPath              string                 `json:"output_path"`
+       OutputGlob              []string               `json:"output_glob"`
        OutputName              string                 `json:"output_name"`
        OutputTTL               int                    `json:"output_ttl"`
        Priority                int                    `json:"priority"`
@@ -74,6 +81,8 @@ type ContainerRequest struct {
        Filters                 []Filter               `json:"filters"`
        ContainerCount          int                    `json:"container_count"`
        OutputStorageClasses    []string               `json:"output_storage_classes"`
+       OutputProperties        map[string]interface{} `json:"output_properties"`
+       CumulativeCost          float64                `json:"cumulative_cost"`
 }
 
 // Mount is special behavior to attach to a filesystem path or device.
@@ -87,18 +96,23 @@ type Mount struct {
        Content           interface{} `json:"content"`
        ExcludeFromOutput bool        `json:"exclude_from_output"`
        Capacity          int64       `json:"capacity"`
-       Commit            string      `json:"commit"`          // only if kind=="git_tree"
-       RepositoryName    string      `json:"repository_name"` // only if kind=="git_tree"
-       GitURL            string      `json:"git_url"`         // only if kind=="git_tree"
+}
+
+type CUDARuntimeConstraints struct {
+       DriverVersion      string `json:"driver_version"`
+       HardwareCapability string `json:"hardware_capability"`
+       DeviceCount        int    `json:"device_count"`
 }
 
 // RuntimeConstraints specify a container's compute resources (RAM,
 // CPU) and network connectivity.
 type RuntimeConstraints struct {
-       API          bool  `json:"API"`
-       RAM          int64 `json:"ram"`
-       VCPUs        int   `json:"vcpus"`
-       KeepCacheRAM int64 `json:"keep_cache_ram"`
+       API           bool                   `json:"API"`
+       RAM           int64                  `json:"ram"`
+       VCPUs         int                    `json:"vcpus"`
+       KeepCacheRAM  int64                  `json:"keep_cache_ram"`
+       KeepCacheDisk int64                  `json:"keep_cache_disk"`
+       CUDA          CUDARuntimeConstraints `json:"cuda"`
 }
 
 // SchedulingParameters specify a container's scheduling parameters
@@ -107,6 +121,7 @@ type SchedulingParameters struct {
        Partitions  []string `json:"partitions"`
        Preemptible bool     `json:"preemptible"`
        MaxRunTime  int      `json:"max_run_time"`
+       Supervisor  bool     `json:"supervisor"`
 }
 
 // ContainerList is an arvados#containerList resource.
@@ -144,3 +159,9 @@ const (
        ContainerRequestStateCommitted  = ContainerRequestState("Committed")
        ContainerRequestStateFinal      = ContainerRequestState("Final")
 )
+
+type ContainerStatus struct {
+       UUID             string         `json:"uuid"`
+       State            ContainerState `json:"container_state"`
+       SchedulingStatus string         `json:"scheduling_status"`
+}