February 2014 - Kimchi-devel - oVirt List Archives

[PATCH 0/4] Add users and groups to VMs
by Crístian Viana 28 Feb '14

28 Feb '14

Crístian Viana (4): Override only the updated "User" methods in "patch_auth" Add functions to check if a user/group exists Return users and groups when fetching VM info Add/remove users and groups to VMs docs/API.md | 6 +++++ src/kimchi/API.json | 22 ++++++++++++++++ src/kimchi/auth.py | 22 ++++++++++++++++ src/kimchi/control/vms.py | 6 +++-- src/kimchi/i18n.py | 6 +++++ src/kimchi/mockmodel.py | 4 ++- src/kimchi/model/vms.py | 61 ++++++++++++++++++++++++++++++++++++++++++--- tests/test_authorization.py | 19 ++++++++++++++ tests/test_mockmodel.py | 2 +- tests/test_model.py | 44 +++++++++++++++++++++++++++++++- tests/test_rest.py | 2 ++ tests/utils.py | 24 +++++------------- 12 files changed, 191 insertions(+), 27 deletions(-) -- 1.8.5.3

3 12

Kimchi is growing!!
by Aline Manera 28 Feb '14

28 Feb '14

Hi all, I have some good news to share with you. Adam King has just caught my attention to the image below. Yeap! 1000 commits! A big accomplishment that was only possible with everyone working together. And Paulo found out Kimchi is on Linux Foundation. Mentioning Paulo: /"Last week I received a newsletter with some Linux Foundation training sessions [1], and one of them, Linux KVM Virtualization (LFS540), caught my attention by listing Kimchi as one of the OSS "quick start" tools [2].//" // //Yes guys, Kimchi is growing. Let's take over the world!!! :-D// // //Pinky: "Gee, Brain, what do you want to do tonight?"// //The Brain: "The same thing we do every night, Pinky---try to take over the world!" // / [1] http://training.linuxfoundation.org [2] http://training.linuxfoundation.org/linux-courses/linux-kvm-virtualization/… Seems more and more we are becoming visible to the world! Great job team! Regards, Aline Manera PNG

4 3

[PATCH] issue #242: Do not allow user deactivate/delete storage pool used by a template
by Aline Manera 28 Feb '14

28 Feb '14

