Merge pull request opencontainers#892 from q384566678/solaris-fix

config-solaris: Replaced refs with actual fields in cappedCPU, cappedMemory and anet fields
kinvolk · Aug 14, 2017 · 49c255e · 49c255e
2 parents c47d8e6 + 58ae3dd
commit 49c255e
Showing 1 changed file with 42 additions and 3 deletions.
diff --git 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"
+                        }
+                    }
                 }
             }
         }