March 2014 - Kimchi-devel - oVirt List Archives

[PATCH v2] storage volume: fix xml parsing of logical volume format type
by zhshzhou＠linux.vnet.ibm.com 06 Mar '14

06 Mar '14

From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> Not all types of libvirt storage volume provide format information. Particularly, the volume in logical pool doesn't have format information in the dumped XML description. StorageVolumeModel.lookup assumes there is a format tag, but for logical pool volumes it does not exist. So an exception is raised when it lookup a logical volume. To trigger this problem, firstly create a guest using a logical pool. Then click the logical pool from the "storage" tab, and it would fail to list the volumes. This patch catches the exception when parsing the format tag, and returns an 'raw' for the format attribute if there is no available format information in the XML. v2 Return 'raw' instead of return empty string, because the only supported volume format of a logical pool is 'raw'. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/model/storagevolumes.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index 442ff89..6811e15 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -113,7 +113,14 @@ class StorageVolumeModel(object): path = vol.path() info = vol.info() xml = vol.XMLDesc(0) - fmt = xmlutils.xpath_get_text(xml, "/volume/target/format/@type")[0] + try: + fmt = xmlutils.xpath_get_text( + xml, "/volume/target/format/@type")[0] + except IndexError: + # Not all types of libvirt storage can provide volume format + # infomation. When there is no format information, we assume + # it's 'raw'. + fmt = 'raw' res = dict(type=VOLUME_TYPE_MAP[info[0]], capacity=info[1], allocation=info[2], -- 1.8.5.3

5 6

[PATCH] issue #330: Make sure exception argument is a string to convert it to unicode
by Aline Manera 06 Mar '14

06 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> The unicode() operation is only available for strings. So make sure the exception argument is a string before converting it to unicode. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/exception.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/exception.py b/src/kimchi/exception.py index 71a4d11..74134be 100644 --- a/src/kimchi/exception.py +++ b/src/kimchi/exception.py @@ -51,7 +51,7 @@ class KimchiException(Exception): for key, value in args.iteritems(): if not isinstance(value, unicode): - args[key] = unicode(value, 'utf-8') + args[key] = unicode(str(value), 'utf-8') return unicode(translation.gettext(text), 'utf-8') % args -- 1.7.10.4

2 2

[PATCH] issue #312: Check volume group exists while creating a logical pool
by Aline Manera 06 Mar '14

06 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> When creating a logical storage pool, a volume group is created with the same name. And when deleting the storage pool the volume group keeps on the system. Which is the correct behavior as the storage pool is only a concept and deleting it should not affect the file system. To avoid problems while creating a pool with an existent volume group name, verify if a volume group exists with the given pool name and if so, warn the user about it. Also convert an error message parameter to string instead of virStoragePool instance and update the po files as new messages were added. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- po/en_US.po | 12 +++++++++++- po/kimchi.pot | 12 +++++++++++- po/pt_BR.po | 12 +++++++++++- po/zh_CN.po | 12 +++++++++++- src/kimchi/i18n.py | 2 +- src/kimchi/model/storagepools.py | 19 ++++++++++++++++++- 6 files changed, 63 insertions(+), 6 deletions(-) diff --git a/po/en_US.po b/po/en_US.po index d9df56d..23881da 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-03-03 17:18-0300\n" +"POT-Creation-Date: 2014-03-05 17:45-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" @@ -985,6 +985,12 @@ msgid "Unable to delete pool %(name)s as it is associated with some templates" msgstr "" #, python-format +msgid "" +"A volume group named '%(name)s' already exists. Please, choose another name " +"to create the logical pool." +msgstr "" + +#, python-format msgid "Storage volume %(name)s already exists" msgstr "" @@ -1037,6 +1043,10 @@ msgid "Unable to resize storage volume %(name)s. Details: %(err)s" msgstr "" #, python-format +msgid "Storage type %(type)s does not support volume create and delete" +msgstr "" + +#, python-format msgid "Interface %(name)s does not exist" msgstr "" diff --git a/po/kimchi.pot b/po/kimchi.pot index df89712..06236d2 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-03-03 17:18-0300\n" +"POT-Creation-Date: 2014-03-05 17:45-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" @@ -972,6 +972,12 @@ msgid "Unable to delete pool %(name)s as it is associated with some templates" msgstr "" #, python-format +msgid "" +"A volume group named '%(name)s' already exists. Please, choose another name " +"to create the logical pool." +msgstr "" + +#, python-format msgid "Storage volume %(name)s already exists" msgstr "" @@ -1024,6 +1030,10 @@ msgid "Unable to resize storage volume %(name)s. Details: %(err)s" msgstr "" #, python-format +msgid "Storage type %(type)s does not support volume create and delete" +msgstr "" + +#, python-format msgid "Interface %(name)s does not exist" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index f00edd8..06db056 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-03-03 17:18-0300\n" +"POT-Creation-Date: 2014-03-05 17:45-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" @@ -1000,6 +1000,12 @@ msgid "Unable to delete pool %(name)s as it is associated with some templates" msgstr "" #, python-format +msgid "" +"A volume group named '%(name)s' already exists. Please, choose another name " +"to create the logical pool." +msgstr "" + +#, python-format msgid "Storage volume %(name)s already exists" msgstr "" @@ -1052,6 +1058,10 @@ msgid "Unable to resize storage volume %(name)s. Details: %(err)s" msgstr "" #, python-format +msgid "Storage type %(type)s does not support volume create and delete" +msgstr "" + +#, python-format msgid "Interface %(name)s does not exist" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 366c6bf..38a3c6c 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-03-03 17:18-0300\n" +"POT-Creation-Date: 2014-03-05 17:45-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" @@ -990,6 +990,12 @@ msgid "Unable to delete pool %(name)s as it is associated with some templates" msgstr "" #, python-format +msgid "" +"A volume group named '%(name)s' already exists. Please, choose another name " +"to create the logical pool." +msgstr "" + +#, python-format msgid "Storage volume %(name)s already exists" msgstr "" @@ -1042,6 +1048,10 @@ msgid "Unable to resize storage volume %(name)s. Details: %(err)s" msgstr "" #, python-format +msgid "Storage type %(type)s does not support volume create and delete" +msgstr "" + +#, python-format msgid "Interface %(name)s does not exist" msgstr "" diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 36785e6..cbfcf5d 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -138,7 +138,7 @@ messages = { "KCHPOOL0033E": _("Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is unreachable."), "KCHPOOL0034E": _("Unable to deactivate pool %(name)s as it is associated with some templates"), "KCHPOOL0035E": _("Unable to delete pool %(name)s as it is associated with some templates"), - + "KCHPOOL0036E": _("A volume group named '%(name)s' already exists. Please, choose another name to create the logical pool."), "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 8edf62e..3ae62cf 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -71,6 +71,22 @@ class StoragePoolsModel(object): if name == ISO_POOL_NAME: raise InvalidOperation("KCHPOOL0031E") + # The user may want to create a logical pool with the same name + # used before but a volume group will already exist with this name + # So check the volume group does not exist to create the pool + if params['type'] == 'logical': + vgdisplay_cmd = ['vgdisplay', name] + output, error, returncode = run_command(vgdisplay_cmd) + # From vgdisplay error codes: + # 1 error reading VGDA + # 2 volume group doesn't exist + # 3 not all physical volumes of volume group online + # 4 volume group not found + # 5 no volume groups found at all + # 6 error reading VGDA from lvmtab + if returncode not in [2, 4, 5]: + raise InvalidOperation("KCHPOOL0036E", {'name': name}) + if params['type'] == 'kimchi-iso': task_id = self._do_deep_scan(params) @@ -172,7 +188,8 @@ class StoragePoolModel(object): return 0 except libvirt.libvirtError as e: raise OperationFailed("KCHPOOL0008E", - {'name': pool, 'err': e.get_error_message()}) + {'name': pool.name(), + 'err': e.get_error_message()}) def _get_storage_source(self, pool_type, pool_xml): source = {} -- 1.7.10.4

3 4

[PATCH] issue #330: Properly log the error message when login fails
by Aline Manera 06 Mar '14

06 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> The error message and all its parameters must be string. So convert error code to string in order to accomplish it. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/auth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/auth.py b/src/kimchi/auth.py index af3b610..b16f2db 100644 --- a/src/kimchi/auth.py +++ b/src/kimchi/auth.py @@ -107,7 +107,7 @@ def authenticate(username, password, service="passwd"): try: auth.authenticate() except PAM.error, (resp, code): - msg_args = {'userid': username, 'code': code} + msg_args = {'userid': username, 'code': str(code)} raise OperationFailed("KCHAUTH0001E", msg_args) return True -- 1.7.10.4

5 16

[PATCH] Refreshing an inactive pool causes exception
by Shu Ming 06 Mar '14

06 Mar '14

When an update request to extend a inactive storagepool is finished sucessfully, an exception will be raised complaining the pool is inactive. The exception response to the clinet is quite misleading for a successful request. --- src/kimchi/model/storagepools.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model/storagepools.py b/src/kimchi/model/storagepools.py index 8edf62e..b666209 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -272,7 +272,8 @@ class StoragePoolModel(object): 'err': error}) # refreshing pool state pool = self.get_storagepool(pool_name, self.conn) - pool.refresh(0) + if pool.isActive(): + pool.refresh(0) def update(self, name, params): pool = self.get_storagepool(name, self.conn) -- 1.8.1.4

