Add option HostPath to DeviceNode

Signed-off-by: Evan Lezar <[email protected]>

Author: elezar

README.md

@@ -32,7 +32,7 @@ $ cat > /etc/cdi/vendor.json <<EOF
       "name": "myDevice",
       "containerEdits": {
         "deviceNodes": [
-          {"path": "/dev/card1", "type": "c", "major": 25, "minor": 25, "fileMode": 384, "permissions": "rw", "uid": 1000, "gid": 1000},
+          {"hostPath": "/vendor/dev/card1": "path": "/dev/card1", "type": "c", "major": 25, "minor": 25, "fileMode": 384, "permissions": "rw", "uid": 1000, "gid": 1000},
           {"path": "/dev/card-render1", "type": "c", "major": 25, "minor": 25, "fileMode": 384, "permissions": "rwm", "uid": 1000, "gid": 1000}
         ]
       }

SPEC.md

@@ -103,6 +103,7 @@ The key words "must", "must not", "required", "shall", "shall not", "should", "s
             "deviceNodes": [ (optional)
                 {
                     "path": "<path>",
+                    "hostPath": "<hostPath>" (optional),
                     "type": "<type>" (optional),
                     "major": <int32> (optional),
                     "minor": <int32> (optional),
@@ -181,6 +182,7 @@ The `containerEdits` field has the following definition:
   * `env` (array of strings in the format of "VARNAME=VARVALUE", OPTIONAL) describes the environment variables that should be set. These values are appended to the container environment array.
   * `deviceNodes` (array of objects, OPTIONAL) describes the device nodes that should be mounted:
     * `path` (string, REQUIRED) path of the device within the container.
+    * `hostPath` (string, OPTIONAL) path of the device node on the host. If not specified the value for `path` is used.
     * `type` (string, OPTIONAL) Device type: block, char, etc.
     * `major` (int64, OPTIONAL) Device major number.
     * `minor` (int64, OPTIONAL) Device minor number.

schema/defs.json

@@ -29,6 +29,9 @@
                 "path": {
                     "$ref": "#/definitions/FilePath"
                 },
+                "hostPath": {
+                    "$ref": "#/definitions/FilePath"
+                },
                 "permissions": {
                     "type": "string"
                 },

schema/testdata/good/spec-example.json

@@ -6,7 +6,7 @@
       "name": "myDevice",
       "containerEdits": {
         "deviceNodes": [
-          {"path": "/dev/card1"},
+          {"hostPath": "/vendorroot/dev/card1", "path": "/dev/card1"},
           {"path": "/dev/card2"}
         ]
       }

specs-go/config.go

@@ -31,6 +31,7 @@ type ContainerEdits struct {
 // DeviceNode represents a device node that needs to be added to the OCI spec.
 type DeviceNode struct {
 	Path        string       `json:"path"`
+	HostPath    string       `json:"hostPath,omitempty"`
 	Type        string       `json:"type,omitempty"`
 	Major       int64        `json:"major,omitempty"`
 	Minor       int64        `json:"minor,omitempty"`