X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8b1aca5c3415bfee3b4bc242596e1ee68ddef354..f94ac6e8ad9aec3c781cd71b72fcc5e2c1cedd8d:/sdk/go/arvados/container.go diff --git a/sdk/go/arvados/container.go b/sdk/go/arvados/container.go index b8530db342..7b31726aa0 100644 --- a/sdk/go/arvados/container.go +++ b/sdk/go/arvados/container.go @@ -32,6 +32,14 @@ type Container struct { FinishedAt *time.Time `json:"finished_at"` // nil if not yet finished GatewayAddress string `json:"gateway_address"` InteractiveSessionStarted bool `json:"interactive_session_started"` + OutputStorageClasses []string `json:"output_storage_classes"` + 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. @@ -43,7 +51,6 @@ type ContainerRequest struct { ModifiedByUserUUID string `json:"modified_by_user_uuid"` ModifiedAt time.Time `json:"modified_at"` Href string `json:"href"` - Kind string `json:"kind"` Etag string `json:"etag"` Name string `json:"name"` Description string `json:"description"` @@ -70,6 +77,9 @@ type ContainerRequest struct { ExpiresAt time.Time `json:"expires_at"` 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. @@ -88,13 +98,21 @@ type Mount struct { 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 @@ -103,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.