3 2

[PATCH V3 0/3] Support ppc64 isos in Templates
by Rodrigo Trujillo 06 Mar '14

06 Mar '14

V3: - Modify test cases V2: - Sort UI list of remote distros - Change names of Fedora distros - Allow ISOs of similar architectures but with different names to be displayed, like (amd64 and x86_64) V1: If Kimchi server is running in a PPC machine, the guests should be PPC. Currently, when user tries to create a template, only x86 isos are showed to user. This patch filters the ISOs, and also, adds ARCH to UI. -- 1.8.5.3

3 5

[PATCH V2 0/2] Support ppc64 isos in Templates
by Rodrigo Trujillo 06 Mar '14

06 Mar '14

V2: - Sort UI list of remote distros - Change names of Fedora distros - Allow ISOs of similar architectures but with different names to be displayed, like (amd64 and x86_64) V1: If Kimchi server is running in a PPC machine, the guests should be PPC. Currently, when user tries to create a template, only x86 isos are showed to user. This patch filters the ISOs, and also, adds ARCH to UI. Rodrigo Trujillo (2): Support ppc64 isos in Templates: Add arch and urls to distro jsons Support ppc64 isos in Templates: Filter remote isos and change UI src/distros.d/debian.json | 1 + src/distros.d/fedora.json | 30 +++++++++++++++++++++++++++--- src/distros.d/gentoo.json | 1 + src/distros.d/opensuse.json | 1 + src/distros.d/ubuntu.json | 2 ++ src/kimchi/distroloader.py | 10 +++++++++- src/kimchi/model/config.py | 2 +- ui/pages/template-add.html.tmpl | 8 ++++++-- 8 files changed, 48 insertions(+), 7 deletions(-) -- 1.8.5.3

