From a04cce97ea28861ff56fc6ee8263a220eacc6651 Mon Sep 17 00:00:00 2001
From: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Date: Mon, 29 Aug 2016 11:58:16 +0800
Subject: [PATCH] fix blkio related validation

Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
---
 schema/config-linux.json | 10 +++++-----
 schema/defs-linux.json   | 22 +---------------------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/schema/config-linux.json b/schema/config-linux.json
index 0da996aab..80fbf93e6 100644
--- a/schema/config-linux.json
+++ b/schema/config-linux.json
@@ -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
index 0cecb14a0..6f76acc12 100644
--- a/schema/defs-linux.json
+++ b/schema/defs-linux.json
@@ -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": {