From 1839c09872b1e5a19109992c6ab52d9b45655ac6 Mon Sep 17 00:00:00 2001
From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
Date: Wed, 26 Apr 2023 17:08:04 +0800
Subject: [PATCH 13/15] add unified resources and remove useless
 MemorySwapLimitInBytes

Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
---
 src/json/schema/defs.json                         | 4 ++++
 src/json/schema/host-config.json                  | 3 ---
 src/json/schema/shim/client/cgroup-resources.json | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/json/schema/defs.json b/src/json/schema/defs.json
index 58c56fe..d96ac4c 100644
--- a/src/json/schema/defs.json
+++ b/src/json/schema/defs.json
@@ -969,6 +969,10 @@
             "id": "https://opencontainers.org/schema/bundle/linux/resources",
             "type": "object",
             "properties": {
+                "unified": {
+                    "id": "https://opencontainers.org/schema/bundle/linux/resources/unified",
+                    "$ref": "#/definitions/mapStringString"
+                },
                 "devices": {
                     "id": "https://opencontainers.org/schema/bundle/linux/resources/devices",
                     "type": "array",
diff --git a/src/json/schema/host-config.json b/src/json/schema/host-config.json
index 0367a76..302a537 100644
--- a/src/json/schema/host-config.json
+++ b/src/json/schema/host-config.json
@@ -145,9 +145,6 @@
         "OomScoreAdj": {
             "type": "integer"
         },
-        "MemorySwapLimitInBytes":{
-            "type": "int64"
-        },
         "BlkioWeight": {
             "type": "uint16"
         },
diff --git a/src/json/schema/shim/client/cgroup-resources.json b/src/json/schema/shim/client/cgroup-resources.json
index 1031071..693bcf0 100644
--- a/src/json/schema/shim/client/cgroup-resources.json
+++ b/src/json/schema/shim/client/cgroup-resources.json
@@ -53,6 +53,9 @@
                     "$ref": "../../defs.json#/definitions/uint64"
                 }
             }
+        },
+        "unified": {
+            "$ref": "../../defs.json#/definitions/mapStringString"
         }
     }
 }
-- 
2.25.1