1 3

[PATCH V3 0/3] let session expire when request access periodically
by shaohef＠linux.vnet.ibm.com 06 Mar '14

06 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V2 -> V3 raise 401 http error when expire. Set the timeout of sessions 10 minutes explicitly. V1 -> V2 Address ming's comment, raise 403 http error when expire. Send UI patch. UI still need to improve as Adam king said. Hong Liang will improve it. ShaoHe Feng (3): add timeout for sessions auth enhancement: expire the session when the request access periodically UI: set kimchi robot header for some request. src/kimchi/auth.py | 13 +++++++++++++ src/kimchi/config.py.in | 4 ++++ ui/js/src/kimchi.api.js | 2 ++ 3 files changed, 19 insertions(+) -- 1.8.4.2

4 7

[PATCH V3 0/4] et session expire when request access periodically
by shaohef＠linux.vnet.ibm.com 06 Mar '14

06 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V3 -> V4 updage test case V2 -> V3 raise 401 http error when expire. Set the timeout of sessions 10 minutes explicitly. V1 -> V2 Address ming's comment, raise 403 http error when expire. Send UI patch. UI still need to improve as Adam king said. Hong Liang will improve it. ShaoHe Feng (4): add timeout for sessions auth enhancement: expire the session when the request access periodically UI: set kimchi robot header for some request. session expire: update test case src/kimchi/auth.py | 13 +++++++++++++ src/kimchi/config.py.in | 4 ++++ tests/test_config.py.in | 2 ++ ui/js/src/kimchi.api.js | 2 ++ 4 files changed, 21 insertions(+) -- 1.8.4.2

4 11

[PATCH 0/2] Support ppc64 isos in Templates
by Rodrigo Trujillo 06 Mar '14

06 Mar '14

If Kimchi server is running in a PPC machine, the guests should be PPC. Currently, when user tries to create a template, only x86 isos are showed to user. This patch filters the ISOs, and also, adds ARCH to UI. Rodrigo Trujillo (2): Support ppc64 isos in Templates: Add arch and urls to distro jsons Support ppc64 isos in Templates: Filter remote isos and change UI src/distros.d/debian.json | 1 + src/distros.d/fedora.json | 24 ++++++++++++++++++++++++ src/distros.d/gentoo.json | 1 + src/distros.d/opensuse.json | 1 + src/distros.d/ubuntu.json | 2 ++ src/kimchi/distroloader.py | 3 ++- ui/pages/template-add.html.tmpl | 3 +++ 7 files changed, 34 insertions(+), 1 deletion(-) -- 1.8.5.3

4 7

[PATCH] Issue #337: add CentOS support to yum repositories list
by shaohef＠linux.vnet.ibm.com 06 Mar '14

06 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> CentOS use yum to manage repositories Issue: https://github.com/kimchi-project/kimchi/issues/337 Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/repositories.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/repositories.py b/src/kimchi/repositories.py index 2e70008..bb6ca1a 100644 --- a/src/kimchi/repositories.py +++ b/src/kimchi/repositories.py @@ -24,7 +24,7 @@ from kimchi.basemodel import Singleton from kimchi.exception import InvalidOperation, InvalidParameter from kimchi.exception import OperationFailed, NotFoundError, MissingParameter -YUM_DISTROS = ['fedora', 'opensuse ', 'suse linux enterprise server '] +YUM_DISTROS = ['fedora', 'opensuse ', 'suse linux enterprise server ', 'centos'] APT_DISTROS = ['debian', 'ubuntu'] -- 1.8.4.2

1 0

[PATCH] storage volume: fix xml parsing of logical volume format type
by zhshzhou＠linux.vnet.ibm.com 05 Mar '14

05 Mar '14

