blk: add blkiops define

Signed-off-by: Nlifeng68 <lifeng68@huawei.com>

src/json/schema/defs.json

@@ -42,8 +42,7 @@
             "maximum": 18446744073709552000
         },
         "int32Pointer": {
-            "oneOf": [
-                {
+            "oneOf": [{
                     "$ref": "#/definitions/int32"
                 },
                 {
@@ -52,8 +51,7 @@
             ]
         },
         "uint16Pointer": {
-            "oneOf": [
-                {
+            "oneOf": [{
                     "$ref": "#/definitions/uint16"
                 },
                 {
@@ -62,8 +60,7 @@
             ]
         },
         "uint64Pointer": {
-            "oneOf": [
-                {
+            "oneOf": [{
                     "$ref": "#/definitions/uint64"
                 },
                 {
@@ -72,8 +69,7 @@
             ]
         },
         "stringPointer": {
-            "oneOf": [
-                {
+            "oneOf": [{
                     "type": "string"
                 },
                 {
@@ -104,6 +100,40 @@
         "Env": {
             "$ref": "#/definitions/ArrayOfStrings"
         },
+        "BlkioDevice": {
+            "type": "object",
+            "properties": {
+                "Path": {
+                    "$ref": "#/definitions/FilePath"
+                },
+                "Rate": {
+                    "$ref": "#/definitions/uint64"
+                }
+            }
+        },
+        "ArrayOfBlkioDevice": {
+            "type": "array",
+            "items": {
+                "$ref": "#/definitions/BlkioDevice"
+            }
+        },
+        "BlkioWeightDevice": {
+            "type": "object",
+            "properties": {
+                "Path": {
+                    "$ref": "#/definitions/FilePath"
+                },
+                "Weight": {
+                    "$ref": "#/definitions/uint16"
+                }
+            }
+        },
+        "ArrayOfBlkioWeightDevice": {
+            "type": "array",
+            "items": {
+                "$ref": "#/definitions/BlkioWeightDevice"
+            }
+        },
         "Hook": {
             "type": "object",
             "properties": {
@@ -250,9 +280,9 @@
                             "type": "string"
                         },
                         "runtime-args": {
-                            "type":"array",
+                            "type": "array",
                             "items": {
-                                "type":"string"
+                                "type": "string"
                             }
                         }
                     }
@@ -366,7 +396,7 @@
             "type": "object",
             "properties": {
                 "name": {
-                    "type":"string"
+                    "type": "string"
                 },
                 "offset": {
                     "$ref": "#/definitions/uint8"
@@ -607,8 +637,7 @@
         },
         "blockIODeviceWeight": {
             "type": "object",
-            "allOf": [
-                {
+            "allOf": [{
                     "$ref": "#/definitions/blockIODevice"
                 },
                 {
@@ -625,8 +654,7 @@
             ]
         },
         "blockIODeviceThrottle": {
-            "allOf": [
-                {
+            "allOf": [{
                     "$ref": "#/definitions/blockIODevice"
                 },
                 {

src/json/schema/host-config.json

@@ -53,8 +53,8 @@
         "Sysctls": {
             "$ref": "defs.json#/definitions/mapStringString"
         },
-        "Runtime":{
-            "type":"string"
+        "Runtime": {
+            "type": "string"
         },
         "RestartPolicy": {
             "type": "object",
@@ -119,46 +119,19 @@
             "type": "uint16"
         },
         "BlkioWeightDevice": {
-            "type": "array",
-            "items": {
-                "type": "object",
-                "properties": {
-                    "Path": {
-                        "type": "string"
-                    },
-                    "Weight": {
-                        "type": "uint16"
-                    }
-                }
-            }
+            "$ref": "defs.json#/definitions/ArrayOfBlkioWeightDevice"
         },
         "BlkioDeviceReadBps": {
-            "type": "array",
-            "items": {
-                "type": "object",
-                "properties": {
-                    "Path": {
-                        "type": "string"
-                    },
-                    "Rate": {
-                        "type": "uint64"
-                    }
-                }
-            }
+            "$ref": "defs.json#/definitions/ArrayOfBlkioDevice"
         },
         "BlkioDeviceWriteBps": {
-            "type": "array",
-            "items": {
-                "type": "object",
-                "properties": {
-                    "Path": {
-                        "type": "string"
+            "$ref": "defs.json#/definitions/ArrayOfBlkioDevice"
         },
-                    "Rate": {
-                        "type": "uint64"
-                    }
-                }
-            }
+        "BlkioDeviceReadIops": {
+            "$ref": "defs.json#/definitions/ArrayOfBlkioDevice"
+        },
+        "BlkioDeviceWriteIops": {
+            "$ref": "defs.json#/definitions/ArrayOfBlkioDevice"
         },
         "CPUPeriod": {
             "type": "int64"