From: Aline Manera <alinefm(a)br.ibm.com> Make a integrity verification when user try to deactivate or delete a pool. If pool is used by a template it should not be deactivated or deleted to avoid problems while using the template. Also update the po files as new messages are added to alert the user. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- po/en_US.po | 66 +++++++++++++++++++++++++++----------- po/kimchi.pot | 57 ++++++++++++++++++++++++-------- po/pt_BR.po | 66 +++++++++++++++++++++++++++----------- po/zh_CN.po | 65 ++++++++++++++++++++++++++----------- src/kimchi/i18n.py | 2 ++ src/kimchi/model/storagepools.py | 21 ++++++++++-- tests/test_model.py | 5 +++ 7 files changed, 210 insertions(+), 72 deletions(-) diff --git a/po/en_US.po b/po/en_US.po index ca1fe86..aeff16e 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-20 15:26-0300\n" +"POT-Creation-Date: 2014-02-25 15:23-0300\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -85,18 +85,21 @@ msgstr "Cancel" msgid "Save" msgstr "Save" -msgid "Reset" -msgstr "Reset" - msgid "Start" msgstr "Start" +msgid "Reset" +msgstr "Reset" + msgid "Stop" msgstr "Stop" msgid "Actions" msgstr "Actions" +msgid "Console" +msgstr "" + msgid "Edit" msgstr "Edit" @@ -237,6 +240,9 @@ msgstr "Remove" msgid "Download" msgstr "Download" +msgid "Report name should contain only letters, digits and/or hyphen ('-')." +msgstr "" + msgid "" "This will delete the virtual machine and its virtual disks. This operation " "cannot be undone. Would you like to continue?" @@ -299,12 +305,12 @@ msgstr "Server name can not be blank." msgid "This is not a valid Server Name or IP. please, modify it." msgstr "This is not a valid Server Name or IP. please, modify it." -msgid "Log out" -msgstr "Log out" - msgid "Help" msgstr "" +msgid "Log out" +msgstr "Log out" + msgid "Log In" msgstr "Log In" @@ -322,12 +328,8 @@ msgstr "Report Name" msgid "" "The name used to identify the report. If omitted, a name will be chosen " -"based on current time. Name can contain: letters, digits, \"-\", \"_\", or " -"\".\"." +"based on current time. Name can contain: letters, digits and hyphen (\"-\")." msgstr "" -"The name used to identify the report. If omitted, a name will be chosen " -"based on current time. Name can contain: letters, digits, \"-\", \"_\", or " -"\".\"." msgid "Define a New Storage Pool" msgstr "Define a New Storage Pool" @@ -400,12 +402,12 @@ msgstr "iSCSI Authentication" msgid "CPU" msgstr "CPU" -msgid "Network I/O" -msgstr "Network I/O" - msgid "Disk I/O" msgstr "Disk I/O" +msgid "Network I/O" +msgstr "Network I/O" + msgid "Livetile" msgstr "Livetile" @@ -741,6 +743,10 @@ msgid "" msgstr "" #, python-format +msgid "Unable to start virtual machine %(name)s. Details: %(err)s" +msgstr "" + +#, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" msgstr "" @@ -936,6 +942,18 @@ msgstr "" msgid "The SCSI host adapter name must be a string." msgstr "" +msgid "The storage pool kimchi_isos is reserved for internal use" +msgstr "" + +#, python-format +msgid "" +"Unable to deactivate pool %(name)s as it is associated with some templates" +msgstr "" + +#, python-format +msgid "Unable to delete pool %(name)s as it is associated with some templates" +msgstr "" + #, python-format msgid "Storage volume %(name)s already exists" msgstr "" @@ -1081,6 +1099,13 @@ msgstr "" msgid "Unable to generate debug report %(name)s. Details: %(err)s" msgstr "" +msgid "You should give a name for the debug file report." +msgstr "" + +msgid "" +"Name should be a string. Only letters, digits and hyphen ('-') are allowed." +msgstr "" + #, python-format msgid "Storage server %(server)s was not used by Kimchi" msgstr "" @@ -1139,16 +1164,13 @@ msgid "Invalid storage type. Types supported: 'cdrom'" msgstr "" #, python-format -msgid "The path %(value)s is not valid local/remote path for the device" +msgid "The path '%(value)s' is not valid local/remote path for the device" msgstr "" #, python-format msgid "Device name %(dev_name)s already exists in vm %(vm_name)s" msgstr "" -msgid "Must specify a device name" -msgstr "" - msgid "Can't specify a directory for a CDROM device path" msgstr "" @@ -1171,6 +1193,12 @@ msgstr "" msgid "Do not support guest CDROM hot plug attachment" msgstr "" +msgid "Specify type and path to add a new virtual machine disk" +msgstr "" + +msgid "Specify path to update virtual machine disk" +msgstr "" + msgid "Repository ID must be one word only string." msgstr "" diff --git a/po/kimchi.pot b/po/kimchi.pot index a906ad9..abb7219 100755 --- a/po/kimchi.pot +++ b/po/kimchi.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-20 15:26-0300\n" +"POT-Creation-Date: 2014-02-25 15:23-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -85,10 +85,10 @@ msgstr "" msgid "Save" msgstr "" -msgid "Reset" +msgid "Start" msgstr "" -msgid "Start" +msgid "Reset" msgstr "" msgid "Stop" @@ -97,6 +97,9 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Console" +msgstr "" + msgid "Edit" msgstr "" @@ -233,6 +236,9 @@ msgstr "" msgid "Download" msgstr "" +msgid "Report name should contain only letters, digits and/or hyphen ('-')." +msgstr "" + msgid "" "This will delete the virtual machine and its virtual disks. This operation " "cannot be undone. Would you like to continue?" @@ -291,10 +297,10 @@ msgstr "" msgid "This is not a valid Server Name or IP. please, modify it." msgstr "" -msgid "Log out" +msgid "Help" msgstr "" -msgid "Help" +msgid "Log out" msgstr "" msgid "Log In" @@ -314,8 +320,7 @@ msgstr "" msgid "" "The name used to identify the report. If omitted, a name will be chosen " -"based on current time. Name can contain: letters, digits, \"-\", \"_\", or " -"\".\"." +"based on current time. Name can contain: letters, digits and hyphen (\"-\")." msgstr "" msgid "Define a New Storage Pool" @@ -385,10 +390,10 @@ msgstr "" msgid "CPU" msgstr "" -msgid "Network I/O" +msgid "Disk I/O" msgstr "" -msgid "Disk I/O" +msgid "Network I/O" msgstr "" msgid "Livetile" @@ -726,6 +731,10 @@ msgid "" msgstr "" #, python-format +msgid "Unable to start virtual machine %(name)s. Details: %(err)s" +msgstr "" + +#, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" msgstr "" @@ -921,6 +930,18 @@ msgstr "" msgid "The SCSI host adapter name must be a string." msgstr "" +msgid "The storage pool kimchi_isos is reserved for internal use" +msgstr "" + +#, python-format +msgid "" +"Unable to deactivate pool %(name)s as it is associated with some templates" +msgstr "" + +#, python-format +msgid "Unable to delete pool %(name)s as it is associated with some templates" +msgstr "" + #, python-format msgid "Storage volume %(name)s already exists" msgstr "" @@ -1066,6 +1087,13 @@ msgstr "" msgid "Unable to generate debug report %(name)s. Details: %(err)s" msgstr "" +msgid "You should give a name for the debug file report." +msgstr "" + +msgid "" +"Name should be a string. Only letters, digits and hyphen ('-') are allowed." +msgstr "" + #, python-format msgid "Storage server %(server)s was not used by Kimchi" msgstr "" @@ -1124,16 +1152,13 @@ msgid "Invalid storage type. Types supported: 'cdrom'" msgstr "" #, python-format -msgid "The path %(value)s is not valid local/remote path for the device" +msgid "The path '%(value)s' is not valid local/remote path for the device" msgstr "" #, python-format msgid "Device name %(dev_name)s already exists in vm %(vm_name)s" msgstr "" -msgid "Must specify a device name" -msgstr "" - msgid "Can't specify a directory for a CDROM device path" msgstr "" @@ -1156,6 +1181,12 @@ msgstr "" msgid "Do not support guest CDROM hot plug attachment" msgstr "" +msgid "Specify type and path to add a new virtual machine disk" +msgstr "" + +msgid "Specify path to update virtual machine disk" +msgstr "" + msgid "Repository ID must be one word only string." msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 715e072..db7c579 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-20 15:26-0300\n" +"POT-Creation-Date: 2014-02-25 15:23-0300\n" "PO-Revision-Date: 2013-06-27 10:48+0000\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: Aline Manera <alinefm(a)br.ibm.com>\n" @@ -101,18 +101,21 @@ msgstr "Cancelar" msgid "Save" msgstr "Salvar" -msgid "Reset" -msgstr "Reiniciar" - msgid "Start" msgstr "Iniciar" +msgid "Reset" +msgstr "Reiniciar" + msgid "Stop" msgstr "Parar" msgid "Actions" msgstr "Ações" +msgid "Console" +msgstr "" + msgid "Edit" msgstr "Editar" @@ -255,6 +258,9 @@ msgstr "Remover" msgid "Download" msgstr "Baixar" +msgid "Report name should contain only letters, digits and/or hyphen ('-')." +msgstr "" + msgid "" "This will delete the virtual machine and its virtual disks. This operation " "cannot be undone. Would you like to continue?" @@ -317,12 +323,12 @@ msgstr "" msgid "This is not a valid Server Name or IP. please, modify it." msgstr "" -msgid "Log out" -msgstr "Sair" - msgid "Help" msgstr "" +msgid "Log out" +msgstr "Sair" + msgid "Log In" msgstr "Entrar" @@ -340,12 +346,8 @@ msgstr "Nome do Relatório" msgid "" "The name used to identify the report. If omitted, a name will be chosen " -"based on current time. Name can contain: letters, digits, \"-\", \"_\", or " -"\".\"." +"based on current time. Name can contain: letters, digits and hyphen (\"-\")." msgstr "" -"O nome usado para identificar o relatório. Se omitido, o nome será escolhido " -"baseado no horário. O nome pode conter: letras, números, \"-\", \"_\", ou \"." -"\"." msgid "Define a New Storage Pool" msgstr "Definir novo Storage Pool" @@ -415,12 +417,12 @@ msgstr "" msgid "CPU" msgstr "CPU" -msgid "Network I/O" -msgstr "Rede E/S" - msgid "Disk I/O" msgstr "Disco E/S" +msgid "Network I/O" +msgstr "Rede E/S" + msgid "Livetile" msgstr "Tela ao vivo" @@ -756,6 +758,10 @@ msgid "" msgstr "" #, python-format +msgid "Unable to start virtual machine %(name)s. Details: %(err)s" +msgstr "" + +#, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" msgstr "" @@ -951,6 +957,18 @@ msgstr "" msgid "The SCSI host adapter name must be a string." msgstr "" +msgid "The storage pool kimchi_isos is reserved for internal use" +msgstr "" + +#, python-format +msgid "" +"Unable to deactivate pool %(name)s as it is associated with some templates" +msgstr "" + +#, python-format +msgid "Unable to delete pool %(name)s as it is associated with some templates" +msgstr "" + #, python-format msgid "Storage volume %(name)s already exists" msgstr "" @@ -1096,6 +1114,13 @@ msgstr "" msgid "Unable to generate debug report %(name)s. Details: %(err)s" msgstr "" +msgid "You should give a name for the debug file report." +msgstr "" + +msgid "" +"Name should be a string. Only letters, digits and hyphen ('-') are allowed." +msgstr "" + #, python-format msgid "Storage server %(server)s was not used by Kimchi" msgstr "" @@ -1154,16 +1179,13 @@ msgid "Invalid storage type. Types supported: 'cdrom'" msgstr "" #, python-format -msgid "The path %(value)s is not valid local/remote path for the device" +msgid "The path '%(value)s' is not valid local/remote path for the device" msgstr "" #, python-format msgid "Device name %(dev_name)s already exists in vm %(vm_name)s" msgstr "" -msgid "Must specify a device name" -msgstr "" - msgid "Can't specify a directory for a CDROM device path" msgstr "" @@ -1186,6 +1208,12 @@ msgstr "" msgid "Do not support guest CDROM hot plug attachment" msgstr "" +msgid "Specify type and path to add a new virtual machine disk" +msgstr "" + +msgid "Specify path to update virtual machine disk" +msgstr "" + msgid "Repository ID must be one word only string." msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 546ccef..0439b04 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-20 15:26-0300\n" +"POT-Creation-Date: 2014-02-25 15:23-0300\n" "PO-Revision-Date: 2013-06-27 10:48+0000\n" "Last-Translator: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" "Language-Team: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" @@ -101,18 +101,21 @@ msgstr "取消" msgid "Save" msgstr "保存" -msgid "Reset" -msgstr "重置" - msgid "Start" msgstr "启用" +msgid "Reset" +msgstr "重置" + msgid "Stop" msgstr "停止" msgid "Actions" msgstr "操作" +msgid "Console" +msgstr "" + msgid "Edit" msgstr "编辑" @@ -249,6 +252,9 @@ msgstr "删除" msgid "Download" msgstr "下载" +msgid "Report name should contain only letters, digits and/or hyphen ('-')." +msgstr "" + msgid "" "This will delete the virtual machine and its virtual disks. This operation " "cannot be undone. Would you like to continue?" @@ -307,12 +313,12 @@ msgstr "服务器不能为空" msgid "This is not a valid Server Name or IP. please, modify it." msgstr "这不是一个有效的服务器名或IP，请修改" -msgid "Log out" -msgstr "登出" - msgid "Help" msgstr "" +msgid "Log out" +msgstr "登出" + msgid "Log In" msgstr "登录" @@ -330,11 +336,8 @@ msgstr "诊断报告名" msgid "" "The name used to identify the report. If omitted, a name will be chosen " -"based on current time. Name can contain: letters, digits, \"-\", \"_\", or " -"\".\"." +"based on current time. Name can contain: letters, digits and hyphen (\"-\")." msgstr "" -"该名称用来唯一标识报告，如果不指定，将会基于当前时间自动生成一个名称。名称可" -"以包含: 字母、数字、\"-\"、\"_\" 或者 \".\"" msgid "Define a New Storage Pool" msgstr "定义一个新的存储池" @@ -403,12 +406,12 @@ msgstr "iSCSI认证" msgid "CPU" msgstr "处理器" -msgid "Network I/O" -msgstr "网络I/O" - msgid "Disk I/O" msgstr "磁盘I/O" +msgid "Network I/O" +msgstr "网络I/O" + msgid "Livetile" msgstr "屏幕" @@ -744,6 +747,10 @@ msgid "" msgstr "" #, python-format +msgid "Unable to start virtual machine %(name)s. Details: %(err)s" +msgstr "" + +#, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" msgstr "" @@ -939,6 +946,18 @@ msgstr "" msgid "The SCSI host adapter name must be a string." msgstr "" +msgid "The storage pool kimchi_isos is reserved for internal use" +msgstr "" + +#, python-format +msgid "" +"Unable to deactivate pool %(name)s as it is associated with some templates" +msgstr "" + +#, python-format +msgid "Unable to delete pool %(name)s as it is associated with some templates" +msgstr "" + #, python-format msgid "Storage volume %(name)s already exists" msgstr "" @@ -1084,6 +1103,13 @@ msgstr "" msgid "Unable to generate debug report %(name)s. Details: %(err)s" msgstr "" +msgid "You should give a name for the debug file report." +msgstr "" + +msgid "" +"Name should be a string. Only letters, digits and hyphen ('-') are allowed." +msgstr "" + #, python-format msgid "Storage server %(server)s was not used by Kimchi" msgstr "" @@ -1142,16 +1168,13 @@ msgid "Invalid storage type. Types supported: 'cdrom'" msgstr "" #, python-format -msgid "The path %(value)s is not valid local/remote path for the device" +msgid "The path '%(value)s' is not valid local/remote path for the device" msgstr "" #, python-format msgid "Device name %(dev_name)s already exists in vm %(vm_name)s" msgstr "" -msgid "Must specify a device name" -msgstr "" - msgid "Can't specify a directory for a CDROM device path" msgstr "" @@ -1174,6 +1197,12 @@ msgstr "" msgid "Do not support guest CDROM hot plug attachment" msgstr "" +msgid "Specify type and path to add a new virtual machine disk" +msgstr "" + +msgid "Specify path to update virtual machine disk" +msgstr "" + msgid "Repository ID must be one word only string." msgstr "" diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index fea0184..f766383 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -135,6 +135,8 @@ messages = { "KCHPOOL0029E": _("The parameter disks only can be updated for logical storage pool."), "KCHPOOL0030E": _("The SCSI host adapter name must be a string."), "KCHPOOL0031E": _("The storage pool kimchi_isos is reserved for internal use"), + "KCHPOOL0032E": _("Unable to deactivate pool %(name)s as it is associated with some templates"), + "KCHPOOL0033E": _("Unable to delete pool %(name)s as it is associated with some templates"), "KCHVOL0001E": _("Storage volume %(name)s already exists"), "KCHVOL0002E": _("Storage volume %(name)s does not exist in storage pool %(pool)s"), diff --git a/src/kimchi/model/storagepools.py b/src/kimchi/model/storagepools.py index 011feb0..d4a6ee8 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -29,8 +29,7 @@ from kimchi.exception import NotFoundError, OperationFailed from kimchi.model.config import CapabilitiesModel from kimchi.model.host import DeviceModel from kimchi.model.libvirtstoragepool import StoragePoolDef -from kimchi.utils import add_task, kimchi_log -from kimchi.utils import run_command +from kimchi.utils import add_task, kimchi_log, pool_name_from_uri, run_command ISO_POOL_NAME = u'kimchi_isos' @@ -190,7 +189,7 @@ class StoragePoolModel(object): elif len(res) == 0: source[key] = "" else: - souce[key] = res + source[key] = res return source @@ -273,7 +272,20 @@ class StoragePoolModel(object): raise OperationFailed("KCHPOOL0009E", {'name': name, 'err': e.get_error_message()}) + def _pool_used_by_template(self, pool_name): + with self.objstore as session: + templates = session.get_list('template') + for tmpl in templates: + t_info = session.get('template', tmpl) + t_pool = pool_name_from_uri(t_info['storagepool']) + if t_pool == pool_name: + return True + return False + def deactivate(self, name): + if self._pool_used_by_template(name): + raise InvalidOperation('KCHPOOL0032E', {'name': name}) + pool = self.get_storagepool(name, self.conn) try: pool.destroy() @@ -282,6 +294,9 @@ class StoragePoolModel(object): {'name': name, 'err': e.get_error_message()}) def delete(self, name): + if self._pool_used_by_template(name): + raise InvalidOperation('KCHPOOL0033E', {'name': name}) + pool = self.get_storagepool(name, self.conn) if pool.isActive(): raise InvalidOperation("KCHPOOL0005E", {'name': name}) diff --git a/tests/test_model.py b/tests/test_model.py index 74e2424..7cf2f08 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -406,6 +406,11 @@ class ModelTests(unittest.TestCase): disk_path = '/tmp/kimchi-images/%s-0.img' % vm_info['uuid'] self.assertTrue(os.access(disk_path, os.F_OK)) + # reset template to default storage pool + # so we can remove the storage pool created 'test-pool' + params = {'storagepool': '/storagepools/default'} + inst.template_update('test', params) + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_template_create(self): inst = model.Model('test:///default', -- 1.7.10.4