From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> Not all types of libvirt storage volume provide format information. Particularly, the volume in logical pool doesn't have format information in the dumped XML description. StorageVolumeModel.lookup assumes there is a format tag, but for logical pool volumes it does not exist. So an exception is raised when it lookup a logical volume. To trigger this problem, firstly create a guest using a logical pool. Then click the logical pool from the "storage" tab, and it would fail to list the volumes. This patch catches the exception when parsing the format tag, and returns an empty string for the format attribute if there is no available format information in the XML. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/model/storagevolumes.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index 442ff89..6d0e884 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -113,7 +113,13 @@ class StorageVolumeModel(object): path = vol.path() info = vol.info() xml = vol.XMLDesc(0) - fmt = xmlutils.xpath_get_text(xml, "/volume/target/format/@type")[0] + try: + fmt = xmlutils.xpath_get_text( + xml, "/volume/target/format/@type")[0] + except IndexError: + # Not all types of libvirt storage can provide volume format + # infomation. + fmt = '' res = dict(type=VOLUME_TYPE_MAP[info[0]], capacity=info[1], allocation=info[2], -- 1.8.5.3

4 4

[PATCHv5 0/6] Add volume reference count
by lvroyce＠linux.vnet.ibm.com 05 Mar '14

05 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Tested: 1. sudo make check 2. from UI: list storage volumes and unrefered volume ref_cnt is 0, ref_cnt for refered ones are 1. 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 (6): 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 Multiple pep8 fixes docs/API.md | 3 +++ src/kimchi/API.json | 25 +++++++++++++++++++++++++ src/kimchi/control/storagevolumes.py | 1 + src/kimchi/i18n.py | 4 ++++ src/kimchi/mockmodel.py | 10 +++++++--- src/kimchi/model/debugreports.py | 2 +- src/kimchi/model/storagevolumes.py | 30 ++++++++++++++++++++++++++++++ src/kimchi/model/templates.py | 2 +- src/kimchi/model/vmstorages.py | 23 +++++++++++++---------- tests/test_model.py | 4 ++++ tests/test_rest.py | 2 ++ 11 files changed, 91 insertions(+), 15 deletions(-) -- 1.8.1.2

3 8

[PATCH] issue #312: Rename LVM while deleting logical storage pool
by Aline Manera 05 Mar '14

05 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> When creating a Logical storage pool, a LVM is created with the same name. And when deleting the storage pool the LVM keeps on the system. Which is the correct behavior as the storage pool is only a concept and deleting it should not affect the file system. But it prevents the user to create a new logical pool with a name used before which is odd. So when deleting a logical pool, rename the LVM to a single name to allow user create a logical pool with any name. Also convert an error message parameter to string instead of virStoragePool instance. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/model/storagepools.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model/storagepools.py b/src/kimchi/model/storagepools.py index 76ab2d6..dd3c9a2 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -17,6 +17,8 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +import time + import libvirt from kimchi import xmlutils @@ -172,7 +174,8 @@ class StoragePoolModel(object): return 0 except libvirt.libvirtError as e: raise OperationFailed("KCHPOOL0008E", - {'name': pool, 'err': e.get_error_message()}) + {'name': pool.name(), + 'err': e.get_error_message()}) def _get_storage_source(self, pool_type, pool_xml): source = {} @@ -348,7 +351,17 @@ class StoragePoolModel(object): if pool.isActive(): raise InvalidOperation("KCHPOOL0005E", {'name': name}) try: + xml = pool.XMLDesc(0) + pool_type = xmlutils.xpath_get_text(xml, "/pool/@type")[0] pool.undefine() + # The user may want to create a logical pool with the same name + # used before but a LVM will already exist with this name + # So rename the former LVM to avoid future conflicts + if pool_type == 'logical': + lvm_name = "%s-%s" % (name, str(int(time.time()*1000))) + vgrename_cmd = ["vgrename", name, lvm_name] + run_command(vgrename_cmd) + except libvirt.libvirtError as e: raise OperationFailed("KCHPOOL0011E", {'name': name, 'err': e.get_error_message()}) -- 1.7.10.4

3 5

[PATCH V2] Issue #333
by shaohef＠linux.vnet.ibm.com 05 Mar '14

05 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V1 -> V2 improve commit message. ShaoHe Feng (1): Issue #333: do not encode error.html when the cherrpy version less than '3.2.5' src/kimchi/root.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 1.8.4.2

4 4

[RFC] upgrade CherryPy version.
by Sheldon 05 Mar '14

05 Mar '14

Now there's a issue: https://github.com/kimchi-project/kimchi/issues/333 The reason of this issue is because high level cherrpy version make some change about set_response. The high level cherrpy encode the unicode error message by itself. So the kimchi do not encode the unicode error message any more. It is right, the cherrpy should encode the unicode error message. Now we can require the cherrypy version to solve this problem. we can also check the cherrypy version in kimchi code as follow in order to avoid to require the cherrypy version. like: if cherrypy.__version__ << 3.2.5: return res else: return res.encode("utf-8") -- Thanks and best regards! Sheldon Feng(冯少合)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

4 7

[PATCH 0/2] Make vms model singleton
by lvroyce＠linux.vnet.ibm.com 05 Mar '14

