particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mounts: change schema meta information

Browse source 
Define the mount schema in the actual mounts at a higher level. This
is in preparation to give the modules more control over the `source`
and `target` properties.
This commit is contained in:
Christian Kellner 2021-10-18 16:39:22 +02:00 • committed by Tom Gundersen
parent 5694743ca6
commit 02404ced94
6 changed files with 92 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
mounts/org.osbuild.btrfs
View file

@ -13,8 +13,23 @@ from typing import Dict
from osbuild import mounts from osbuild import mounts
SCHEMA = """ SCHEMA_2 = """
"additionalProperties": False "additionalProperties": false,
"required": ["name", "type", "source", "target"],
"properties": {
"name": { "type": "string" },
"type": { "type": "string" },
"source": {
"type": "string"
},
"target": {
"type": "string"
},
"options": {
"type": "object",
"additionalProperties": true
}
}
""" """

19
mounts/org.osbuild.ext4
View file

@ -13,8 +13,23 @@ from typing import Dict
from osbuild import mounts from osbuild import mounts
SCHEMA = """ SCHEMA_2 = """
"additionalProperties": false "additionalProperties": false,
"required": ["name", "type", "source", "target"],
"properties": {
"name": { "type": "string" },
"type": { "type": "string" },
"source": {
"type": "string"
},
"target": {
"type": "string"
},
"options": {
"type": "object",
"additionalProperties": true
}
}
""" """

19
mounts/org.osbuild.fat
View file

@ -13,8 +13,23 @@ from typing import Dict
from osbuild import mounts from osbuild import mounts
SCHEMA = """ SCHEMA_2 = """
"additionalProperties": false "additionalProperties": false,
"required": ["name", "type", "source", "target"],
"properties": {
"name": { "type": "string" },
"type": { "type": "string" },
"source": {
"type": "string"
},
"target": {
"type": "string"
},
"options": {
"type": "object",
"additionalProperties": true
}
}
""" """

19
mounts/org.osbuild.noop
View file

@ -15,8 +15,23 @@ from typing import Dict
from osbuild import mounts from osbuild import mounts
SCHEMA = """ SCHEMA_2 = """
"additionalProperties": false "additionalProperties": false,
"required": ["name", "type", "source", "target"],
"properties": {
"name": { "type": "string" },
"type": { "type": "string" },
"source": {
"type": "string"
},
"target": {
"type": "string"
},
"options": {
"type": "object",
"additionalProperties": true
}
}
""" """

19
mounts/org.osbuild.xfs
View file

@ -13,8 +13,23 @@ from typing import Dict
from osbuild import mounts from osbuild import mounts
SCHEMA = """ SCHEMA_2 = """
"additionalProperties": false "additionalProperties": false,
"required": ["name", "type", "source", "target"],
"properties": {
"name": { "type": "string" },
"type": { "type": "string" },
"source": {
"type": "string"
},
"target": {
"type": "string"
},
"options": {
"type": "object",
"additionalProperties": true
}
}
""" """

8
osbuild/meta.py
View file

@ -332,13 +332,19 @@ class ModuleInfo:
**opts, **opts,
} }
schema["required"] = [type_id] schema["required"] = [type_id]
elif self.type in ("Device", "Mount"): elif self.type in ("Device"):
schema["additionalProperties"] = True schema["additionalProperties"] = True
opts = self._load_opts(version, "1") opts = self._load_opts(version, "1")
schema["properties"] = { schema["properties"] = {
"type": {"enum": [self.name]}, "type": {"enum": [self.name]},
"options": opts "options": opts
} }
elif self.type in ("Mount"):
opts = self._load_opts("2")
schema.update(opts)
schema["properties"]["type"] = {
"enum": [self.name],
}
else: else:
opts = self._load_opts(version, "1") opts = self._load_opts(version, "1")
schema.update(opts) schema.update(opts)