5 7

[PATCH 0/4] Issue 294: The auto logout leaves action menu on page
by Adam King 28 Feb '14

28 Feb '14

The defect reported that the kimchi UI overlays the login form over whatever is being displayed when the session becomes invalid. The defect describes how open menus are left above part of the login overlay in the zOrder, leaving an undesirable visual mashup. Additionally, information about the userID and the defined VMs remained visible (if grayed), representing a potential security exposure. This patch series removes any information from the UI that could be deemed sensitive whenever the session times out, defines a message to be displayed when the host can't be reached, and corrects the error flow to propagate all available information to the final error handler. Adam King (4): Create new error message to be displayed when we get an unexpeted ajax error Fix formatting of the requestJSON function Pass ajaxError information on to original requester on ajaxError event Issue 294 The auto logout leaves action menu on page po/en_US.po | 19 ++++++++++++++++++- po/kimchi.pot | 19 ++++++++++++++++++- po/pt_BR.po | 23 ++++++++++++++++++++++- po/zh_CN.po | 19 ++++++++++++++++++- ui/js/src/kimchi.api.js | 2 +- ui/js/src/kimchi.guest_main.js | 9 +++++++-- ui/js/src/kimchi.main.js | 6 +++++- ui/pages/i18n.html.tmpl | 1 + ui/pages/kimchi-ui.html.tmpl | 2 +- ui/pages/tabs/guests.html.tmpl | 2 +- 10 files changed, 92 insertions(+), 10 deletions(-) -- 1.8.1.4

3 8

[PATCH V1] Can not create a VM from a template with disks['volume'] parameters. #181
by Shu Ming 28 Feb '14

28 Feb '14