05 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> When using get_list function of vms model, Background Task will run multiple times because of started in vm init function. Fix this by making vms model singleton. Royce Lv (2): Make vm model to be a singleton Hack test_model to support vm model singleton src/kimchi/model/vms.py | 3 +++ tests/test_model.py | 2 ++ 2 files changed, 5 insertions(+) -- 1.8.1.2

5 8

[PATCH] bug fix: Allow extend a logical pool
by Aline Manera 05 Mar '14

05 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> While trying to extend a logical pool I got the following error message: "/dev/vdb is not a valid disk/partition. Could not add it to the pool my-logical-pool" But the same partition "/dev/vdb" is listed on GET /host/partitions. Then I realized the "blkid" is not the correct command to check a partition exists for raw disks. >From blkid man page: It can determine the type of content (e.g. filesystem or swap) that a block device holds, and also attributes (tokens, NAME=value pairs) from the content metadata (e.g. LABEL or UUID fields). Which is not useful for a raw disk. >From lsblk man page: lsblk lists information about all or the specified block devices. So use "lsblk" command instead of "blkid" to verify the disk exists in the system. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/model/storagepools.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model/storagepools.py b/src/kimchi/model/storagepools.py index 76ab2d6..d012ca9 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -254,7 +254,7 @@ class StoragePoolModel(object): def _update_lvm_disks(self, pool_name, disks): # check if all the disks/partitions exists in the host for disk in disks: - blkid_cmd = ['blkid', disk] + blkid_cmd = ['lsblk', disk] output, error, returncode = run_command(blkid_cmd) if returncode != 0: kimchi_log.error('%s is not a valid disk/partition. Could not ' @@ -281,6 +281,7 @@ class StoragePoolModel(object): pool.setAutostart(1) else: pool.setAutostart(0) + if 'disks' in params: # check if pool is type 'logical' xml = pool.XMLDesc(0) -- 1.7.10.4

2 3

[PATCH v2 0/4] [UI] CDROM Management in a VM
by Hongliang Wang 05 Mar '14

05 Mar '14

Allow user to manipulate CDROM(s) in a VM: 1) Attach one or more CDROM(s); 2) Replace a CDROM with another ISO file path; 3) Detach a CDROM from a VM. Tested on Chrome. Please apply the following patch first: * [UI] Window - Correct Footer Height v1 -> v2: 2a) Separate one patch into 4 small ones to make it easier to review (Thanks to Ramon Medeiros's comment) 2b) Updated API calling to list CDROM (Thanks to Aline's comment) 2c) Separated VM updating window into 2 parts: general and storage (Thanks to Aline's comment) 2d) Enhanced UI to allow user trigger replace CDROM window by clicking ISO file path text box 2e) Changed uneditable fields from readonly to disabled 2f) Removed authors infomation (Thanks to Aline's comment) Hongliang Wang (4): [UI] Add CDROM-related APIs [UI] Add i18n Variables for CDROM-related Function [UI] Add/Edit CDROM Support [UI] Attach/Replace/Detach a CDROM to/in/from a VM ui/css/theme-default/guest-cdrom-add.css | 62 +++++++++++ ui/css/theme-default/guest-cdrom-edit.css | 62 +++++++++++ ui/css/theme-default/guest-edit.css | 108 +++++++++++++++--- ui/images/theme-default/guest-icon-sprite.png | Bin 0 -> 6748 bytes ui/js/src/kimchi.api.js | 74 +++++++++++++ ui/js/src/kimchi.guest_cdrom_add_main.js | 79 +++++++++++++ ui/js/src/kimchi.guest_cdrom_edit_main.js | 87 +++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 75 ++++++++++++- ui/pages/guest-cdrom-add.html.tmpl | 73 ++++++++++++ ui/pages/guest-cdrom-edit.html.tmpl | 73 ++++++++++++ ui/pages/guest-edit.html.tmpl | 153 +++++++++++++++++--------- ui/pages/i18n.html.tmpl | 5 + 12 files changed, 778 insertions(+), 73 deletions(-) create mode 100644 ui/css/theme-default/guest-cdrom-add.css create mode 100644 ui/css/theme-default/guest-cdrom-edit.css create mode 100644 ui/images/theme-default/guest-icon-sprite.png create mode 100644 ui/js/src/kimchi.guest_cdrom_add_main.js create mode 100644 ui/js/src/kimchi.guest_cdrom_edit_main.js create mode 100644 ui/pages/guest-cdrom-add.html.tmpl create mode 100644 ui/pages/guest-cdrom-edit.html.tmpl -- 1.8.1.4

4 17

[PATCH v5] UI: Software Update Support
by Hongliang Wang 05 Mar '14

