Re: [Kimchi-devel] [PATCH][Kimchi 1/4] Create a single field to pass the installation media

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com&gt; --- API.json | 16 +++++----------- i18n.py | 2 +- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/API.json b/API.json index 6f0b484..ff505b1 100644 --- a/API.json +++ b/API.json @@ -468,11 +468,11 @@ "error": "KCHTMPL0011E" }, "memory": { "$ref": "#/kimchitype/memory" }, - "cdrom": { - "description": "Path for cdrom", - "type": "string", - "pattern": "^((/)|(http)[s]?:|[t]?(ftp)[s]?:)+.*$", - "error": "KCHTMPL0014E" + "source_media": { + "description": "Path for installation media (ISO, disk, remote ISO)", + "type" : "string", + "pattern" : "^((/)|(http)[s]?:|[t]?(ftp)[s]?:)+.*$", + "required": true }, "disks": { "description": "List of disks", @@ -497,12 +497,6 @@ "minimum": 1, "error": "KCHTMPL0022E" }, - "base": { - "description": "Base image of the disk", - "type": "string", - "pattern": "^/.+$", - "error": "KCHTMPL0023E" - }, "pool": { "description": "Storage pool information", "type": "object", diff --git a/i18n.py b/i18n.py index 6214687..57b033d 100644 --- a/i18n.py +++ b/i18n.py @@ -168,7 +168,7 @@ messages = { "KCHTMPL0013E": _("Amount of memory and maximum memory (MB) must be an integer greater than 512"), "KCHTMPL0014E": _("Template CDROM must be a local or remote ISO file"), "KCHTMPL0015E": _("Invalid storage pool URI %(value)s specified for template"), - "KCHTMPL0016E": _("Specify an ISO image as CDROM or a base image to create a template"), + "KCHTMPL0016E": _("Specify a path to source media (ISO, disk or remote ISO) to create a template"), "KCHTMPL0017E": _("All networks for the template must be specified in a list."), "KCHTMPL0018E": _("Specify a volume to a template when storage pool is iSCSI or SCSI"), "KCHTMPL0019E": _("The volume %(volume)s is not in storage pool %(pool)s"),