The latest code have removed disks["volume"] from API.json, but API.md was not updated accordingly. The in-consistence between API.json and API.md should be corrected first. Then, the invalid code in VMTemplate.validate_integrity() should also be cleaned. --- docs/API.md | 1 - src/kimchi/vmtemplate.py | 9 --------- tests/test_model.py | 4 +--- tests/test_rest.py | 4 +--- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/docs/API.md b/docs/API.md index e97eace..fc39c65 100644 --- a/docs/API.md +++ b/docs/API.md @@ -161,7 +161,6 @@ Represents a snapshot of the Virtual Machine's primary monitor. (either *size* or *volume* must be specified): * index: The device index * size: The device size in GB - * volume: A volume name that contains the initial disk contents * graphics *(optional)*: The graphics paramenters of this template * type: The type of graphics. It can be VNC or spice or None. diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index f786fa5..3e52be5 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -361,15 +361,6 @@ class VMTemplate(object): except Exception: invalid['cdrom'] = [iso] - # validate disks integrity - volumes = [] - for disk in self.info['disks']: - volume = disk.get("volume") - if volume is not None and not os.path.exists(volume): - volumes.append(volume) - if volumes: - invalid['disks'] = volumes - self.info['invalid'] = invalid return self.info diff --git a/tests/test_model.py b/tests/test_model.py index 8bb1ccc..a08b3d9 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -468,8 +468,7 @@ class ModelTests(unittest.TestCase): iso_gen.construct_fake_iso(iso, True, '12.04', 'ubuntu') params = {'name': 'test', 'memory': 1024, 'cpus': 1, - 'networks': ['test-network'], 'cdrom': iso, - 'disks': [{'volume': iso}]} + 'networks': ['test-network'], 'cdrom': iso} inst.templates_create(params) rollback.prependDefer(inst.template_delete, 'test') @@ -479,7 +478,6 @@ class ModelTests(unittest.TestCase): info = inst.template_lookup('test') self.assertEquals(info['invalid']['cdrom'], [iso]) self.assertEquals(info['invalid']['networks'], [net_name]) - self.assertEquals(info['invalid']['disks'], [iso]) @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_template_clone(self): diff --git a/tests/test_rest.py b/tests/test_rest.py index d59882b..54530f3 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -1088,8 +1088,7 @@ class RestTests(unittest.TestCase): self.assertEquals(201, resp.status) t = {'name': 'test', 'memory': 1024, 'cpus': 1, - 'networks': ['test-network'], 'cdrom': iso, - 'disks': [{'volume': iso}]} + 'networks': ['test-network'], 'cdrom': iso} req = json.dumps(t) resp = self.request('/templates', req, 'POST') @@ -1104,7 +1103,6 @@ class RestTests(unittest.TestCase): res = json.loads(self.request('/templates/test').read()) self.assertEquals(res['invalid']['cdrom'], [iso]) self.assertEquals(res['invalid']['networks'], ['test-network']) - self.assertEquals(res['invalid']['disks'], [iso]) # Delete the template resp = request(host, port, '/templates/test', '{}', 'DELETE') -- 1.8.1.4

3 2

[PATCH] Bug Fix #282: Disable Start/Stop network buttons while wait backend lag
by Rodrigo Trujillo 28 Feb '14

28 Feb '14

