fix blkio related validation

Ma Shimiao · Ma Shimiao · commit 5d47014bd87d · 2016-08-29T11:58:16.000+08:00
Signed-off-by: Ma Shimiao &lt;mashimiao.fnst@cn.fujitsu.com&gt;
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)",

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@`
`96`	`96`	`"type": "array",`
`97`	`97`	`"items": [`
`98`	`98`	`{`
`99`		`- "$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"`
	`99`	`+ "$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"`
`100`	`100`	`}`
`101`	`101`	`]`
`102`	`102`	`},`
`@@ -111,7 +111,7 @@`
`111`	`111`	`{`
`112`	`112`	`"type": "array",`
`113`	`113`	`"items": {`
`114`		`- "$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"`
	`114`	`+ "$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"`
`115`	`115`	`}`
`116`	`116`	`},`
`117`	`117`	`{`
`@@ -125,7 +125,7 @@`
`125`	`125`	`{`
`126`	`126`	`"type": "array",`
`127`	`127`	`"items": {`
`128`		`- "$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"`
	`128`	`+ "$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"`
`129`	`129`	`}`
`130`	`130`	`},`
`131`	`131`	`{`
`@@ -139,7 +139,7 @@`
`139`	`139`	`{`
`140`	`140`	`"type": "array",`
`141`	`141`	`"items": {`
`142`		`- "$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"`
	`142`	`+ "$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"`
`143`	`143`	`}`
`144`	`144`	`},`
`145`	`145`	`{`
`@@ -149,10 +149,17 @@`
`149`	`149`	`},`
`150`	`150`	`"blkioWeightDevice": {`
`151`	`151`	`"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/blkioWeightDevice",`
`152`		`- "type": "array",`
`153`		`- "items": {`
`154`		`- "$ref": "defs-linux.json#/definitions/blockIODeviceWeightPointer"`
`155`		`- }`
	`152`	`+ "oneOf": [`
	`153`	`+ {`
	`154`	`+ "type": "array",`
	`155`	`+ "items": {`
	`156`	`+ "$ref": "defs-linux.json#/definitions/blockIODeviceWeight"`
	`157`	`+ }`
	`158`	`+ },`
	`159`	`+ {`
	`160`	`+ "type": "null"`
	`161`	`+ }`
	`162`	`+ ]`
`156`	`163`	`}`
`157`	`164`	`}`
`158`	`165`	`},`