05 Mar '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. Please apply following patch first: * [PATCH] [UI] Grid Widget - Enable/Disable Row Selection v4 -> v5: 5a) Disable row selection in software update grid (Thanks to Royce's comment) v3 -> v4: 4a) Added the last update output (Thanks to Aline's comment) 4b) Disabled horizontal resize function of output textarea (Thanks to Aline's comment) 4c) Added "Update Progress" label to the output textarea (Thanks to Aline's comment) 4d) Added refreshing the software grid after updating is finished (Thanks to Aline's comment) 4e) Added software updates grid cleanup when host tab is unloaded v2 -> v3: 3a) Fixed "Update All" Button always being disabled issue (Thanks to Paulo and Aline's comment) 3b) Updated REST API calling 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 | 29 ++++++++++++++ ui/js/src/kimchi.api.js | 53 ++++++++++++++++++++++++++ ui/js/src/kimchi.host.js | 89 +++++++++++++++++++++++++++++++++++++++++++ ui/pages/i18n.html.tmpl | 10 +++++ ui/pages/tabs/host.html.tmpl | 17 +++++++++ 5 files changed, 198 insertions(+) diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css index 470ed1b..0f8b941 100644 --- a/ui/css/theme-default/host.css +++ b/ui/css/theme-default/host.css @@ -224,3 +224,32 @@ width: 300px; } /* End of Debug Report */ + +/* Software Updates */ +.host-panel #software-updates-grid { + border-color: #ddd; + height: 300px; + width: 850px; +} + +.software-update-id { + width: 30px; +} + +.software-update-name, +.software-update-repos { + width: 220px; +} + +.software-update-version, +.software-update-arch { + width: 190px; +} + +.host-panel #software-updates-progress-textarea { + border: 1px solid #ddd; + height: 100px; + resize: vertical; + width: 846px; +} +/* End of Software Updates */ diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index fdd9cfc..beaf314 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -727,5 +727,58 @@ var kimchi = { success : suc, error : err }); + }, + + listSoftwareUpdates : function(suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'host/packagesupdate', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend: true, + success : suc, + error : err + }); + }, + + updateSoftwares : function(suc, err, progress) { + var taskID = -1; + var onResponse = function(data) { + taskID = data['id']; + trackTask(); + }; + + var trackTask = function() { + kimchi.getTask(taskID, onTaskResponse, err); + }; + + var onTaskResponse = function(result) { + var taskStatus = result['status']; + switch(taskStatus) { + case 'running': + progress && progress(result); + setTimeout(function() { + trackTask(); + }, 200); + break; + case 'finished': + suc(result); + break; + case 'failed': + err(result); + break; + default: + break; + } + }; + + kimchi.requestJSON({ + url : kimchi.url + 'host/swupdate', + type : "POST", + contentType : "application/json", + dataType : "json", + success : onResponse, + error : err + }); } }; diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index 7974054..e146a75 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -133,6 +133,88 @@ kimchi.host_main = function() { }); }; + var softwareUpdatesGridID = 'software-updates-grid'; + var softwareUpdatesGrid = null; + var progressAreaID = 'software-updates-progress-textarea'; + var reloadProgressArea = function(result) { + var progressArea = $('#' + progressAreaID)[0]; + $(progressArea).text(result['message']); + var scrollTop = $(progressArea).prop('scrollHeight'); + $(progressArea).prop('scrollTop', scrollTop); + }; + + var initSoftwareUpdatesGrid = function(softwareUpdates) { + softwareUpdatesGrid = new kimchi.widget.Grid({ + container: 'software-updates-grid-container', + id: softwareUpdatesGridID, + title: i18n['KCHUPD6001M'], + rowSelection: 'disabled', + toolbarButtons: [{ + id: softwareUpdatesGridID + '-update-button', + label: i18n['KCHUPD6006M'], + disabled: true, + onClick: function(event) { + var updateButton = $(this); + var progressArea = $('#' + progressAreaID)[0]; + $('#software-updates-progress-container').removeClass('hidden'); + $(progressArea).text(''); + !kimchi.isElementInViewport(progressArea) && + progressArea.scrollIntoView(); + $(updateButton).text(i18n['KCHUPD6007M']).prop('disabled', true); + + kimchi.updateSoftwares(function(result) { + reloadProgressArea(result); + $(updateButton).text(i18n['KCHUPD6006M']).prop('disabled', false); + kimchi.topic('kimchi/softwareUpdated').publish({ + result: result + }); + }, function() {}, reloadProgressArea); + } + }], + frozenFields: [{ + name: 'id', + label: ' ', + 'class': 'software-update-id' + }], + fields: [{ + name: 'package_name', + label: i18n['KCHUPD6002M'], + 'class': 'software-update-name' + }, { + name: 'version', + label: i18n['KCHUPD6003M'], + 'class': 'software-update-version' + }, { + name: 'arch', + label: i18n['KCHUPD6004M'], + 'class': 'software-update-arch' + }, { + name: 'repository', + label: i18n['KCHUPD6005M'], + 'class': 'software-update-repos' + }], + data: softwareUpdates + }); + }; + + var listSoftwareUpdates = function() { + kimchi.listSoftwareUpdates(function(softwareUpdates) { + $.each(softwareUpdates, function(i, item) { + softwareUpdates[i]['id'] = i + 1; + }); + + if(softwareUpdatesGrid) { + softwareUpdatesGrid.setData(softwareUpdates); + } + else { + initSoftwareUpdatesGrid(softwareUpdates); + } + + var updateButton = $('#' + softwareUpdatesGridID + '-update-button'); + $(updateButton).prop('disabled', softwareUpdates.length === 0); + }); + }; + var shutdownButtonID = '#host-button-shutdown'; var restartButtonID = '#host-button-restart'; var shutdownHost = function(params) { @@ -191,6 +273,8 @@ kimchi.host_main = function() { kimchi.keepMonitoringHost = this['checked']; }); + listSoftwareUpdates(); + kimchi.getCapabilities(function(capabilities) { if(!capabilities['system_report_tool']) { return; @@ -204,6 +288,10 @@ kimchi.host_main = function() { listDebugReports(); }); + kimchi.topic('kimchi/softwareUpdated').subscribe(function() { + listSoftwareUpdates(); + }); + kimchi.getHost(function(data) { var htmlTmpl = $('#host-tmpl').html(); data['logo'] = data['logo'] || ''; @@ -469,5 +557,6 @@ kimchi.host_main = function() { delete kimchi.hostTimer; } reportGrid && reportGrid.destroy(); + softwareUpdatesGrid && softwareUpdatesGrid.destroy(); }); }; diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index 38f71d9..c96f804 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -89,6 +89,16 @@ var i18n = { 'KCHDR6010M': "$_("Download")", 'KCHDR6011M': "$_("Report name should contain only letters, digits and/or hyphen ('-').")", + + 'KCHUPD6001M': "$_("Software Updates")", + 'KCHUPD6002M': "$_("Package Name")", + 'KCHUPD6003M': "$_("Version")", + 'KCHUPD6004M': "$_("Architecture")", + 'KCHUPD6005M': "$_("Repository")", + 'KCHUPD6006M': "$_("Update All")", + 'KCHUPD6007M': "$_("Updating...")", + + 'KCHVM6001M': "$_("This will delete the virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")", 'KCHVM6002M': "$_("Delete Confirmation")", diff --git a/ui/pages/tabs/host.html.tmpl b/ui/pages/tabs/host.html.tmpl index 23b9853..f6ecd47 100644 --- a/ui/pages/tabs/host.html.tmpl +++ b/ui/pages/tabs/host.html.tmpl @@ -120,6 +120,23 @@ </div> </div> </div> + <div id="software-update-section" class="host-section"> + <h3 class="section-header" + aria-controls="content-software-update"> + $_("Software Updates") + </h3> + <div id="content-software-update" class="section-content"> + <div class="section-row"> + <div class="section-value"> + <div id="software-updates-grid-container"></div> + <div id="software-updates-progress-container" class="hidden"> + <label for="software-updates-progress-textarea">$_("Update Progress")</label> + <textarea id="software-updates-progress-textarea" readonly></textarea> + </div> + </div> + </div> + </div> + </div> <div id="debug-report-section" class="host-section hidden"> <h3 class="section-header" aria-controls="content-sys-reports"> -- 1.8.1.4

3 6

[PATCH v3 0/5] [UI] CDROM Management in a VM
by Hongliang Wang 05 Mar '14

05 Mar '14

Allow user to manipulate CDROM(s) in a VM: 1) Attach one or more CDROM(s); 2) Replace a CDROM with another ISO file path; 3) Detach a CDROM from a VM. Tested on Chrome. Please apply the following patch first: * [UI] Window - Correct Footer Height v2 -> v3: 3a) Keep the edit window silver instead of white (Aline's comment) 3b) Added information after CDROM manipulations to avoid confusion (Aline & Adam King's comment) v1 -> v2: 2a) Separate one patch into 4 small ones to make it easier to review (Thanks to Ramon Medeiros's comment) 2b) Updated API calling to list CDROM (Thanks to Aline's comment) 2c) Separated VM updating window into 2 parts: general and storage (Thanks to Aline's comment) 2d) Enhanced UI to allow user trigger replace CDROM window by clicking ISO file path text box 2e) Changed uneditable fields from readonly to disabled 2f) Removed authors infomation (Thanks to Aline's comment) Hongliang Wang (5): [UI] kimchi.message - Enhancement [UI] Add CDROM-related APIs [UI] Add i18n Variables for CDROM-related Function [UI] Add/Edit CDROM Support [UI] Attach/Replace/Detach a CDROM to/in/from a VM ui/css/theme-default/guest-cdrom-add.css | 62 +++++++++++ ui/css/theme-default/guest-cdrom-edit.css | 62 +++++++++++ ui/css/theme-default/guest-edit.css | 133 +++++++++++++++++++--- ui/images/theme-default/guest-icon-sprite.png | Bin 0 -> 6748 bytes ui/js/src/kimchi.api.js | 74 +++++++++++++ ui/js/src/kimchi.guest_cdrom_add_main.js | 79 +++++++++++++ ui/js/src/kimchi.guest_cdrom_edit_main.js | 88 +++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 86 +++++++++++++- ui/js/src/kimchi.message.js | 27 +++-- ui/pages/guest-cdrom-add.html.tmpl | 73 ++++++++++++ ui/pages/guest-cdrom-edit.html.tmpl | 73 ++++++++++++ ui/pages/guest-edit.html.tmpl | 154 +++++++++++++++++--------- ui/pages/i18n.html.tmpl | 11 ++ 13 files changed, 837 insertions(+), 85 deletions(-) create mode 100644 ui/css/theme-default/guest-cdrom-add.css create mode 100644 ui/css/theme-default/guest-cdrom-edit.css create mode 100644 ui/images/theme-default/guest-icon-sprite.png create mode 100644 ui/js/src/kimchi.guest_cdrom_add_main.js create mode 100644 ui/js/src/kimchi.guest_cdrom_edit_main.js create mode 100644 ui/pages/guest-cdrom-add.html.tmpl create mode 100644 ui/pages/guest-cdrom-edit.html.tmpl -- 1.8.1.4