When the user tries to Start/Stop (up/down) a network, there is a lag in the backend, and it was possible to click on start/stop/delete again, and again, generating errors. This patch disables the buttons and shows loading gif to user, avoind this kind of error. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/css/theme-default/network.css | 5 +++++ ui/js/src/kimchi.network.js | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ui/css/theme-default/network.css b/ui/css/theme-default/network.css index 80640a3..67f2aa2 100644 --- a/ui/css/theme-default/network.css +++ b/ui/css/theme-default/network.css @@ -132,6 +132,11 @@ margin-left: 29px; } +.network .list .nw-loading { + background: #c0c0c0 url(../../images/theme-default/loading.gif) + center no-repeat; +} + .network .list .up { background: linear-gradient(to bottom, #BFD255 0%, #8EB92A 50%, #72AA00 51%, #9ECB2D 100%) repeat scroll 0 0 transparent; diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 91324ee..7cedc01 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -84,20 +84,26 @@ kimchi.addNetworkActions = function(network) { $(".menu-container", "#" + network.name).toggle(false); var menu = $(evt.currentTarget).parent(); if ($(evt.currentTarget).attr("nwAct") === "start") { + $(".network-state", $("#" + network.name)).switchClass("down", "nw-loading"); + $("[nwAct='start']", menu).addClass("ui-state-disabled"); + $("[nwAct='delete']", menu).addClass("ui-state-disabled"); + $(":first-child", $("[nwAct='delete']", menu)).attr("disabled", true); kimchi.toggleNetwork(network.name, true, function() { $("[nwAct='start']", menu).addClass("hide-action-item"); + $("[nwAct='start']", menu).removeClass("ui-state-disabled"); $("[nwAct='stop']", menu).removeClass("hide-action-item"); - $("[nwAct='delete']", menu).addClass("ui-state-disabled"); - $(":first-child", $("[nwAct='delete']", menu)).attr("disabled", true); - $(".network-state", $("#" + network.name)).switchClass("down", "up"); + $(".network-state", $("#" + network.name)).switchClass("nw-loading", "up"); }); } else if ($(evt.currentTarget).attr("nwAct") === "stop") { + $(".network-state", $("#" + network.name)).switchClass("up", "nw-loading"); + $("[nwAct='stop']", menu).addClass("ui-state-disabled"); kimchi.toggleNetwork(network.name, false, function() { $("[nwAct='start']", menu).removeClass("hide-action-item"); $("[nwAct='stop']", menu).addClass("hide-action-item"); + $("[nwAct='stop']", menu).removeClass("ui-state-disabled"); $("[nwAct='delete']", menu).removeClass("ui-state-disabled"); $(":first-child", $("[nwAct='delete']", menu)).removeAttr("disabled"); - $(".network-state", $("#" + network.name)).switchClass("up", "down"); + $(".network-state", $("#" + network.name)).switchClass("nw-loading", "down"); }); } else if ($(evt.currentTarget).attr("nwAct") === "delete") { kimchi.confirm({ -- 1.8.5.3

2 2

[PATCHv3 0/5] Add volume reference count
by lvroyce＠linux.vnet.ibm.com 28 Feb '14

28 Feb '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Available volumes will be tracked by volume reference count. Add this field to storage volume, so that storage volume/pool action validation can rely on it. Royce Lv (5): Fix vm disk path when it does not have source element Add volume ref_cnt: update api.md Add volume ref_cnt: Update controller and json schema Add volume ref_cnt: Add model and mockmodel implementation Add volume ref_cnt: Update test docs/API.md | 3 +++ src/kimchi/API.json | 24 ++++++++++++++++++++++++ src/kimchi/control/storagevolumes.py | 1 + src/kimchi/i18n.py | 3 +++ src/kimchi/mockmodel.py | 3 +++ src/kimchi/model/storagevolumes.py | 31 +++++++++++++++++++++++++++++++ src/kimchi/model/vmstorages.py | 23 +++++++++++++---------- tests/test_model.py | 4 ++++ tests/test_rest.py | 2 ++ 9 files changed, 84 insertions(+), 10 deletions(-) -- 1.8.1.2

4 15

[PATCH ] Fix screenshots and debug reports paths.
by Leonardo Garcia 28 Feb '14

28 Feb '14

From: Leonardo Garcia <lagarcia(a)br.ibm.com> The definitions of the screenshots and debug reports paths in Cherrypy config were pointing to a relative path that, when concatenated with the root path defined in the [/] section, were not mapping to the correct path when Kimchi is installed through its RPM package. This fix removes the use of the root path in the [/] config section and specifies the absolute path for all resources. That way we can easily handle running Kimchi directly from the git source tree or after a package installation --- in the later case the paths will not always be relative to the same root path, but will rather be spread in the file system according to the unix file system standard. Signed-off-by: Leonardo Garcia <lagarcia(a)br.ibm.com> --- src/kimchi/server.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/kimchi/server.py b/src/kimchi/server.py index ef8e701..6c7dfc1 100644 --- a/src/kimchi/server.py +++ b/src/kimchi/server.py @@ -65,8 +65,6 @@ class Server(object): CACHEEXPIRES = 31536000 configObj = { '/': {'tools.trailing_slash.on': False, - 'tools.staticdir.root': paths.prefix, - 'tools.staticfile.root': paths.prefix, 'request.methods_with_bodies': ('POST', 'PUT'), 'tools.nocache.on': True, 'tools.sessions.on': True, @@ -77,45 +75,45 @@ class Server(object): 'tools.kimchiauth.on': False}, '/css': { 'tools.staticdir.on': True, - 'tools.staticdir.dir': 'ui/css', + 'tools.staticdir.dir': '%s/ui/css' % paths.prefix, 'tools.expires.on': True, 'tools.expires.secs': CACHEEXPIRES, 'tools.nocache.on': False }, '/js': { 'tools.staticdir.on': True, - 'tools.staticdir.dir': 'ui/js', + 'tools.staticdir.dir': '%s/ui/js' % paths.prefix, 'tools.expires.on': True, 'tools.expires.secs': CACHEEXPIRES, 'tools.nocache.on': False }, '/libs': { 'tools.staticdir.on': True, - 'tools.staticdir.dir': 'ui/libs', + 'tools.staticdir.dir': '%s/ui/libs' % paths.prefix, 'tools.expires.on': True, 'tools.expires.secs': CACHEEXPIRES, 'tools.nocache.on': False, }, '/images': { 'tools.staticdir.on': True, - 'tools.staticdir.dir': 'ui/images', + 'tools.staticdir.dir': '%s/ui/images' % paths.prefix, 'tools.nocache.on': False }, '/data/screenshots': { 'tools.staticdir.on': True, - 'tools.staticdir.dir': 'data/screenshots', + 'tools.staticdir.dir': config.get_screenshot_path(), 'tools.nocache.on': False }, '/data/debugreports': { 'tools.staticdir.on': True, - 'tools.staticdir.dir': 'data/debugreports', + 'tools.staticdir.dir': config.get_debugreports_path(), 'tools.nocache.on': False, 'tools.kimchiauth.on': True, 'tools.staticdir.content_types': {'xz': 'application/x-xz'} }, '/config/ui/tabs.xml': { 'tools.staticfile.on': True, - 'tools.staticfile.filename': 'config/ui/tabs.xml', + 'tools.staticfile.filename': '%s/config/ui/tabs.xml' % paths.prefix, 'tools.nocache.on': True }, '/favicon.ico': { @@ -124,7 +122,7 @@ class Server(object): }, '/help': { 'tools.staticdir.on': True, - 'tools.staticdir.dir': 'ui/pages/help', + 'tools.staticdir.dir': '%s/ui/pages/help' % paths.prefix, 'tools.nocache.on': False } } -- 1.8.5.3

8 12

[PATCH v3] UI: Host Software Update Support
by Hongliang Wang 28 Feb '14

28 Feb '14

Added UI support for software updating. The Host Tab will initially list available updates to user if there are any; or we will disable "Update All" Button if no updates available. V2 -> V3: 3a) Fixed "Update All" Button always being disabled issue (Thanks to Paulo and Aline's comment) 3b) Update REST API for update action according to back-end change 3c) Added in-progress message when system is being updated (Thanks to Aline's comment) V1 -> V2: 2a) Fixed "Update All" Button always being disabled issue (Thanks to Paulo Ricardo Paz Vital's comment) Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/host.css | 6 ++++++ ui/js/src/kimchi.api.js | 5 +++-- ui/js/src/kimchi.host.js | 12 ++++++++++-- ui/pages/tabs/host.html.tmpl | 1 + 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css index 1342ade..884a614 100644 --- a/ui/css/theme-default/host.css +++ b/ui/css/theme-default/host.css @@ -248,4 +248,10 @@ .software-update-arch { width: 190px; } + +.host-panel #software-updates-progress-textarea { + border: 1px solid #ddd; + height: 100px; + width: 846px; +} /* End of Software Updates */ diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index c3a9516..abbf00e 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -745,7 +745,7 @@ var kimchi = { }); }, - updateSoftwares : function(suc, err) { + updateSoftwares : function(suc, err, progress) { var taskID = -1; var onResponse = function(data) { taskID = data['id']; @@ -760,6 +760,7 @@ var kimchi = { var taskStatus = result['status']; switch(taskStatus) { case 'running': + progress && progress(result); setTimeout(function() { trackTask(); }, 200); @@ -776,7 +777,7 @@ var kimchi = { }; kimchi.requestJSON({ - url : kimchi.url + 'host/packagesupdate/update', + url : kimchi.url + 'host/swupdate', type : "POST", contentType : "application/json", dataType : "json", diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index b6a5878..d4016b5 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -144,9 +144,17 @@ kimchi.host_main = function() { disabled: true, onClick: function(event) { var updateButton = $(this); + var progressArea = $('#software-updates-progress-textarea')[0]; + $(progressArea).removeClass('hidden').text(''); + !kimchi.isElementInViewport(progressArea) && + progressArea.scrollIntoView(); $(updateButton).text(i18n['KCHUPD6007M']).prop('disabled', true); kimchi.updateSoftwares(function(result) { $(updateButton).text(i18n['KCHUPD6006M']).prop('disabled', false); + }, function() {}, function(result) { + $(progressArea).text(result['message']); + var scrollTop = $(progressArea).prop('scrollHeight'); + $(progressArea).prop('scrollTop', scrollTop); }); } }], @@ -189,8 +197,8 @@ kimchi.host_main = function() { initSoftwareUpdatesGrid(softwareUpdates); } - $(softwareUpdatesGridID + '-update-button') - .prop('disabled', softwareUpdates.length === 0); + var updateButton = $('#' + softwareUpdatesGridID + '-update-button'); + $(updateButton).prop('disabled', softwareUpdates.length === 0); }); }; diff --git a/ui/pages/tabs/host.html.tmpl b/ui/pages/tabs/host.html.tmpl index 1de4fcd..71f72c7 100644 --- a/ui/pages/tabs/host.html.tmpl +++ b/ui/pages/tabs/host.html.tmpl @@ -132,6 +132,7 @@ <div class="section-row"> <div class="section-value"> <div id="software-updates-grid-container"></div> + <textarea id="software-updates-progress-textarea" class="hidden" readonly></textarea> </div> </div> </div> -- 1.8.1.4

2 5

sosreport bug in FC20
by Shu Ming 28 Feb '14

28 Feb '14

Hi, When you do debugreport test on FC20, you may hit the following FC20 bug. It will cause the debugreport generation hang for a very long time. The workaround is to add "-n networking" in your sosreport command, see the diff below. --- a/src/kimchi/model/debugreports.py +++ b/src/kimchi/model/debugreports.py @@ -65,7 +65,7 @@ class DebugReportsModel(object): @staticmethod def sosreport_generate(cb, name): try: - command = ['sosreport', '--batch', '--name=%s' % name] + command = ['sosreport', '-n', 'networking', '--batch', '--name=%s' % name] output, error, retcode = run_command(command) if retcode < 0: The bug line in FC20 https://bugzilla.redhat.com/show_bug.cgi?id=1028102

2 4

[PATCH V2 0/6] Fix VM error messages handling
by Rodrigo Trujillo 27 Feb '14

27 Feb '14

V2: Fix tests V1: The Guest tab was not showing backend error messages properly. So user was not able to know what happened if a VM failed to start, stop, reset or delete. In order to fix this, both backend and frontend had to be changed. Rodrigo Trujillo (6): Fix vm start UI error return message Fix VM stop error messages handling (backend/UI) Fix VM reset (UI) error messages hnadling Fix VM delete error message handling (UI/Backend) Delete unsed _vm_exists funtion Fix Kimchi vm tests according to new messages sent from backend src/kimchi/i18n.py | 2 ++ src/kimchi/model/vms.py | 51 ++++++++++++++++++++---------------------- tests/test_model.py | 29 +++++++++++++++++++----- ui/js/src/kimchi.guest_main.js | 26 ++++++++++----------- ui/pages/i18n.html.tmpl | 1 + 5 files changed, 63 insertions(+), 46 deletions(-) -- 1.8.5.3

3 13

[PATCH] Fix VM's network model template for Power systems.
by Paulo Vital 27 Feb '14

27 Feb '14

Setup the network model to 'spapr-vlan' by default in those old distro vesions for new Power guests. Also, setup the modern distro version for Power guests: RHEL7.0 and Fedora 19. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- src/kimchi/osinfo.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 8ce4110..e8e9a65 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -41,7 +41,7 @@ template_specs = {'x86': {'old': dict(common_spec, disk_bus='ide', nic_model='virtio', sound_model= 'ich6')}, 'power': {'old': dict(common_spec, disk_bus='scsi', - nic_model='rtl8139', cdrom_bus='scsi', + nic_model='spapr-vlan', cdrom_bus='scsi', kbd_bus='usb', mouse_bus='usb'), 'modern': dict(common_spec, disk_bus='virtio', nic_model='virtio', @@ -49,10 +49,10 @@ template_specs = {'x86': {'old': dict(common_spec, disk_bus='ide', mouse_bus='usb')}} -modern_version_bases = {'debian': '6.0', 'ubuntu': '7.10', 'opensuse': '10.3', - 'centos': '5.3', 'rhel': '6.0', 'fedora': '16', - 'gentoo': '0'} - +modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10', + 'opensuse': '10.3', 'centos': '5.3', + 'rhel': '6.0', 'fedora': '16', 'gentoo': '0'}, + 'power': {'rhel': '7.0', 'fedora': '19'}} isolinks = { 'debian': { @@ -97,9 +97,10 @@ def lookup(distro, version): params['cdrom'] = isolinks.get(distro, {}).get(version, '') arch = _get_arch() - if distro in modern_version_bases: + if distro in modern_version_bases[arch]: params['icon'] = 'images/icon-%s.png' % distro - if LooseVersion(version) >= LooseVersion(modern_version_bases[distro]): + if LooseVersion(version) >= LooseVersion( + modern_version_bases[arch][distro]): params.update(template_specs[arch]['modern']) else: params.update(template_specs[arch]['old']) -- 1.8.3.1

2 1

[PATCH V4] Fix Add Network window
by Rodrigo Trujillo 27 Feb '14

27 Feb '14

VLans and Interfaces must only be available for selection if network type Bridge is selected. This restriction was not implemented in the UI. This patch fixes this problem. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.network.js | 22 +++++++++++++++++++++- ui/pages/tabs/network.html.tmpl | 20 +++++++++++--------- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index fa2319c..91324ee 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -207,11 +207,28 @@ kimchi.openNetworkDialog = function(okCallback) { $("#networkConfig").dialog("open"); }; +kimchi.enableBridgeOptions = function(enable) { + if (!enable) { + $("#enableVlan").prop("checked", false); + $("#networkVlanID").prop("disabled", true); + $("#networkVlanID").val(""); + $("#networkInterface").val(""); + $("#bridge-options").slideUp(100); + } else if (!$("#networkInterface").val()){ + $("#networkInterface").prop("selectedIndex", 0); + $("#bridge-options").slideDown(100); + } +}; + kimchi.setDefaultNetworkType = function(isInterfaceAvail) { $("#networkTypeBri").prop("checked", isInterfaceAvail); $("#networkTypeBri").prop("disabled", !isInterfaceAvail); - $("#networkInterface").prop("disabled", !isInterfaceAvail); $("#networkTypeNat").prop("checked", !isInterfaceAvail); + if (!isInterfaceAvail) { + kimchi.enableBridgeOptions(false); + } else { + $("#bridge-options").slideDown(100); + } }; kimchi.getNetworkDialogValues = function() { @@ -247,12 +264,15 @@ kimchi.setupNetworkFormEvent = function() { }); $("#networkTypeIso").on("click", function(event) { $("#networkInterface").prop("disabled", true); + kimchi.enableBridgeOptions(false); }); $("#networkTypeNat").on("click", function(event) { $("#networkInterface").prop("disabled", true); + kimchi.enableBridgeOptions(false); }); $("#networkTypeBri").on("click", function(event) { $("#networkInterface").prop("disabled", false); + kimchi.enableBridgeOptions(true); }); }; diff --git a/ui/pages/tabs/network.html.tmpl b/ui/pages/tabs/network.html.tmpl index afa6274..f298516 100644 --- a/ui/pages/tabs/network.html.tmpl +++ b/ui/pages/tabs/network.html.tmpl @@ -68,15 +68,17 @@ <input type="radio" id="networkTypeBri" name="networkType" value="bridged"> <label for="networkTypeBri">$_("Bridged: Virtual machines are connected to physical network directly")</label> </div> - <div class="destination"> - <label>$_("Destination"): </label> - <select id="networkInterface"></select> - </div> - <div class="VLAN"> - <label for="enableVlan">$_("Enable VLAN"): </label> - <input id="enableVlan" type="checkbox" value=""/> - <label>$_("VLAN ID"): </label> - <input type="text" id="networkVlanID" disabled> + <div id="bridge-options"> + <div class="destination"> + <label for="networkInterface">$_("Destination"): </label> + <select id="networkInterface"></select> + </div> + <div class="VLAN"> + <label for="enableVlan">$_("Enable VLAN"): </label> + <input id="enableVlan" type="checkbox" value=""/> + <label for="networkVlanID">$_("VLAN ID"): </label> + <input type="text" id="networkVlanID" disabled> + </div> </div> </div> </div> -- 1.8.5.3

2 1

[PATCH] Fix debug report creation in API.json
by lvroyce＠linux.vnet.ibm.com 27 Feb '14

27 Feb '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Because debug report creation name is mandatory, add this field to require. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/API.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/kimchi/API.json b/src/kimchi/API.json index f595bbf..153162d 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -37,6 +37,7 @@ "description": "The name for the debug report file.", "type": "string", "pattern": "^[A-Za-z0-9-]*$", + "required": true, "error": "KCHDR0007E" } } -- 1.8.1.2

4 3

[PATCH V1] Add another way to download the debugreport file in the test
by Shu Ming 27 Feb '14

27 Feb '14

Two urls are provided to download the files and we need test both --- tests/test_rest.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/test_rest.py b/tests/test_rest.py index ca96dc0..b2f2c6b 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -1460,6 +1460,10 @@ class RestTests(unittest.TestCase): self.assertEquals(200, resp.status) resp = request(host, port, '/debugreports/report1/content') self.assertEquals(200, resp.status) + resp = request(host, port, '/debugreports/report1') + debugre = json.loads(resp.read()) + resp = request(host, port, debugre['file']) + self.assertEquals(200, resp.status) def test_host(self): resp = self.request('/host').read() -- 1.8.1.4

3 2

[PATCH V1] Have a meaningful description for the exception test #81
by Shu Ming 27 Feb '14

27 Feb '14

This is what the case trys to test if a faked exception can be caught properly by the task thread. So a meaningful description is added to avoid confusing --- tests/test_rest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_rest.py b/tests/test_rest.py index ca96dc0..06ceeaf 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -73,7 +73,8 @@ class RestTests(unittest.TestCase): def _except_op(self, cb, opaque): time.sleep(1) - raise Exception("Oops") + raise Exception("Oops, this is an exception handle test." + " You can ignore it safely") cb('success', True) def _intermid_op(self, cb, opaque): -- 1.8.1.4

3 2

[PATCH] bug fix: check all Red Hat distributions for yum package management
by shaohef＠linux.vnet.ibm.com 27 Feb '14

27 Feb '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> There are several Red Hat distributions. use startswith("red hat") to check this is a Red Hat distributions. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/repositories.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/kimchi/repositories.py b/src/kimchi/repositories.py index 0ab0b1a..f0c6762 100644 --- a/src/kimchi/repositories.py +++ b/src/kimchi/repositories.py @@ -27,9 +27,7 @@ from kimchi.basemodel import Singleton from kimchi.exception import InvalidOperation, InvalidParameter from kimchi.exception import OperationFailed, NotFoundError, MissingParameter -YUM_DISTROS = ['fedora', 'red hat enterprise linux', - 'red hat enterprise linux server', 'opensuse ', - 'suse linux enterprise server '] +YUM_DISTROS = ['fedora', 'opensuse ', 'suse linux enterprise server '] APT_DISTROS = ['debian', 'ubuntu'] @@ -52,7 +50,7 @@ class Repositories(object): self._repo_storage = {} self._distro = platform.linux_distribution()[0].lower() - if (self._distro in YUM_DISTROS): + if (self._distro in YUM_DISTROS or self._distro.startswith('red hat')): self._pkg_mnger = YumRepo() elif (self._distro in APT_DISTROS): self._pkg_mnger = AptRepo() -- 1.8.4.2

4 3

[PATCH V2] Debug report file can not be found when downloading
by Shu Ming 27 Feb '14

27 Feb '14

Patchset 8bc4dded9 re-organized the various path generation for Kimchi. Unfortunately, the root static dir was changed which caused the static dir for debugreport file broken. To the user, he can not download the debugreport file generated. --- src/kimchi/mockmodel.py | 5 ++++- src/kimchi/model/debugreports.py | 5 ++++- src/kimchi/server.py | 12 ++++++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index b23a024..7aaf54d 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -305,7 +305,10 @@ class MockModel(object): ctime = os.stat(file_target).st_ctime ctime = time.strftime("%Y-%m-%d-%H:%M:%S", time.localtime(ctime)) file_target = os.path.split(file_target)[-1] - file_target = os.path.join("/data/debugreports", file_target) + + prefix = '/data/debugreports' + file_target = os.path.join(prefix, file_target) + return {'file': file_target, 'ctime': ctime} diff --git a/src/kimchi/model/debugreports.py b/src/kimchi/model/debugreports.py index 7573a5b..64ed8e8 100644 --- a/src/kimchi/model/debugreports.py +++ b/src/kimchi/model/debugreports.py @@ -164,7 +164,10 @@ class DebugReportModel(object): ctime = os.stat(file_target).st_ctime ctime = time.strftime("%Y-%m-%d-%H:%M:%S", time.localtime(ctime)) file_target = os.path.split(file_target)[-1] - file_target = os.path.join("/data/debugreports", file_target) + + prefix = '/data/debugreports' + file_target = os.path.join(prefix, file_target) + return {'file': file_target, 'ctime': ctime} diff --git a/src/kimchi/server.py b/src/kimchi/server.py index ef8e701..401136f 100644 --- a/src/kimchi/server.py +++ b/src/kimchi/server.py @@ -108,11 +108,10 @@ class Server(object): }, '/data/debugreports': { 'tools.staticdir.on': True, - 'tools.staticdir.dir': 'data/debugreports', 'tools.nocache.on': False, 'tools.kimchiauth.on': True, 'tools.staticdir.content_types': {'xz': 'application/x-xz'} - }, + }, '/config/ui/tabs.xml': { 'tools.staticfile.on': True, 'tools.staticfile.filename': 'config/ui/tabs.xml', @@ -129,7 +128,16 @@ class Server(object): } } + def __update_debugreport_config(self): + debug_dict = self.configObj['/data/debugreports'] + if paths.installed: + debug_path = os.path.join(paths.state_dir, 'debugreports') + debug_dict.update({'tools.staticdir.dir': debug_path}) + else: + debug_dict.update({'tools.staticdir.dir': 'data/debugreports'}) + def __init__(self, options): + self.__update_debugreport_config() make_dirs = [ os.path.dirname(os.path.abspath(options.access_log)), os.path.dirname(os.path.abspath(options.error_log)), -- 1.8.1.4

2 1

[PATCH V3] Fix Add Network window
by Rodrigo Trujillo 27 Feb '14

27 Feb '14

VLans and Interfaces must only be available for selection if network type Bridge is selected. This restriction was not implemented in the UI. This patch fixes this problem. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.network.js | 22 +++++++++++++++++++++- ui/pages/tabs/network.html.tmpl | 20 +++++++++++--------- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index faf1285..c0fe4ff 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -210,11 +210,28 @@ kimchi.openNetworkDialog = function(okCallback) { $("#networkConfig").dialog("open"); }; +kimchi.enableBridgeOptions = function(enable) { + if (!enable) { + $("#enableVlan").attr("checked", false); + $("#networkVlanID").prop("disabled", true); + $("#networkVlanID").val(""); + $("#networkInterface").val(""); + $("#bridge-options").slideUp(100); + } else if (!$("#networkInterface").val()){ + $("#networkInterface").prop("selectedIndex", 0); + $("#bridge-options").slideDown(100); + } +}; + kimchi.setDefaultNetworkType = function(isInterfaceAvail) { $("#networkTypeBri").prop("checked", isInterfaceAvail); $("#networkTypeBri").prop("disabled", !isInterfaceAvail); - $("#networkInterface").prop("disabled", !isInterfaceAvail); $("#networkTypeNat").prop("checked", !isInterfaceAvail); + if (!isInterfaceAvail) { + kimchi.enableBridgeOptions(false); + } else { + $("#bridge-options").slideDown(100); + } }; kimchi.getNetworkDialogValues = function() { @@ -250,12 +267,15 @@ kimchi.setupNetworkFormEvent = function() { }); $("#networkTypeIso").on("click", function(event) { $("#networkInterface").prop("disabled", true); + kimchi.enableBridgeOptions(false); }); $("#networkTypeNat").on("click", function(event) { $("#networkInterface").prop("disabled", true); + kimchi.enableBridgeOptions(false); }); $("#networkTypeBri").on("click", function(event) { $("#networkInterface").prop("disabled", false); + kimchi.enableBridgeOptions(true); }); }; diff --git a/ui/pages/tabs/network.html.tmpl b/ui/pages/tabs/network.html.tmpl index 83c1d7e..4340e19 100644 --- a/ui/pages/tabs/network.html.tmpl +++ b/ui/pages/tabs/network.html.tmpl @@ -71,15 +71,17 @@ <input type="radio" id="networkTypeBri" name="networkType" value="bridged"> <label for="networkTypeBri">$_("Bridged: Virtual machines are connected to physical network directly")</label> </div> - <div class="destination"> - <label>$_("Destination"): </label> - <select id="networkInterface"></select> - </div> - <div class="VLAN"> - <label for="enableVlan">$_("Enable VLAN"): </label> - <input id="enableVlan" type="checkbox" value=""/> - <label>$_("VLAN ID"): </label> - <input type="text" id="networkVlanID" disabled> + <div id=bridge-options> + <div class="destination"> + <label>$_("Destination"): </label> + <select id="networkInterface"></select> + </div> + <div class="VLAN"> + <label for="enableVlan">$_("Enable VLAN"): </label> + <input id="enableVlan" type="checkbox" value=""/> + <label>$_("VLAN ID"): </label> + <input type="text" id="networkVlanID" disabled> + </div> </div> </div> </div> -- 1.8.5.3

