mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix blkio related validation

Browse Source 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
This commit is contained in:
Ma Shimiao
2016-08-29 11:58:16 +08:00
parent aad1f38ce8
commit a04cce97ea
2 changed files with 6 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
schema/config-linux.json
+5 -5
View File
@@ -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"
}
}
}
schema/defs-linux.json
+1 -21
View File
@@ -188,16 +188,6 @@
}
]
},
"blockIODeviceWeightPointer": {
"oneOf": [
{
"$ref": "#/definitions/blockIODeviceWeight"
},
{
"type": "null"
}
]
},
"blockIODeviceThrottle": {
"allOf": [
{
@@ -207,22 +197,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": {