1 5

[PATCH V2 0/3] template integrity verification: verify storagepool
by shaohef＠linux.vnet.ibm.com 04 Mar '14

04 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V1 -> V2 rebase. remove model test. For commit c4c093e does not allow to delete pool kimchi-test-pool as it is associated with some templates. Sometimes, user create a template, storagepool will change later. So users can not create a vm from this template successfully. It is necessary to check storagepool of a template. ShaoHe Feng (3): template integrity verification: verify storagepool, update API.md template integrity verification: verify storagepool in backend template integrity verification: update test case to verify storagepool docs/API.md | 1 + src/kimchi/mockmodel.py | 3 +++ src/kimchi/model/templates.py | 5 +++++ src/kimchi/vmtemplate.py | 11 ++++++++++- tests/test_rest.py | 15 ++++++++++++++- 5 files changed, 33 insertions(+), 2 deletions(-) -- 1.8.4.2

2 4

[PATCH 0/3] template integrity verification: verify storagepool
by shaohef＠linux.vnet.ibm.com 04 Mar '14

04 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Sometimes, user create a template, storagepool will change later. So users can not create a vm from this template successfully. It is necessary to check storagepool of a template. By the way storagepool, this verification does not depend on volume ref_cnt Storagepool delete depends on volume ref_cnt I make a mistake. So sorry. ShaoHe Feng (3): template integrity verification: verify storagepool, update API.md template integrity verification: verify storagepool in backend template integrity verification: update test case to verify storagepool docs/API.md | 1 + src/kimchi/mockmodel.py | 3 +++ src/kimchi/model/templates.py | 5 +++++ src/kimchi/vmtemplate.py | 10 ++++++++++ tests/test_model.py | 9 +++++++++ tests/test_rest.py | 13 +++++++++++++ 6 files changed, 41 insertions(+) -- 1.8.4.2