2 2

[PATCH] Set default combo box style to storage pool type list
by Aline Manera 26 Feb '14

26 Feb '14

From: Aline Manera <alinefm(a)br.ibm.com> While creating a new storage pool the supported types are listed in a combo box which does not have the default style used in Kimchi. Fix it. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- ui/css/theme-default/button.css | 4 ++++ ui/js/widgets/select-menu.js | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ui/css/theme-default/button.css b/ui/css/theme-default/button.css index 014ad20..3437c62 100644 --- a/ui/css/theme-default/button.css +++ b/ui/css/theme-default/button.css @@ -121,6 +121,10 @@ right: 10px; } +.btn .input { + margin-left: 10px; +} + /* Generated at http://colorzilla.com/gradient-editor/ */ .btn-tool { display: inline-block; diff --git a/ui/js/widgets/select-menu.js b/ui/js/widgets/select-menu.js index c213f3c..449104d 100644 --- a/ui/js/widgets/select-menu.js +++ b/ui/js/widgets/select-menu.js @@ -27,7 +27,7 @@ this.listControl.html(''); this.target = this.selectDiv.find('input').first(); this.label = this.selectDiv.find('span').first(); - this.selectDiv.addClass('btn-select dropdown popable'); + this.selectDiv.addClass('btn dropdown popable'); this.target.addClass('input'); this.label.addClass('input'); this.listControl.addClass('select-list'); @@ -75,7 +75,7 @@ }, destroy : function() { - this.selectDiv.removeClass('btn-select dropdown popable'); + this.selectDiv.removeClass('btn dropdown popable'); this.target.removeClass('input'); this.label.removeClass('input'); this.listControl.removeClass('select-list'); -- 1.7.10.4

2 2

[PATCHv2 0/3] Fix vm creation on readonly pool type
by lvroyce＠linux.vnet.ibm.com 26 Feb '14

26 Feb '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Some pool types (scsi, iscsi, mpath) do not allow create/delete storage volume, so it is wrong to delete these volumes when vm delete. Fix it by just delete non read only pool types. Royce Lv (3): Fix vm creation storage rollback clean Prevent volume create and delete for certain pool types Clear pep8 failure in make check src/kimchi/config.py.in | 3 +++ src/kimchi/control/base.py | 2 ++ src/kimchi/i18n.py | 1 + src/kimchi/isoinfo.py | 4 ++-- src/kimchi/model/storageservers.py | 4 ++-- src/kimchi/model/storagevolumes.py | 18 +++++++++++++++--- src/kimchi/model/vms.py | 14 ++++++-------- tests/test_model.py | 8 ++++---- 8 files changed, 35 insertions(+), 19 deletions(-) -- 1.8.1.2

3 7

[PATCH] Don't allow templates to be created with ISOs that won't be usable.
by Christy Perez 26 Feb '14

26 Feb '14

qemu can't use an ISO if 'other' can't execute all the directories containing the file. Return an error explaning this, and suggest the way to fix it. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- po/en_US.po | 6 ++++++ src/kimchi/exception.py | 4 ++++ src/kimchi/i18n.py | 2 ++ src/kimchi/utils.py | 9 +++++++++ src/kimchi/vmtemplate.py | 7 +++++-- 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/po/en_US.po b/po/en_US.po index ca1fe86..38af64c 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -674,6 +674,12 @@ msgid "Bad format while reading volume descriptor in ISO %(filename)s" msgstr "" #, python-format +msgid "The hypervisor doesn't have permission to use this ISO %(filename)s. \ + Consider moving it under /var/lib/libvirt, or \ + (not recommended) 'chmod -R o+x 'path_to_iso'." +msgstr "" + +#, python-format msgid "Virtual machine %(name)s already exists" msgstr "" diff --git a/src/kimchi/exception.py b/src/kimchi/exception.py index 2d974a8..263bd0c 100644 --- a/src/kimchi/exception.py +++ b/src/kimchi/exception.py @@ -75,6 +75,10 @@ class InvalidParameter(KimchiException): pass +class InvalidPermission(KimchiException): + pass + + class InvalidOperation(KimchiException): pass diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index fea0184..05b347c 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -57,6 +57,8 @@ messages = { "KCHISO0005E": _("Invalid El Torito boot indicator in ISO %(filename)s"), "KCHISO0006E": _("Unexpected volume type for primary volume in ISO %(filename)s"), "KCHISO0007E": _("Bad format while reading volume descriptor in ISO %(filename)s"), + "KCHISO0008E": _("The hypervisor doesn't have permission to use this ISO %(filename)s. \ + Consider moving it under /var/lib/libvirt, or (not recommended) 'chmod -R o+x 'path_to_iso'." ), "KCHVM0001E": _("Virtual machine %(name)s already exists"), "KCHVM0002E": _("Virtual machine %(name)s does not exist"), diff --git a/src/kimchi/utils.py b/src/kimchi/utils.py index 6be1c04..c325be3 100644 --- a/src/kimchi/utils.py +++ b/src/kimchi/utils.py @@ -27,6 +27,7 @@ import psutil import re import subprocess import urllib2 +import stat from threading import Timer from cherrypy.lib.reprconf import Parser @@ -234,3 +235,11 @@ def run_setfacl_set_attr(path, attr="r", user=""): set_user = ["setfacl", "--modify", "user:%s:%s" % (user, attr), path] out, error, ret = run_command(set_user) return ret == 0 + +def check_iso_path_perm(path): + """ + libvirt requires that all parent dirs have o+x + """ + if path == '/': return True + return os.stat(path).st_mode & stat.S_IXOTH and \ + check_iso_path_perm(os.path.dirname(path)) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index af07ee3..76ac772 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -29,9 +29,9 @@ import urlparse from kimchi import isoinfo from kimchi import osinfo -from kimchi.exception import InvalidParameter, IsoFormatError +from kimchi.exception import InvalidParameter, IsoFormatError, InvalidPermission from kimchi.isoinfo import IsoImage - +from kimchi.utils import check_iso_path_perm QEMU_NAMESPACE = "xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'" @@ -55,6 +55,9 @@ class VMTemplate(object): iso_distro = iso_version = 'unknown' iso = args.get('cdrom', '') + if iso.startswith('/') and \ + not check_iso_path_perm(os.path.dirname(iso)): + raise InvalidPermission("KCHISO0008E", {'filename': iso}) if scan and len(iso) > 0: iso_distro, iso_version = self.get_iso_info(iso) if not iso.startswith('/'): -- 1.8.5.3

4 4

[PATCH] bug fix: Make URI parameter is not None before encoding it
by Aline Manera 26 Feb '14

26 Feb '14

From: Aline Manera <alinefm(a)br.ibm.com> The following error is raised when the user tried to reboot the host system: Request Headers: AUTHORIZATION: Basic YWxpbmVmbTowaG5lKjI4ZGljSA== Content-Length: 2 HOST: localhost:8000 Remote-Addr: 127.0.0.1 ACCEPT: application/json USER-AGENT: curl/7.27.0 Content-Type: application/json [25/Feb/2014:14:05:28] HTTP Traceback (most recent call last): File "/usr/lib/python2.7/dist-packages/cherrypy/_cprequest.py", line 656, in respond response.body = self.handler() File "/usr/lib/python2.7/dist-packages/cherrypy/lib/encoding.py", line 188, in __call__ self.body = self.oldhandler(*args, **kwargs) File "/usr/lib/python2.7/dist-packages/cherrypy/_cpdispatch.py", line 34, in __call__ return self.callable(*self.args, **self.kwargs) File "/home/alinefm/kimchi/src/kimchi/control/base.py", line 79, in wrapper for arg in self.model_args]) AttributeError: 'NoneType' object has no attribute 'encode' It is because /host resource has no parameter and fails to encode() the None value. So fix it by verifying the parameter is not None in order to make the encode() call. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/control/base.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/kimchi/control/base.py b/src/kimchi/control/base.py index 91a70ae..5d1f380 100644 --- a/src/kimchi/control/base.py +++ b/src/kimchi/control/base.py @@ -75,9 +75,13 @@ class Resource(object): fn = getattr(self.model, model_fn(self, action_name)) ident = fn(*model_args) self._redirect(ident) - uri_params = tuple([urllib2.quote(arg.encode('utf-8'), safe="") - for arg in self.model_args]) - raise internal_redirect(self.uri_fmt % uri_params) + uri_params = [] + for arg in self.model_args: + if arg is None: + arg = '' + uri_params.append(urllib2.quote(arg.encode('utf-8'), + safe="")) + raise internal_redirect(self.uri_fmt % tuple(uri_params)) except MissingParameter, e: raise cherrypy.HTTPError(400, e.message) except InvalidParameter, e: -- 1.7.10.4

