From 58ae3dd768e3a953af35ce6bd3e6c3579814954d Mon Sep 17 00:00:00 2001 From: zhouhao Date: Wed, 12 Jul 2017 14:00:19 +0800 Subject: [PATCH] config-solaris: Replaced refs with some fields Signed-off-by: zhouhao --- schema/config-solaris.json | 45 +++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/schema/config-solaris.json b/schema/config-solaris.json index fbc5977e0..b38a939d4 100644 --- a/schema/config-solaris.json +++ b/schema/config-solaris.json @@ -18,17 +18,56 @@ }, "cappedCPU": { "id": "https://opencontainers.org/schema/bundle/solaris/cappedCPU", - "$ref": "defs.json#/definitions/mapStringString" + "type": "object", + "properties": { + "ncpus": { + "id": "https://opencontainers.org/schema/bundle/solaris/cappedCPU/ncpus", + "type": "string" + } + } }, "cappedMemory": { "id": "https://opencontainers.org/schema/bundle/solaris/cappedMemory", - "$ref": "defs.json#/definitions/mapStringString" + "type": "object", + "properties": { + "physical": { + "id": "https://opencontainers.org/schema/bundle/solaris/cappedMemory/physical", + "type": "string" + }, + "swap": { + "id": "https://opencontainers.org/schema/bundle/solaris/cappedMemory/swap", + "type": "string" + } + } }, "anet": { "id": "https://opencontainers.org/schema/bundle/solaris/anet", "type": "array", "items": { - "$ref": "defs.json#/definitions/mapStringString" + "type": "object", + "properties": { + "linkname": { + "type": "string" + }, + "lowerLink": { + "type": "string" + }, + "allowedAddress": { + "type": "string" + }, + "configureAllowedAddress": { + "type": "string" + }, + "defrouter": { + "type": "string" + }, + "macAddress": { + "type": "string" + }, + "linkProtection": { + "type": "string" + } + } } } }