4 10

[PATCH v3 0/2] Github bug #307: Add storage pool list
by Daniel Barboza 04 Mar '14

04 Mar '14

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> Changelog: v3: - rebase with master v2: - Fixing message ID These patches fixes the bug where the list of storage pool types can take a long time to appear. The solution used here is to detach the view of such list with the return of the JSON that loads the partition data. To test this patch I recomend doing the following change in src/kimchi/model/hosts.py: + import time class PartitionsModel(object): def __init__(self, **kargs): pass def get_list(self): + time.sleep(10) result = disks.get_partitions_names() return result The sleep(10) call will ensure that get_list (which returns the partition data) will take at least 10 seconds to execute. It is enough time to select the LOGICAL type and see how the UI is working before and after the JSON call. Daniel Henrique Barboza (2): Github bug #307: add storage pool type list - JS changes Github bug #307: storage pool type list - html and string changes po/en_US.po | 9 +- po/kimchi.pot | 8 +- po/pt_BR.po | 9 +- po/zh_CN.po | 9 +- ui/js/src/kimchi.storagepool_add_main.js | 174 ++++++++++++++++--------------- ui/pages/i18n.html.tmpl | 5 +- ui/pages/storagepool-add.html.tmpl | 7 +- 7 files changed, 129 insertions(+), 92 deletions(-) -- 1.8.3.1

2 3

[PATCH] remove unused InvalidOperation instance
by shaohef＠linux.vnet.ibm.com 04 Mar '14

04 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Neither of these two removed InvalidOperation is used. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/auth.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/kimchi/auth.py b/src/kimchi/auth.py index f8ccea1..af3b610 100644 --- a/src/kimchi/auth.py +++ b/src/kimchi/auth.py @@ -197,13 +197,11 @@ def kimchiauth(admin_methods=None): debug("Entering kimchiauth...") if check_auth_session(): if not has_permission(admin_methods): - e = InvalidOperation('KCHAUTH0004E') raise cherrypy.HTTPError(403) return if check_auth_httpba(): if not has_permission(admin_methods): - e = InvalidOperation('KCHAUTH0004E') raise cherrypy.HTTPError(403) return -- 1.8.4.2

4 3