3 5

[PATCH] run_command: log error messages using higher log level when return code is non-zero
by zhshzhou＠linux.vnet.ibm.com 26 Feb '14

26 Feb '14

From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> run_command logs stdout and stderr output using the "debug" level. In this patch, if returncode is non-zero, it logs stderr output using the "error" level. It's helpful for diagnosing underlying command errors. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/utils.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/kimchi/utils.py b/src/kimchi/utils.py index d4ab1a1..e89a93f 100644 --- a/src/kimchi/utils.py +++ b/src/kimchi/utils.py @@ -169,8 +169,13 @@ def run_command(cmd, timeout=None): out, error = proc.communicate() kimchi_log.debug("Run command: '%s'", " ".join(cmd)) - if out or error: - kimchi_log.debug("out:\n %s\nerror:\n %s", out, error) + if out: + kimchi_log.debug("out:\n%s", out) + + if proc.returncode != 0: + kimchi_log.error("rc: %s\nerror:\n%s", proc.returncode, error) + elif error: + kimchi_log.debug("error:\n%s", error) if timeout_flag[0]: msg = ("subprocess is killed by signal.SIGKILL for " -- 1.8.5.3

5 4

[PATCH] Fix tests: restore the monkey patch after testing Paths
by Mark Wu 26 Feb '14

26 Feb '14

To test path vars, we monkey patched the method get_prefix of Paths, but not restored. Because of it, the other test cases, like test_plugin, fail to pass. This patch restores the change on teardown. Reported-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- tests/test_config.py.in | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/test_config.py.in b/tests/test_config.py.in index 3b9ebdc..0400645 100644 --- a/tests/test_config.py.in +++ b/tests/test_config.py.in @@ -25,6 +25,17 @@ import unittest from kimchi.config import Paths, PluginPaths +get_prefix = None + + +def setUpModule(): + global get_prefix + get_prefix = Paths.get_prefix + + +def tearDownModule(): + Paths.get_prefix = PluginPaths.get_prefix = get_prefix + class ConfigTests(unittest.TestCase): def assertInstalledPath(self, actual, expected): -- 1.8.4.2

3 2