fix blkio related validation

Ma Shimiao · Ma Shimiao · commit 055f3fabe51e · 2017-01-12T09:37:02.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
@@ -100,11 +100,11 @@
                         "properties": {
                             "blkioWeight": {
                                 "id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/blkioWeight",
-                                "$ref": "defs-linux.json#/definitions/blkioWeightPointer"
+                                "$ref": "defs-linux.json#/definitions/blkioWeight"
                             },
                             "blkioLeafWeight": {
                                 "id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/blkioLeafWeight",
-                                "$ref": "defs-linux.json#/definitions/blkioWeightPointer"
+                                "$ref": "defs-linux.json#/definitions/blkioWeight"
                             },
                             "blkioThrottleReadBpsDevice": {
                                 "id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/blkioThrottleReadBpsDevice",
@@ -113,7 +113,7 @@
                                         "type": "array",
                                         "items": [
                                             {
-                                                "$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"
+                                                "$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"
                                             }
                                         ]
                                     },
@@ -128,7 +128,7 @@
                                     {
                                         "type": "array",
                                         "items": {
-                                            "$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"
+                                            "$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"
                                         }
                                     },
                                     {
@@ -142,7 +142,7 @@
                                     {
                                         "type": "array",
                                         "items": {
-                                            "$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"
+                                            "$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"
                                         }
                                     },
                                     {
@@ -156,7 +156,7 @@
                                     {
                                         "type": "array",
                                         "items": {
-                                            "$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"
+                                            "$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"
                                         }
                                     },
                                     {
@@ -168,7 +168,7 @@
                                 "id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/blkioWeightDevice",
                                 "type": "array",
                                 "items": {
-                                    "$ref": "defs-linux.json#/definitions/blockIODeviceWeightPointer"
+                                    "$ref": "defs-linux.json#/definitions/blockIODeviceWeight"
                                 }
                             }
                         }
diff --git a/schema/defs-linux.json b/schema/defs-linux.json
@@ -140,19 +140,7 @@
             }
         },
         "blkioWeight": {
-            "type": "integer",
-            "minimum": 10,
-            "maximum": 1000
-        },
-        "blkioWeightPointer": {
-            "oneOf": [
-                {
-                    "$ref": "#/definitions/blkioWeight"
-                },
-                {
-                    "type": "null"
-                }
-            ]
+            "$ref": "defs.json#/definitions/uint16Pointer"
         },
         "blockIODevice": {
             "type": "object",
@@ -179,10 +167,10 @@
                     "type": "object",
                     "properties": {
                         "weight": {
-                            "$ref": "#/definitions/blkioWeightPointer"
+                            "$ref": "#/definitions/blkioWeight"
                         },
                         "leafWeight": {
-                            "$ref": "#/definitions/blkioWeightPointer"
+                            "$ref": "#/definitions/blkioWeight"
                         }
                     }
                 }
@@ -207,22 +195,12 @@
                     "type": "object",
                     "properties": {
                         "rate": {
-                            "$ref": "defs.json#/definitions/uint64Pointer"
+                            "$ref": "defs.json#/definitions/uint64"
                         }
                     }
                 }
             ]
         },
-        "blockIODeviceThrottlePointer": {
-            "oneOf": [
-                {
-                    "$ref": "#/definitions/blockIODeviceThrottle"
-                },
-                {
-                    "type": "null"
-                }
-            ]
-        },
         "DeviceCgroup": {
             "type": "object",
             "properties": {

Original file line number	Diff line number	Diff line change
`@@ -100,11 +100,11 @@`
`100`	`100`	`"properties": {`
`101`	`101`	`"blkioWeight": {`
`102`	`102`	`"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/blkioWeight",`
`103`		`- "$ref": "defs-linux.json#/definitions/blkioWeightPointer"`
	`103`	`+ "$ref": "defs-linux.json#/definitions/blkioWeight"`
`104`	`104`	`},`
`105`	`105`	`"blkioLeafWeight": {`
`106`	`106`	`"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/blkioLeafWeight",`
`107`		`- "$ref": "defs-linux.json#/definitions/blkioWeightPointer"`
	`107`	`+ "$ref": "defs-linux.json#/definitions/blkioWeight"`
`108`	`108`	`},`
`109`	`109`	`"blkioThrottleReadBpsDevice": {`
`110`	`110`	`"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/blkioThrottleReadBpsDevice",`
`@@ -113,7 +113,7 @@`
`113`	`113`	`"type": "array",`
`114`	`114`	`"items": [`
`115`	`115`	`{`
`116`		`- "$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"`
	`116`	`+ "$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"`
`117`	`117`	`}`
`118`	`118`	`]`
`119`	`119`	`},`
`@@ -128,7 +128,7 @@`
`128`	`128`	`{`
`129`	`129`	`"type": "array",`
`130`	`130`	`"items": {`
`131`		`- "$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"`
	`131`	`+ "$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"`
`132`	`132`	`}`
`133`	`133`	`},`
`134`	`134`	`{`
`@@ -142,7 +142,7 @@`
`142`	`142`	`{`
`143`	`143`	`"type": "array",`
`144`	`144`	`"items": {`
`145`		`- "$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"`
	`145`	`+ "$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"`
`146`	`146`	`}`
`147`	`147`	`},`
`148`	`148`	`{`
`@@ -156,7 +156,7 @@`
`156`	`156`	`{`
`157`	`157`	`"type": "array",`
`158`	`158`	`"items": {`
`159`		`- "$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"`
	`159`	`+ "$ref": "defs-linux.json#/definitions/blockIODeviceThrottle"`
`160`	`160`	`}`
`161`	`161`	`},`
`162`	`162`	`{`
`@@ -168,7 +168,7 @@`
`168`	`168`	`"id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO/blkioWeightDevice",`
`169`	`169`	`"type": "array",`
`170`	`170`	`"items": {`
`171`		`- "$ref": "defs-linux.json#/definitions/blockIODeviceWeightPointer"`
	`171`	`+ "$ref": "defs-linux.json#/definitions/blockIODeviceWeight"`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`	`}`