fix blkio related validation

Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
opencontainers · Aug 29, 2016 · 5d47014 · 5d47014
1 parent 069e8e1
commit 5d47014
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/schema/config-linux.json b/schema/config-linux.json
@@ -96,7 +96,7 @@
                                         "type": "array",
                                         "items": [
                                             {
-                                                "$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"
+                                                "$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"
                                             }
                                         ]
                                     },
@@ -111,7 +111,7 @@
                                     {
                                         "type": "array",
                                         "items": {
-                                            "$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"
+                                            "$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"
                                         }
                                     },
                                     {
@@ -125,7 +125,7 @@
                                     {
                                         "type": "array",
                                         "items": {
-                                            "$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"
+                                            "$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"
                                         }
                                     },
                                     {
@@ -139,7 +139,7 @@
                                     {
                                         "type": "array",
                                         "items": {
-                                            "$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"
+                                            "$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"
                                         }
                                     },
                                     {
@@ -149,10 +149,17 @@
                             },
                             "blkioWeightDevice": {
                                 "id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/blkioWeightDevice",
-                                "type": "array",
-                                "items": {
-                                    "$ref": "defs-linux.json#/definitions/blockIODeviceWeightPointer"
-                                }
+                                "oneOf": [
+                                    {
+                                        "type": "array",
+                                        "items": {
+                                            "$ref": "defs-linux.json#/definitions/blockIODeviceWeight"
+                                        }
+                                    },
+                                    {
+                                        "type": "null"
+                                    }
+                                ]
                             }
                         }
                     },

diff --git a/schema/defs-linux.json b/schema/defs-linux.json
@@ -84,11 +84,11 @@
         },
         "Major": {
             "description": "major device number",
-            "$ref": "defs.json#/definitions/uint16"
+            "$ref": "defs.json#/definitions/int16"
         },
         "Minor": {
             "description": "minor device number",
-            "$ref": "defs.json#/definitions/uint16"
+            "$ref": "defs.json#/definitions/int16"
         },
         "FileMode": {
             "description": "File permissions mode (typically an octal value)",