Merge branch '8784-dir-listings'

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

diff --git a/sdk/go/arvados/container.go b/sdk/go/arvados/container.go
index e5050cb79c944673343878d559b75fd3e97807ae..7d39d678f8ec02c52f6446461c4de9f8e95c142a 100644 (file)
--- a/sdk/go/arvados/container.go
+++ b/sdk/go/arvados/container.go
@@ -1,39 +1,52 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+
 package arvados
 
 // Container is an arvados#container resource.
 type Container struct {
-       UUID               string             `json:"uuid"`
-       Command            []string           `json:"command"`
-       ContainerImage     string             `json:"container_image"`
-       Cwd                string             `json:"cwd"`
-       Environment        map[string]string  `json:"environment"`
-       LockedByUUID       string             `json:"locked_by_uuid"`
-       Mounts             map[string]Mount   `json:"mounts"`
-       Output             string             `json:"output"`
-       OutputPath         string             `json:"output_path"`
-       Priority           int                `json:"priority"`
-       RuntimeConstraints RuntimeConstraints `json:"runtime_constraints"`
-       State              ContainerState     `json:"state"`
+       UUID                 string               `json:"uuid"`
+       Command              []string             `json:"command"`
+       ContainerImage       string               `json:"container_image"`
+       Cwd                  string               `json:"cwd"`
+       Environment          map[string]string    `json:"environment"`
+       LockedByUUID         string               `json:"locked_by_uuid"`
+       Mounts               map[string]Mount     `json:"mounts"`
+       Output               string               `json:"output"`
+       OutputPath           string               `json:"output_path"`
+       Priority             int                  `json:"priority"`
+       RuntimeConstraints   RuntimeConstraints   `json:"runtime_constraints"`
+       State                ContainerState       `json:"state"`
+       SchedulingParameters SchedulingParameters `json:"scheduling_parameters"`
 }
 
 // Mount is special behavior to attach to a filesystem path or device.
 type Mount struct {
-       Kind             string      `json:"kind"`
-       Writable         bool        `json:"writable"`
-       PortableDataHash string      `json:"portable_data_hash"`
-       UUID             string      `json:"uuid"`
-       DeviceType       string      `json:"device_type"`
-       Path             string      `json:"path"`
-       Content          interface{} `json:"content"`
+       Kind              string      `json:"kind"`
+       Writable          bool        `json:"writable"`
+       PortableDataHash  string      `json:"portable_data_hash"`
+       UUID              string      `json:"uuid"`
+       DeviceType        string      `json:"device_type"`
+       Path              string      `json:"path"`
+       Content           interface{} `json:"content"`
+       ExcludeFromOutput bool        `json:"exclude_from_output"`
+       Capacity          int64       `json:capacity`
 }
 
 // RuntimeConstraints specify a container's compute resources (RAM,
 // CPU) and network connectivity.
 type RuntimeConstraints struct {
-       API       *bool
-       RAM       int      `json:"ram"`
-       VCPUs     int      `json:"vcpus"`
-       Partition []string `json:"partition"`
+       API          *bool
+       RAM          int `json:"ram"`
+       VCPUs        int `json:"vcpus"`
+       KeepCacheRAM int `json:"keep_cache_ram"`
+}
+
+// SchedulingParameters specify a container's scheduling parameters
+// such as Partitions
+type SchedulingParameters struct {
+       Partitions []string `json:"partitions"`
 }
 
 // ContainerList is an arvados#containerList resource.