March 2014 - Kimchi-devel - oVirt List Archives

[PATCH] [UI] Software Update: Make Update Progress Area Collapsible
by Hongliang Wang 11 Apr '14

11 Apr '14

Take advantage of jQuery UI to make update progress area collapsible. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/host.css | 4 +++- ui/js/src/kimchi.host.js | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css index 0f8b941..e1e83ee 100644 --- a/ui/css/theme-default/host.css +++ b/ui/css/theme-default/host.css @@ -248,8 +248,10 @@ .host-panel #software-updates-progress-textarea { border: 1px solid #ddd; + box-sizing: border-box; height: 100px; + padding: .2em .5em; resize: vertical; - width: 846px; + width: 852px; } /* End of Software Updates */ diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index 6300f37..f9696ea 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -276,6 +276,9 @@ kimchi.host_main = function() { initSoftwareUpdatesGrid(); kimchi.topic('kimchi/softwareUpdated') .subscribe(listSoftwareUpdates); + $('#software-updates-progress-container').accordion({ + collapsible: true + }); } if(capabilities['system_report_tool']) { -- 1.8.1.4

3 6

[PATCH] Set virt_use_nfs when NFS pool is added.
by Christy Perez 10 Apr '14

10 Apr '14

selinux has a special boolean to make it easier for disk images to be stored on a remote NFS server. Set this to true when a user adds an NFS storage pool. Most virtualzation documentation recommends that this be set to true. For example: http://www.ovirt.org/Troubleshooting_NFS_Storage_Issues http://fedoraproject.org/wiki/How_to_debug_Virtualization_problems This will leave it set to true, even if the user removes NFS storage pools. It is not a security risk, and we should not set it to False in case it had already been set by the user for another non-kimchi use. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 2 ++ src/kimchi/model/storagepools.py | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index d45f607..8ade7d7 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -144,6 +144,8 @@ messages = { "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."), + "KCHPOOL0037E": _("Unable to set selinux bool virt_use_nfs for NFS pool usage. Depending on \ + your NFS config, this may prevent the pool from being used."), "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 92b2496..d279ffa 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -126,6 +126,11 @@ class StoragePoolsModel(object): kimchi_log.error("Problem creating Storage Pool: %s", e) raise OperationFailed("KCHPOOL0007E", {'name': name, 'err': e.get_error_message()}) + if params['type'] == 'netfs': + output, error, returncode = run_command(['setsebool', '-P', + 'virt_use_nfs=1']) + if error or returncode: + kimchi_log.error('KCHPOOL0037E') return name def _clean_scan(self, pool_name): -- 1.8.5.3

5 13

[PATCH 0/3] Create and use jQuery form extensions
by Adam King 08 Apr '14

08 Apr '14

Extend base classes to support form processing Extend jQuery form Make use of the new forms handling capabilities Adam King (3): Extend base classes to support form processing Extend jQuery form Make use of the new forms handling capabilities ui/js/src/kimchi.form.js | 76 +++++++++------------------- ui/js/src/kimchi.grid.js | 2 +- ui/js/src/kimchi.object.js | 85 ++++++++++++++++++++++++++++++++ ui/js/src/kimchi.repository_edit_main.js | 31 +----------- ui/js/src/kimchi.string.js | 45 +++++++++++++++++ 5 files changed, 154 insertions(+), 85 deletions(-) create mode 100644 ui/js/src/kimchi.object.js create mode 100644 ui/js/src/kimchi.string.js -- 1.8.1.4

2 8

[PATCH v2] PEP8 for mockmodel.py
by Adam King 07 Apr '14

07 Apr '14

Updated mockmodel.py and makefile.am per Sheldon's comments. Adam King (1): PEP8 for mockmodel.py Makefile.am | 1 + src/kimchi/mockmodel.py | 69 ++++++++++++++++++++++++++++--------------------- 2 files changed, 40 insertions(+), 30 deletions(-) -- 1.8.1.4

3 12

[PATCH V2] Sort device paths shown when creating a logical storage pool
by Rodrigo Trujillo 03 Apr '14

03 Apr '14

This patch sorts the output list of devices by their paths, improving the user experience. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storagepool_add_main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index f347747..7a751aa 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -26,6 +26,7 @@ kimchi.initStorageAddPage = function() { kimchi.listHostPartitions(function(data) { if (data.length > 0) { var deviceHtml = $('#partitionTmpl').html(); + data.sort(function (a, b){return a.path.localeCompare(b.path)}); var listHtml = ''; $.each(data, function(index, value) { if (value.type === 'part' || value.type === 'disk') { -- 1.8.5.3

3 5

[PATCH 1/3] Fix pep8 in src/kimchi/vmtemplate.py
by Rodrigo Trujillo 03 Apr '14

03 Apr '14

Fixes minor pep8 issues Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 26f7d89..d127cec 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import os import string @@ -33,6 +33,7 @@ from lxml.builder import E QEMU_NAMESPACE = "xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'" + class VMTemplate(object): _bus_to_dev = {'ide': 'hd', 'virtio': 'vd', 'scsi': 'sd'} @@ -152,7 +153,8 @@ class VMTemplate(object): dev = "%s%s" % (self._bus_to_dev[self.info['disk_bus']], string.lowercase[index]) fmt = 'raw' if self._get_storage_type() in ['logical'] else 'qcow2' - params = {'src': src, 'dev': dev, 'bus': self.info['disk_bus'], 'type': fmt} + params = {'src': src, 'dev': dev, 'bus': self.info['disk_bus'], + 'type': fmt} ret += """ <disk type='file' device='disk'> <driver name='qemu' type='%(type)s' cache='none'/> @@ -193,7 +195,7 @@ class VMTemplate(object): <target dev='%(dev)s' bus='scsi'/> </disk>""" if not self.fc_host_support: - disk_xml = disk_xml.replace('volume','block') + disk_xml = disk_xml.replace('volume', 'block') pool = self._storage_validate() # Creating disk xml for each lun passed @@ -323,7 +325,7 @@ class VMTemplate(object): qemu_stream_dns) if not urlparse.urlparse(self.info['cdrom']).scheme in \ - libvirt_stream_protocols and params.get('iso_stream', False): + libvirt_stream_protocols and params.get('iso_stream', False): params['qemu-namespace'] = QEMU_NAMESPACE params['qemu-stream-cmdline'] = cdrom_xml else: -- 1.8.5.3

2 7

[PATCH V3 0/5] Fix 'disk full' issue
by Rodrigo Trujillo 02 Apr '14

02 Apr '14

V3: - Fix issues with tests - Rebase with 1.2 V2: Address Aline's comments: - Change error message - Aggregate 'if's V1: If the disk where objectstore (Kimchi database) is full, then a lot of errors will be raised without any special treatment. This can lead the system to an unexpected state. This patchset modifies kimchi in order to give the right treatment to exceptions, showing the error to the user or hidding when possible. Rodrigo Trujillo (5): Fix 'disk full' issue: Change objectstore exception handling Fix 'disk full' issue: Fix Templates db store/delete error handling Fix 'disk full' issue: Fix storage volume error handling Fix 'disk full' issue: Fix storagepool and asynctasks error handling Fix 'disk full' issue: Fix vms/screenshot db store/delete error handling src/kimchi/asynctask.py | 7 ++-- src/kimchi/i18n.py | 5 +++ src/kimchi/model/storagepools.py | 8 +++-- src/kimchi/model/storagevolumes.py | 49 ++++++++++++++++---------- src/kimchi/model/templates.py | 27 +++++++++++---- src/kimchi/model/vms.py | 70 +++++++++++++++++++++++++++----------- src/kimchi/objectstore.py | 7 ++++ 7 files changed, 123 insertions(+), 50 deletions(-) -- 1.8.5.3

3 11

[PATCH] Issue#343 & #353: Improve&Correct UI Init Logic Flow
by Hongliang Wang 02 Apr '14

02 Apr '14

Fixed the 2 issues: 1) When refreshing (F5) a plugin tab, default tab will be redirected then; 2) tabs.xml is requested twice. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.main.js | 127 +++++++++++++++++++++++++++-------------------- 1 file changed, 72 insertions(+), 55 deletions(-) diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index aac7e28..9b0acbf 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -16,10 +16,75 @@ * limitations under the License. */ kimchi.main = function() { - var tabUrl = "/config/ui/tabs.xml"; - var DEFAULT_HASH = kimchi.getDefaultPage(tabUrl); kimchi.popable(); + var genTabs = function(tabs) { + var tabsHtml = []; + $(tabs).each(function(i, tab) { + var title = tab['title']; + var path = tab['path']; + tabsHtml.push( + '<li>', + '<a class="item" href="', path, '">', + title, + '</a>', + '</li>' + ); + }); + return tabsHtml.join(''); + }; + + var parseTabs = function(xmlData) { + var tabs = []; + $(xmlData).find('tab').each(function() { + var $tab = $(this); + var titleKey = $tab.find('title').text(); + var title = i18n[titleKey]; + var path = $tab.find('path').text(); + tabs.push({ + title: title, + path: path + }); + }); + + return tabs; + }; + + var retrieveTabs = function(url) { + var tabs; + $.ajax({ + url : url, + async : false, + success : function(xmlData) { + tabs = parseTabs(xmlData); + } + }); + return tabs; + }; + + var tabConfigUrl = '/config/ui/tabs.xml'; + var pluginConfigUrl = '/plugins/{plugin}/ui/config/tab-ext.xml'; + var DEFAULT_HASH; + var buildTabs = function(callback) { + var tabs = retrieveTabs(tabConfigUrl); + kimchi.listPlugins(function(plugins) { + $(plugins).each(function(i, p) { + var url = kimchi.template(pluginConfigUrl, { + plugin: p + }); + tabs.concat(retrieveTabs(url)); + }); + + var firstTabPath = tabs[0] && tabs[0]['path']; + DEFAULT_HASH = firstTabPath && + firstTabPath.substring(0, firstTabPath.length - 5); + + $('#nav-menu').append(genTabs(tabs)); + + callback && callback(); + }); + }; + var onLanguageChanged = function(lang) { kimchi.lang.set(lang); location.reload(); @@ -132,8 +197,6 @@ kimchi.main = function() { }); // Perform logging out via Ajax request. - - $('#btn-logout').on('click', function() { kimchi.logout(function() { updatePage(); @@ -145,9 +208,7 @@ kimchi.main = function() { $('#btn-help').on('click', kimchi.getHelp); }; - // Load i18n translation strings first and then render the page. - $('#main').load('i18n.html', function() { - kimchi.addTabs(tabUrl); + var initUI = function() { $(document).bind('ajaxError', function(event, jqXHR, ajaxSettings, errorThrown) { if (!ajaxSettings['kimchi']) { return; @@ -175,56 +236,12 @@ kimchi.main = function() { kimchi.user.showUser(true); initListeners(); updatePage(); - }); -}; - -kimchi.addTabs = function(url) { - var tabsHtml = kimchi.getTabHtml(url); - $('#nav-menu').prepend(tabsHtml); - kimchi.addExtTabs(); -}; - -kimchi.addExtTabs = function() { - kimchi.listPlugins(function(results) { - for ( var i = 0; i < results.length; i++) { - var tabsHtml = kimchi.getTabHtml("/plugins/" + results[i] + "/ui/config/tab-ext.xml"); - $('#nav-menu').append(tabsHtml); - } - }); -}; - -kimchi.getDefaultPage = function(url) { - var defautLocation = ""; - $.ajax({ - url : url, - async : false, - success : function(xmlData) { - var tab = $(xmlData).find('tab').first(); - var path = tab.find('path').text(); - if (path) { - defautLocation = path.substring(0, path.length - 5); - } - } - }); - return defautLocation; -}; + }; -kimchi.getTabHtml = function(url) { - var tabsHtml = ""; - $.ajax({ - url : url, - async : false, - success : function(xmlData) { - $(xmlData).find('tab').each(function() { - var $tab = $(this); - var titleKey = $tab.find('title').text(); - var title = i18n[titleKey]; - var path = $tab.find('path').text(); - tabsHtml += "<li><a class='item' href=" + path + ">" + title + "</a></li>"; - }); - } + // Load i18n translation strings first and then render the page. + $('#main').load('i18n.html', function() { + buildTabs(initUI); }); - return tabsHtml; }; kimchi.getHelp = function(e) { -- 1.8.1.4

2 2

[PATCH V4 0/3] Fix non persistent network handling
by Rodrigo Trujillo 02 Apr '14

02 Apr '14

V4: Fixes error in tests V3: Changes mockmodel and tests (Royce suggestion) V2: Address Ming comments: - Updates API.md - remove useless comments and return V1: Kimchi networks have the same problem storage had. Non persistent networks are not stop, they are removed by libvirt and this causes an error in Kimchi. Rodrigo Trujillo (3): Fix non persistent network handling (backend) Fix non persistent network handling (frontend) Fix non persistent network handling (mockmodel/tests) docs/API.md | 2 ++ src/kimchi/control/networks.py | 3 ++- src/kimchi/mockmodel.py | 7 +++++- src/kimchi/model/networks.py | 3 ++- tests/test_model.py | 1 + tests/test_rest.py | 1 + ui/js/src/kimchi.network.js | 55 ++++++++++++++++++++++++++++-------------- ui/pages/i18n.html.tmpl | 1 + 8 files changed, 52 insertions(+), 21 deletions(-) -- 1.8.5.3

2 7

[PATCH V2] Sort device paths shown when creating a logical storage pool
by Rodrigo Trujillo 02 Apr '14

02 Apr '14

This patch sorts the host partitions list returned by backend by partition path. Then UI is going to show paths sorted, improving the user experience. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/control/host.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/kimchi/control/host.py b/src/kimchi/control/host.py index cfc24bd..d4387f4 100644 --- a/src/kimchi/control/host.py +++ b/src/kimchi/control/host.py @@ -20,7 +20,7 @@ import cherrypy from kimchi.control.base import Collection, Resource -from kimchi.control.utils import UrlSubNode, validate_method +from kimchi.control.utils import UrlSubNode, validate_method, model_fn from kimchi.exception import OperationFailed from kimchi.template import render @@ -64,6 +64,24 @@ class Partitions(Collection): super(Partitions, self).__init__(model) self.resource = Partition + # Defining get_resources in order to return list of partitions in UI + # sorted by their path + def _get_resources(self, flag_filter): + try: + get_list = getattr(self.model, model_fn(self, 'get_list')) + idents = get_list(*self.model_args, **flag_filter) + res_list = [] + for ident in idents: + # internal text, get_list changes ident to unicode for sorted + args = self.resource_args + [ident] + res = self.resource(self.model, *args) + res.lookup() + res_list.append(res) + # Sort by partition path + res_list.sort(key=lambda x: x.info['path']) + return res_list + except AttributeError: + return [] class Partition(Resource): def __init__(self, model, id): -- 1.8.5.3

3 6

[PATCH] add a make check-local command to verify the i18n string format
by shaohef＠linux.vnet.ibm.com 02 Apr '14

02 Apr '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> When I do i18n translation, I find some string format are wrong. So I add a check-local command to help the developer to check their string format. Every developers please run this command before submit your patch. Thanks. After you run this command, it may report some invalid string formats. $ make -C src/kimchi/ check-local check the invalid string format: "KCHREPOS0018E": _("Could not write repository configuration file %(repo_file)"), You should check %(repo_file) is what you want. Ref: http://docs.python.org/2/library/string.html Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/kimchi/Makefile.am b/src/kimchi/Makefile.am index 957d2c9..cec705a 100644 --- a/src/kimchi/Makefile.am +++ b/src/kimchi/Makefile.am @@ -29,6 +29,10 @@ EXTRA_DIST = \ kimchidir = $(pythondir)/kimchi +check-local: + @echo "check the invalid string format:" + @grep -P "%$[^$]*?\)[^0-9\.bcdeEfgGnosxX%]" i18n.py + install-data-local: $(MKDIR_P) $(DESTDIR)$(kimchidir) $(INSTALL_DATA) API.json $(DESTDIR)$(kimchidir)/API.json -- 1.8.5.3

4 4

[PATCH] Fix content of the SW update list after disable a repository.
by Paulo Vital 01 Apr '14

01 Apr '14

Kimchi lists all RPM packages to be updated when the Host tab is selected, but even after disable some YUM repository and refresh the content of this tab, the previous packages from the disabled repository are still present in list. This patch "deletes" the YumBase object after get the list of packages to be updated. With this, every time the Host tab is selected, a new list will be generated. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- src/kimchi/swupdate.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/kimchi/swupdate.py b/src/kimchi/swupdate.py index 23e3ff0..a785207 100644 --- a/src/kimchi/swupdate.py +++ b/src/kimchi/swupdate.py @@ -154,6 +154,7 @@ class YumUpdate(object): yb.doLock() self._pkgs = yb.doPackageLists('updates') yb.doUnlock() + del yb except Exception, e: kimchiLock.release() raise OperationFailed('KCHPKGUPD0003E', {'err': str(e)}) -- 1.8.3.1

2 2

[PATCH V3] Sort device paths shown when creating a logical storage pool
by Rodrigo Trujillo 01 Apr '14

01 Apr '14

This patch sorts the host partitions list returned by backend by partition path. Then UI is going to show paths sorted, improving the user experience. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/control/host.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/kimchi/control/host.py b/src/kimchi/control/host.py index cfc24bd..d4387f4 100644 --- a/src/kimchi/control/host.py +++ b/src/kimchi/control/host.py @@ -20,7 +20,7 @@ import cherrypy from kimchi.control.base import Collection, Resource -from kimchi.control.utils import UrlSubNode, validate_method +from kimchi.control.utils import UrlSubNode, validate_method, model_fn from kimchi.exception import OperationFailed from kimchi.template import render @@ -64,6 +64,24 @@ class Partitions(Collection): super(Partitions, self).__init__(model) self.resource = Partition + # Defining get_resources in order to return list of partitions in UI + # sorted by their path + def _get_resources(self, flag_filter): + try: + get_list = getattr(self.model, model_fn(self, 'get_list')) + idents = get_list(*self.model_args, **flag_filter) + res_list = [] + for ident in idents: + # internal text, get_list changes ident to unicode for sorted + args = self.resource_args + [ident] + res = self.resource(self.model, *args) + res.lookup() + res_list.append(res) + # Sort by partition path + res_list.sort(key=lambda x: x.info['path']) + return res_list + except AttributeError: + return [] class Partition(Resource): def __init__(self, model, id): -- 1.8.5.3

2 2

[PATCH V2] improve chinese translation
by shaohef＠linux.vnet.ibm.com 01 Apr '14

01 Apr '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> The phrase ordeing is different in English and Chinese. Reverse the ordering of some not proper translations. Also fix some typos. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- po/zh_CN.po | 152 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 75 insertions(+), 77 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 801fe38..40793fc 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-26 16:19-0300\n" +"POT-Creation-Date: 2014-03-28 15:35+0800\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" @@ -54,7 +54,7 @@ msgstr "虚拟机名称" msgid "" "The name used to identify the virtual machine. If omitted, a name will be " "chosen based on the template used." -msgstr "名字用来标识虚拟机。如果省略，将会基于使用的模板选择一个名字。" +msgstr "名字是虚拟机的标识。如果省略，将会基于使用的模板选择一个名字。" msgid "Template" msgstr "模板" @@ -183,7 +183,7 @@ msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " msgstr "" -"连接不上主机。核对主机系统是启动的，并且能通过网络连接主机。HTTP请求响应：%1" +"连接不上主机。请确保主机系统已启动，并且能通过网络连接主机。HTTP请求响应：%1" msgid "Delete Confirmation" msgstr "删除确认" @@ -219,10 +219,10 @@ msgid "This is not a valid ISO file." msgstr "这不是一个有效的ISO文件" msgid "It will take long time. Do you want to continue?" -msgstr "这需要一段时间。你愿意继续吗？" +msgstr "这需要一段时间。是否继续？" msgid "This will permanently delete the template. Would you like to continue?" -msgstr "这将永久删除模板。你愿意继续吗？" +msgstr "这将永久删除模板。是否继续？" msgid "Unable to shut down system as there are some virtual machines running!" msgstr "有虚拟机在运行，不能关闭主机。" @@ -256,7 +256,7 @@ msgstr "关闭或者重启主机会导致没有保存的工作丢失。继续关 msgid "" "Repository will be removed permanently and can't be recovered. Do you want " "to continue?" -msgstr "软件仓库将被永久删除，不能恢复。继续？" +msgstr "软件仓库将被永久删除，不能恢复。是否继续？" msgid "Repositories" msgstr "软件仓库" @@ -268,16 +268,16 @@ msgid "Base URL" msgstr "基本URL" msgid "Is Mirror" -msgstr "是镜像" +msgstr "是否为镜像" msgid "URL Args" msgstr "URL参数" msgid "Enabled" -msgstr "使能的" +msgstr "已启用" msgid "GPG Check" -msgstr "GPG核对" +msgstr "GPG校验" msgid "GPG Key" msgstr "GPG键" @@ -327,7 +327,7 @@ msgstr "更新软件包失败" msgid "" "Debug report will be removed permanently and can't be recovered. Do you want " "to continue?" -msgstr "诊断报告将被永久删除，并且不能恢复。继续？" +msgstr "诊断报告将被永久删除，并且不能恢复。是否继续？" msgid "Debug Reports" msgstr "主机诊断报告" @@ -376,7 +376,7 @@ msgid "Successfully detached!" msgstr "成功卸载" msgid "The VLAN id must be between 1 and 4094." -msgstr "VLAN 标识符必须在1和4094之间" +msgstr "VLAN 标识符必须在1至4094之间" msgid "unavailable" msgstr "无法获取" @@ -391,7 +391,7 @@ msgstr "创建一个网络" msgid "" "This will permanently delete the storage pool. Would you like to continue?" -msgstr "这将永久删除存储池。继续？" +msgstr "这将永久删除存储池。是否继续？" msgid "This storage pool is empty." msgstr "这个存储池为空" @@ -443,7 +443,7 @@ msgstr "没有发现模板" msgid "" "This storage pool is not persistent. Instead of deactivate, this action will " "permanently delete it. Would you like to continue?" -msgstr "存储池不是持久化的。这个操作将会永久删除存储池而不是停用。继续？" +msgstr "对于非持久存储池，这个操作将会永久删除存储池而不是停用。是否继续？" msgid "Help" msgstr "帮助" @@ -613,10 +613,10 @@ msgid "Basic Information" msgstr "基本信息" msgid "OS Distro" -msgstr "操作系统发行版本" +msgstr "操作系统发行版" msgid "OS Code Name" -msgstr "操作系统代码" +msgstr "操作系统代号" msgid "Processor" msgstr "处理器" @@ -625,7 +625,7 @@ msgid "System Statistics" msgstr "系统统计信息" msgid "Collecting data after leaving this page" -msgstr "离开该页面继续收集数据" +msgstr "离开该页面仍继续收集数据" msgid "Update Progress" msgstr "更新进度" @@ -664,7 +664,7 @@ msgid "Enable VLAN" msgstr "启用VLAN" msgid "VLAN ID" -msgstr "VLAN标识符" +msgstr "VLAN号" msgid "No templates found." msgstr "没有发现模板" @@ -780,42 +780,42 @@ msgstr "未知的指定参数：%(value)s" #, python-format msgid "Delete is not allowed for %(resource)s" -msgstr "%(resource)s不允许删除" +msgstr "不允许删除%(resource)s" #, python-format msgid "%(resource)s does not implement update method" -msgstr "%(resource)s 没有实现更新方法" +msgstr "不支持更新%(resource)s" #, python-format msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "%(resource)s不允许被更新参数%(params)s。" +msgstr "不允许被更新%(resource)s的%(params)s参数。" #, python-format msgid "Create is not allowed for %(resource)s" -msgstr "%(resource)s不允许创建" +msgstr "不允许创建%(resource)s" msgid "Unable to parse JSON request" -msgstr "不能解析JSON请求" +msgstr "无法解析JSON请求" msgid "This API only supports JSON" msgstr "这个API仅支持JSON" msgid "Datastore is not initiated in the model object." -msgstr "model对象中没有初始化数据存储。" +msgstr "尚未为model对象初始化数据存储。" #, python-format msgid "Authentication failed for user '%(userid)s'. [Error code: %(code)s]" msgstr "用户 '%(userid)s' 验证失败。[错误代码： %(code)s]" msgid "You are not authorized to access Kimchi" -msgstr "你没有被授权访问Kimchi" +msgstr "您没有被授权访问Kimchi" #, python-format msgid "Specify %(item)s to login into Kimchi" -msgstr "指定 %(item)s 登陆Kimchi" +msgstr "指定登录Kimchi的%(item)s" msgid "This operation is not allowed as you have restricted access to Kimchi." -msgstr "你被限制访问Kimchi，该操作不允许。" +msgstr "您的访问受限，不允许执行该操作。" #, python-format msgid "Error while getting block devices. Details: %(err)s" @@ -823,7 +823,7 @@ msgstr "获取块设备时出错。详情：%(err)s" #, python-format msgid "Error while getting block device information for %(device)s." -msgstr "获取会设备 %(device)s 信息时出错。" +msgstr "获取块设备 %(device)s 信息时出错。" #, python-format msgid "Unable to find distro file: %(filename)s" @@ -832,15 +832,15 @@ msgstr "找不到发行版文件：%(filename)s" #, python-format msgid "" "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file." -msgstr "不能解析发行版文件：%(filename)s。确定它是一个JSON格式的文件。" +msgstr "不能解析发行版文件：%(filename)s。请确保它是一个JSON格式的文件。" #, python-format msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s" -msgstr "不能登陆iSCSI主机上的目标 %(portal)s。详情：%(err)s" +msgstr "无法通过 %(portal)s 登录iSCSI主机和目标。详情：%(err)s" #, python-format msgid "Unable to login to iSCSI host %(host)s target %(target)s" -msgstr "不能登陆iSCSI主机%(host)s上的目标%(target)s。" +msgstr "无法登录iSCSI主机%(host)s上的目标%(target)s。" #, python-format msgid "Unable to find ISO file ISO %(filename)s" @@ -848,7 +848,7 @@ msgstr "找不到ISO文件： %(filename)s" #, python-format msgid "The ISO file %(filename)s is not bootable" -msgstr "ISO文件%(filename)s不是可引导的。" +msgstr "ISO文件%(filename)s不可引导。" #, python-format msgid "The ISO file %(filename)s does not have a valid El Torito boot record" @@ -856,19 +856,19 @@ msgstr "ISO文件%(filename)s没有有效的El Torito引导记录。" #, python-format msgid "Invalid El Torito validation entry in ISO %(filename)s" -msgstr "在ISO %(filename)s，无效的El Torito检验条目。" +msgstr "在ISO文件%(filename)s中发现无效的El Torito校验条目。。" #, python-format msgid "Invalid El Torito boot indicator in ISO %(filename)s" -msgstr "无效的El Torito引导指示在ISO %(filename)s中" +msgstr "ISO文件%(filename)s的El Torito引导标志是无效的" #, python-format msgid "Unexpected volume type for primary volume in ISO %(filename)s" -msgstr "在ISO%(filename)s中，主卷的卷类型不可识别" +msgstr "未能识别ISO文件%(filename)s的主卷类型" #, python-format msgid "Bad format while reading volume descriptor in ISO %(filename)s" -msgstr "读ISO %(filename)s的描述符遇到错误格式" +msgstr "ISO文件%(filename)s的卷描述符格式错误" #, python-format msgid "" @@ -878,10 +878,9 @@ msgid "" "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x " "'path_to_iso'.Details: %(err)s" msgstr "" -"hypervisor没有权限访问ISO %(filename)s。可以将ISO移到/var/lib/libvirt目录下，" -"或者如果可能，为'%(user)s'用户设置访问权限，或者将'%(user)s'用户增加到ISO路径" -"所在的组，或者为所有的用户增加访问权限 'chmod -R o+x '，该方法不推荐。详情：" -"%(err)s" +"hypervisor没有访问ISO文件%(filename)s的权限。可以将ISO移到/var/lib/libvirt目" +"录下；或为'%(user)s'用户设置访问权限；或将'%(user)s'用户增加到ISO路径的属组；" +"或者为所有的用户增加访问权限 'chmod -R o+x '（不推荐）。详情：%(err)s" #, python-format msgid "Virtual machine %(name)s already exists" @@ -896,19 +895,18 @@ msgid "" "Unable to rename virtual machine %(name)s. The name %(new_name)s already " "exists or it is not powered off." msgstr "" -"不能重命名虚拟机%(name)s。虚拟机不是关机状态，或者‘%(new_name)s’名字已经存" -"在。" +"不能重命名虚拟机%(name)s。虚拟机正在运行，或者‘%(new_name)s’名字已经存在。" #, python-format msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s" -msgstr "不能获取停止状态的虚拟机%(name)s的抓屏" +msgstr "不能获取停止状态的虚拟机%(name)s的截屏" msgid "Remote ISO image is not supported by this server." -msgstr "该server不支持远程ISO镜像。" +msgstr "该服务器不支持远程ISO镜像。" #, python-format msgid "Screenshot not supported for virtual machine %(name)s" -msgstr "虚拟机 %(name)s 不支持抓屏" +msgstr "虚拟机 %(name)s 不支持截屏" #, python-format msgid "Unable to create virtual machine %(name)s. Details: %(err)s" @@ -938,13 +936,13 @@ msgid "Invalid storage pool URI: %(value)s specified for virtual machine" msgstr "给虚拟机指定的存储池URI%(value)s无效" msgid "Supported virtual machine graphics are spice or VNC" -msgstr "支持的虚拟机图形是spice或者VNC" +msgstr "虚拟机图形可设置为Spice或者VNC" msgid "Graphics address to listen on must be IPv4 or IPv6" -msgstr "监听的图形网路地址必须是IPv4或者IPv6" +msgstr "远程图形访问的监听地址必须是IPv4或IPv6地址。" msgid "Specify a template to create a virtual machine from" -msgstr "指定一个模板用来创建一个虚拟机" +msgstr "指定用于创建虚拟机的模板" #, python-format msgid "Unable to start virtual machine %(name)s. Details: %(err)s" @@ -960,7 +958,7 @@ msgstr "不能删除虚拟机 %(name)s. 详情：%(err)s" #, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" -msgstr "在虚拟机 %(name)s 不存在 %(iface)s 接口" +msgstr "虚拟机 %(name)s 中没有接口 %(iface)s" #, python-format msgid "" @@ -968,7 +966,7 @@ msgid "" msgstr "为虚拟机%(name)s指定的网络%(network)s不存在" msgid "Do not support guest interface hot plug attachment" -msgstr "不支持客户机接口的热插拔挂载" +msgstr "不支持客户机接口的热插拔" msgid "Supported virtual machine interfaces type is only network" msgstr "只支持网络类型的虚拟机接口" @@ -980,7 +978,7 @@ msgid "Invalid network model card specified for virtual machine interface" msgstr "虚拟机接口指定的网络模型卡无效" msgid "Specify type and network to add a new virtual machine interface" -msgstr "指定类型和网络来怎加一个新的虚拟机接口" +msgstr "为新的虚拟机接口指定类型和网络" #, python-format msgid "Template %(name)s already exists" @@ -1025,7 +1023,7 @@ msgid "Template distribution version must be a string" msgstr "模板的发行版版本号必须是一个字符串" msgid "The number of CPUs must be a integer" -msgstr "CPUs的个数必须是一个整数" +msgstr "CPU的个数必须是一个整数" msgid "Amount of memory (MB) must be an integer greater than 512" msgstr "总内存数（MB为单位）必须是一个大于512的整数" @@ -1035,10 +1033,10 @@ msgstr "模板的CDROM必须是一个本地或者远程的ISO文件" #, python-format msgid "Invalid storage pool URI %(value)s specified for template" -msgstr "给模板指定了无效的存储池URI%(value)s" +msgstr "给模板指定了无效的存储池URI %(value)s" msgid "Specify an ISO image as CDROM to create a template" -msgstr "指定一个ISO的镜像作为CDROM来创建一个模板" +msgstr "为新模版的CDROM指定一个ISO的镜像" msgid "All networks for the template must be specified in a list." msgstr "为模板指定的网络必须在一个列表中" @@ -1063,7 +1061,7 @@ msgstr "自启动标志必须是true或者false" #, python-format msgid "Specify %(item)s in order to create the storage pool %(name)s" -msgstr "指定%(item)s来创建一个存储池%(name)s" +msgstr "为新存储池%(name)s指定%(item)s" #, python-format msgid "Unable to delete active storage pool %(name)s" @@ -1137,13 +1135,13 @@ msgid "Port of a remote storage server must be an integer between 1 and 65535" msgstr "远程存储服务器的端口必须是1到65535之间的整数" msgid "Login username of the iSCSI target must be a string" -msgstr "iSCSI目标的登陆用户名必须是一个字符串" +msgstr "iSCSI目标的登录用户名必须是一个字符串" msgid "Login password of the iSCSI target must be a string" -msgstr "iSCSI目标的登陆密码必须是一个字符串" +msgstr "iSCSI目标的登录密码必须是一个字符串" msgid "Specify name and type to create a storage pool" -msgstr "指定名字和类型来创建一个存储池" +msgstr "为新存储池指定名字和类型" #, python-format msgid "" @@ -1156,10 +1154,10 @@ msgid "Error while extending logical pool %(pool)s. Details: %(err)s" msgstr "扩展逻辑卷%(pool)s失败。详情：%(err)s" msgid "The parameter disks only can be updated for logical storage pool." -msgstr "磁盘参数只能被用在逻辑存储池更新。" +msgstr "只有逻辑存储池支持更新磁盘参数。" msgid "The SCSI host adapter name must be a string." -msgstr "SCSI主机适配器名字必须是个字符串" +msgstr "SCSI主机适配器名必须是个字符串" msgid "The storage pool kimchi_isos is reserved for internal use" msgstr "存储池kimchi_isos留作内部使用" @@ -1197,7 +1195,7 @@ msgstr "存储卷%(name)s已经存在" #, python-format msgid "Storage volume %(name)s does not exist in storage pool %(pool)s" -msgstr "存储卷%(name)s不存在存储池%(pool)s中" +msgstr "存储池%(pool)s中没有存储卷%(name)s" #, python-format msgid "" @@ -1207,7 +1205,7 @@ msgstr "不能创建存储卷%(volume)s，因为存储池%(pool)s没有激活" #, python-format msgid "Specify %(item)s in order to create storage volume %(volume)s" -msgstr "指定%(item)s来创建存储卷%(volume)s" +msgstr "为新存储卷%(volume)s指定指定%(item)s" #, python-format msgid "" @@ -1317,10 +1315,10 @@ msgid "Network interface must be a string" msgstr "网络接口必须是一个字符串" msgid "Network VLAN ID must be an integer between 1 and 4094" -msgstr "网络VLAN标识符必须是1到4094之间的整数" +msgstr "网络VLAN号必须是1到4094之间的整数" msgid "Specify name and type to create a Network" -msgstr "指定名字和类型来创建网络" +msgstr "为新网络指定名字和类型" #, python-format msgid "" @@ -1336,7 +1334,7 @@ msgstr "不能停用网络%(name)s。有虚拟机或者模板与这个网络关 #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." -msgstr "桥设备%(name)s不能是一个VLAN的trunk设备" +msgstr "不能以桥设备%(name)s作为VLAN的trunk设备。" #, python-format msgid "Debug report %(name)s does not exist" @@ -1351,7 +1349,7 @@ msgstr "不能创建诊断报告%(name)s。详情：%(err)s" #, python-format msgid "Can not find any generated debug report matching name %(name)s" -msgstr "找不到任何与%(name)s名字匹配的生成的诊断报告" +msgstr "找不到任何与%(name)s名字匹配的诊断报告" #, python-format msgid "Unable to generate debug report %(name)s. Details: %(err)s" @@ -1366,7 +1364,7 @@ msgstr "名字必须是一个字符串。只允许字母、数字和连字符 (' #, python-format msgid "Storage server %(server)s was not used by Kimchi" -msgstr "存储服务器%(server)s没被Kimchi使用" +msgstr "存储服务器%(server)s未被Kimchi使用" #, python-format msgid "Distro '%(name)s' does not exist" @@ -1430,7 +1428,7 @@ msgid "Device name %(dev_name)s already exists in vm %(vm_name)s" msgstr "设备%(dev_name)s在vm%(vm_name)s上已存在" msgid "Can't specify a directory for a CDROM device path" -msgstr "不能为CDROM设备路径指定一个目录" +msgstr "CDROM设备路径不能是一个目录" #, python-format msgid "The storage device %(dev_name)s does not exist in the guest %(vm_name)s" @@ -1449,16 +1447,16 @@ msgid "Error while removing storage device: %(error)s" msgstr "移除存储设备时出错：%(error)s" msgid "Do not support guest CDROM hot plug attachment" -msgstr "不支持客户机热插拔挂载CDROM" +msgstr "不支持客户机热插拔CDROM" msgid "Specify type and path to add a new virtual machine disk" -msgstr "指定类型和路径来增加一个新的虚拟机磁盘" +msgstr "为新虚拟机磁盘指定类型和路径" msgid "Specify path to update virtual machine disk" -msgstr "指定路径来更新虚拟机磁盘" +msgstr "指定更新虚拟机磁盘的路径" msgid "YUM Repository ID must be one word only string." -msgstr "YUM软件仓库ID必须是一个单词或者字符串" +msgstr "YUM软件仓库ID必须是只包含一个单词的字符串" msgid "Repository URL must be an http://, ftp:// or file:// URL." msgstr "软件仓库URL必须是http://、 ftp:// 或 file://" @@ -1472,7 +1470,7 @@ msgid "Distribution to DEB repository must be a string" msgstr "DEB仓库的发行版本必须是一个字符串" msgid "Components to DEB repository must be listed in a array" -msgstr "DEB仓库的组件必须列到一个数组" +msgstr "DEB仓库的组件必须以数组形式列出" msgid "Components to DEB repository must be a string" msgstr "DEB仓库的组件必须是一个字符串" @@ -1484,10 +1482,10 @@ msgid "YUM Repository name must be string." msgstr "YUM仓库的名字必须是一个字符串" msgid "GPG check must be a boolean value." -msgstr "GPG核对必须是一个布尔值" +msgstr "GPG校验必须是一个布尔值" msgid "GPG key must be a URL pointing to the ASCII-armored file." -msgstr "GPG键必须是一个指向ASCII盔甲文件的URL" +msgstr "GPG键必须是一个指向ASCII转义文件（.asc文件）的URL" #, python-format msgid "Could not update repository %(repo_id)s." @@ -1507,7 +1505,7 @@ msgstr "您的系统无法识别软件管理工具" #, python-format msgid "Repository %(repo_id)s is already enabled." -msgstr "软件仓库%(repo_id)s已经使能。" +msgstr "软件仓库%(repo_id)s已经启用。" #, python-format msgid "Repository %(repo_id)s is already disabled." @@ -1519,14 +1517,14 @@ msgstr "不能移除软件仓库%(repo_id)s" #, python-format msgid "Could not write repository configuration file %(repo_file)s" -msgstr "不能写软件仓库的配置文件%(repo_file)s" +msgstr "无法写软件仓库的配置文件%(repo_file)s" msgid "Specify repository distribution in order to create a DEB repository." msgstr "指定软件仓库发行版本来创建一个DEB仓库。" #, python-format msgid "Could not enable repository %(repo_id)s." -msgstr "不能使能软件仓库%(repo_id)s" +msgstr "不能启用软件仓库%(repo_id)s" #, python-format msgid "Could not disable repository %(repo_id)s." -- 1.8.5.3

2 2

[PATCH] improve chinese translation
by shaohef＠linux.vnet.ibm.com 28 Mar '14

28 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> The phrase ordeing is different in English and Chinese. Reverse the ordering of some not proper translations. Also fix some typos. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- po/zh_CN.po | 155 +++++++++++++++++++++++++++++------------------------------- 1 file changed, 76 insertions(+), 79 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 801fe38..25b31f4 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-26 16:19-0300\n" +"POT-Creation-Date: 2014-03-28 15:32+0800\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" @@ -54,7 +54,7 @@ msgstr "虚拟机名称" msgid "" "The name used to identify the virtual machine. If omitted, a name will be " "chosen based on the template used." -msgstr "名字用来标识虚拟机。如果省略，将会基于使用的模板选择一个名字。" +msgstr "名字是虚拟机的标识。如果省略，将会基于使用的模板选择一个名字。" msgid "Template" msgstr "模板" @@ -183,10 +183,10 @@ msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " msgstr "" -"连接不上主机。核对主机系统是启动的，并且能通过网络连接主机。HTTP请求响应：%1" +"连接不上主机。请确保主机系统已启动，并且能通过网络连接主机。HTTP请求响应：%1" msgid "Delete Confirmation" -msgstr "删除确认" +msgstr "确认删除" msgid "OK" msgstr "确定" @@ -219,10 +219,10 @@ msgid "This is not a valid ISO file." msgstr "这不是一个有效的ISO文件" msgid "It will take long time. Do you want to continue?" -msgstr "这需要一段时间。你愿意继续吗？" +msgstr "这需要一段时间。是否继续？" msgid "This will permanently delete the template. Would you like to continue?" -msgstr "这将永久删除模板。你愿意继续吗？" +msgstr "这将永久删除模板。是否继续？" msgid "Unable to shut down system as there are some virtual machines running!" msgstr "有虚拟机在运行，不能关闭主机。" @@ -256,7 +256,7 @@ msgstr "关闭或者重启主机会导致没有保存的工作丢失。继续关 msgid "" "Repository will be removed permanently and can't be recovered. Do you want " "to continue?" -msgstr "软件仓库将被永久删除，不能恢复。继续？" +msgstr "软件仓库将被永久删除，不能恢复。是否继续？" msgid "Repositories" msgstr "软件仓库" @@ -268,16 +268,16 @@ msgid "Base URL" msgstr "基本URL" msgid "Is Mirror" -msgstr "是镜像" +msgstr "是否为镜像" msgid "URL Args" msgstr "URL参数" msgid "Enabled" -msgstr "使能的" +msgstr "已启用" msgid "GPG Check" -msgstr "GPG核对" +msgstr "GPG校验" msgid "GPG Key" msgstr "GPG键" @@ -327,7 +327,7 @@ msgstr "更新软件包失败" msgid "" "Debug report will be removed permanently and can't be recovered. Do you want " "to continue?" -msgstr "诊断报告将被永久删除，并且不能恢复。继续？" +msgstr "诊断报告将被永久删除，并且不能恢复。是否继续？" msgid "Debug Reports" msgstr "主机诊断报告" @@ -376,7 +376,7 @@ msgid "Successfully detached!" msgstr "成功卸载" msgid "The VLAN id must be between 1 and 4094." -msgstr "VLAN 标识符必须在1和4094之间" +msgstr "VLAN 标识符必须在1至4094之间" msgid "unavailable" msgstr "无法获取" @@ -391,7 +391,7 @@ msgstr "创建一个网络" msgid "" "This will permanently delete the storage pool. Would you like to continue?" -msgstr "这将永久删除存储池。继续？" +msgstr "这将永久删除存储池。是否继续？" msgid "This storage pool is empty." msgstr "这个存储池为空" @@ -443,7 +443,7 @@ msgstr "没有发现模板" msgid "" "This storage pool is not persistent. Instead of deactivate, this action will " "permanently delete it. Would you like to continue?" -msgstr "存储池不是持久化的。这个操作将会永久删除存储池而不是停用。继续？" +msgstr "对于非持久存储池，这个操作将会永久删除存储池而不是停用。是否继续？" msgid "Help" msgstr "帮助" @@ -613,10 +613,10 @@ msgid "Basic Information" msgstr "基本信息" msgid "OS Distro" -msgstr "操作系统发行版本" +msgstr "操作系统发行版" msgid "OS Code Name" -msgstr "操作系统代码" +msgstr "操作系统代号" msgid "Processor" msgstr "处理器" @@ -625,7 +625,7 @@ msgid "System Statistics" msgstr "系统统计信息" msgid "Collecting data after leaving this page" -msgstr "离开该页面继续收集数据" +msgstr "离开该页面仍继续收集数据" msgid "Update Progress" msgstr "更新进度" @@ -664,7 +664,7 @@ msgid "Enable VLAN" msgstr "启用VLAN" msgid "VLAN ID" -msgstr "VLAN标识符" +msgstr "VLAN号" msgid "No templates found." msgstr "没有发现模板" @@ -780,42 +780,42 @@ msgstr "未知的指定参数：%(value)s" #, python-format msgid "Delete is not allowed for %(resource)s" -msgstr "%(resource)s不允许删除" +msgstr "不允许删除%(resource)s" #, python-format msgid "%(resource)s does not implement update method" -msgstr "%(resource)s 没有实现更新方法" +msgstr "不支持更新%(resource)s" #, python-format msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "%(resource)s不允许被更新参数%(params)s。" +msgstr "不允许被更新%(resource)s的%(params)s参数。" #, python-format msgid "Create is not allowed for %(resource)s" -msgstr "%(resource)s不允许创建" +msgstr "不允许创建%(resource)s" msgid "Unable to parse JSON request" -msgstr "不能解析JSON请求" +msgstr "无法解析JSON请求" msgid "This API only supports JSON" msgstr "这个API仅支持JSON" msgid "Datastore is not initiated in the model object." -msgstr "model对象中没有初始化数据存储。" +msgstr "尚未为model对象初始化数据存储。" #, python-format msgid "Authentication failed for user '%(userid)s'. [Error code: %(code)s]" msgstr "用户 '%(userid)s' 验证失败。[错误代码： %(code)s]" msgid "You are not authorized to access Kimchi" -msgstr "你没有被授权访问Kimchi" +msgstr "您没有被授权访问Kimchi" #, python-format msgid "Specify %(item)s to login into Kimchi" -msgstr "指定 %(item)s 登陆Kimchi" +msgstr "指定登录Kimchi的%(item)s" msgid "This operation is not allowed as you have restricted access to Kimchi." -msgstr "你被限制访问Kimchi，该操作不允许。" +msgstr "您的访问受限，不允许执行该操作。" #, python-format msgid "Error while getting block devices. Details: %(err)s" @@ -823,7 +823,7 @@ msgstr "获取块设备时出错。详情：%(err)s" #, python-format msgid "Error while getting block device information for %(device)s." -msgstr "获取会设备 %(device)s 信息时出错。" +msgstr "获取块设备 %(device)s 信息时出错。" #, python-format msgid "Unable to find distro file: %(filename)s" @@ -832,15 +832,15 @@ msgstr "找不到发行版文件：%(filename)s" #, python-format msgid "" "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file." -msgstr "不能解析发行版文件：%(filename)s。确定它是一个JSON格式的文件。" +msgstr "不能解析发行版文件：%(filename)s。请确保它是一个JSON格式的文件。" #, python-format msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s" -msgstr "不能登陆iSCSI主机上的目标 %(portal)s。详情：%(err)s" +msgstr "无法通过 %(portal)s 登录iSCSI主机和目标。详情：%(err)s" #, python-format msgid "Unable to login to iSCSI host %(host)s target %(target)s" -msgstr "不能登陆iSCSI主机%(host)s上的目标%(target)s。" +msgstr "无法登录iSCSI主机%(host)s上的目标%(target)s。" #, python-format msgid "Unable to find ISO file ISO %(filename)s" @@ -848,7 +848,7 @@ msgstr "找不到ISO文件： %(filename)s" #, python-format msgid "The ISO file %(filename)s is not bootable" -msgstr "ISO文件%(filename)s不是可引导的。" +msgstr "ISO文件%(filename)s不可引导。" #, python-format msgid "The ISO file %(filename)s does not have a valid El Torito boot record" @@ -856,19 +856,19 @@ msgstr "ISO文件%(filename)s没有有效的El Torito引导记录。" #, python-format msgid "Invalid El Torito validation entry in ISO %(filename)s" -msgstr "在ISO %(filename)s，无效的El Torito检验条目。" +msgstr "在ISO文件%(filename)s中发现无效的El Torito校验条目。。" #, python-format msgid "Invalid El Torito boot indicator in ISO %(filename)s" -msgstr "无效的El Torito引导指示在ISO %(filename)s中" +msgstr "ISO文件%(filename)s的El Torito引导标志是无效的" #, python-format msgid "Unexpected volume type for primary volume in ISO %(filename)s" -msgstr "在ISO%(filename)s中，主卷的卷类型不可识别" +msgstr "未能识别ISO文件%(filename)s的主卷类型" #, python-format msgid "Bad format while reading volume descriptor in ISO %(filename)s" -msgstr "读ISO %(filename)s的描述符遇到错误格式" +msgstr "ISO文件%(filename)s的卷描述符格式错误" #, python-format msgid "" @@ -878,10 +878,9 @@ msgid "" "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x " "'path_to_iso'.Details: %(err)s" msgstr "" -"hypervisor没有权限访问ISO %(filename)s。可以将ISO移到/var/lib/libvirt目录下，" -"或者如果可能，为'%(user)s'用户设置访问权限，或者将'%(user)s'用户增加到ISO路径" -"所在的组，或者为所有的用户增加访问权限 'chmod -R o+x '，该方法不推荐。详情：" -"%(err)s" +"hypervisor没有访问ISO文件%(filename)s的权限。可以将ISO移到/var/lib/libvirt目" +"录下；或为'%(user)s'用户设置访问权限；或将'%(user)s'用户增加到ISO路径的属组；" +"或者为所有的用户增加访问权限 'chmod -R o+x '（不推荐）。详情：%(err)s" #, python-format msgid "Virtual machine %(name)s already exists" @@ -896,19 +895,18 @@ msgid "" "Unable to rename virtual machine %(name)s. The name %(new_name)s already " "exists or it is not powered off." msgstr "" -"不能重命名虚拟机%(name)s。虚拟机不是关机状态，或者‘%(new_name)s’名字已经存" -"在。" +"不能重命名虚拟机%(name)s。虚拟机正在运行，或者‘%(new_name)s’名字已经存在。" #, python-format msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s" -msgstr "不能获取停止状态的虚拟机%(name)s的抓屏" +msgstr "不能获取停止状态的虚拟机%(name)s的截屏" msgid "Remote ISO image is not supported by this server." -msgstr "该server不支持远程ISO镜像。" +msgstr "该服务器不支持远程ISO镜像。" #, python-format msgid "Screenshot not supported for virtual machine %(name)s" -msgstr "虚拟机 %(name)s 不支持抓屏" +msgstr "虚拟机 %(name)s 不支持截屏" #, python-format msgid "Unable to create virtual machine %(name)s. Details: %(err)s" @@ -938,13 +936,13 @@ msgid "Invalid storage pool URI: %(value)s specified for virtual machine" msgstr "给虚拟机指定的存储池URI%(value)s无效" msgid "Supported virtual machine graphics are spice or VNC" -msgstr "支持的虚拟机图形是spice或者VNC" +msgstr "虚拟机图形可设置为Spice或者VNC" msgid "Graphics address to listen on must be IPv4 or IPv6" -msgstr "监听的图形网路地址必须是IPv4或者IPv6" +msgstr "远程图形访问的监听地址必须是IPv4或IPv6地址。" msgid "Specify a template to create a virtual machine from" -msgstr "指定一个模板用来创建一个虚拟机" +msgstr "指定用于创建虚拟机的模板" #, python-format msgid "Unable to start virtual machine %(name)s. Details: %(err)s" @@ -960,7 +958,7 @@ msgstr "不能删除虚拟机 %(name)s. 详情：%(err)s" #, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" -msgstr "在虚拟机 %(name)s 不存在 %(iface)s 接口" +msgstr "虚拟机 %(name)s 中没有接口 %(iface)s" #, python-format msgid "" @@ -968,7 +966,7 @@ msgid "" msgstr "为虚拟机%(name)s指定的网络%(network)s不存在" msgid "Do not support guest interface hot plug attachment" -msgstr "不支持客户机接口的热插拔挂载" +msgstr "不支持客户机接口的热插拔" msgid "Supported virtual machine interfaces type is only network" msgstr "只支持网络类型的虚拟机接口" @@ -980,7 +978,7 @@ msgid "Invalid network model card specified for virtual machine interface" msgstr "虚拟机接口指定的网络模型卡无效" msgid "Specify type and network to add a new virtual machine interface" -msgstr "指定类型和网络来怎加一个新的虚拟机接口" +msgstr "为新的虚拟机接口指定类型和网络" #, python-format msgid "Template %(name)s already exists" @@ -1025,7 +1023,7 @@ msgid "Template distribution version must be a string" msgstr "模板的发行版版本号必须是一个字符串" msgid "The number of CPUs must be a integer" -msgstr "CPUs的个数必须是一个整数" +msgstr "CPU的个数必须是一个整数" msgid "Amount of memory (MB) must be an integer greater than 512" msgstr "总内存数（MB为单位）必须是一个大于512的整数" @@ -1035,10 +1033,10 @@ msgstr "模板的CDROM必须是一个本地或者远程的ISO文件" #, python-format msgid "Invalid storage pool URI %(value)s specified for template" -msgstr "给模板指定了无效的存储池URI%(value)s" +msgstr "给模板指定了无效的存储池URI %(value)s" msgid "Specify an ISO image as CDROM to create a template" -msgstr "指定一个ISO的镜像作为CDROM来创建一个模板" +msgstr "为新模版的CDROM指定一个ISO的镜像" msgid "All networks for the template must be specified in a list." msgstr "为模板指定的网络必须在一个列表中" @@ -1063,7 +1061,7 @@ msgstr "自启动标志必须是true或者false" #, python-format msgid "Specify %(item)s in order to create the storage pool %(name)s" -msgstr "指定%(item)s来创建一个存储池%(name)s" +msgstr "为新存储池%(name)s指定%(item)s" #, python-format msgid "Unable to delete active storage pool %(name)s" @@ -1137,13 +1135,13 @@ msgid "Port of a remote storage server must be an integer between 1 and 65535" msgstr "远程存储服务器的端口必须是1到65535之间的整数" msgid "Login username of the iSCSI target must be a string" -msgstr "iSCSI目标的登陆用户名必须是一个字符串" +msgstr "iSCSI目标的登录用户名必须是一个字符串" msgid "Login password of the iSCSI target must be a string" -msgstr "iSCSI目标的登陆密码必须是一个字符串" +msgstr "iSCSI目标的登录密码必须是一个字符串" msgid "Specify name and type to create a storage pool" -msgstr "指定名字和类型来创建一个存储池" +msgstr "为新存储池指定名字和类型" #, python-format msgid "" @@ -1156,10 +1154,10 @@ msgid "Error while extending logical pool %(pool)s. Details: %(err)s" msgstr "扩展逻辑卷%(pool)s失败。详情：%(err)s" msgid "The parameter disks only can be updated for logical storage pool." -msgstr "磁盘参数只能被用在逻辑存储池更新。" +msgstr "只有逻辑存储池支持更新磁盘参数。" msgid "The SCSI host adapter name must be a string." -msgstr "SCSI主机适配器名字必须是个字符串" +msgstr "SCSI主机适配器名必须是个字符串" msgid "The storage pool kimchi_isos is reserved for internal use" msgstr "存储池kimchi_isos留作内部使用" @@ -1197,7 +1195,7 @@ msgstr "存储卷%(name)s已经存在" #, python-format msgid "Storage volume %(name)s does not exist in storage pool %(pool)s" -msgstr "存储卷%(name)s不存在存储池%(pool)s中" +msgstr "存储池%(pool)s中没有存储卷%(name)s" #, python-format msgid "" @@ -1207,7 +1205,7 @@ msgstr "不能创建存储卷%(volume)s，因为存储池%(pool)s没有激活" #, python-format msgid "Specify %(item)s in order to create storage volume %(volume)s" -msgstr "指定%(item)s来创建存储卷%(volume)s" +msgstr "为新存储卷%(volume)s指定指定%(item)s" #, python-format msgid "" @@ -1317,10 +1315,10 @@ msgid "Network interface must be a string" msgstr "网络接口必须是一个字符串" msgid "Network VLAN ID must be an integer between 1 and 4094" -msgstr "网络VLAN标识符必须是1到4094之间的整数" +msgstr "网络VLAN号必须是1到4094之间的整数" msgid "Specify name and type to create a Network" -msgstr "指定名字和类型来创建网络" +msgstr "为新网络指定名字和类型" #, python-format msgid "" @@ -1336,7 +1334,7 @@ msgstr "不能停用网络%(name)s。有虚拟机或者模板与这个网络关 #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." -msgstr "桥设备%(name)s不能是一个VLAN的trunk设备" +msgstr "不能以桥设备%(name)s作为VLAN的trunk设备。" #, python-format msgid "Debug report %(name)s does not exist" @@ -1351,7 +1349,7 @@ msgstr "不能创建诊断报告%(name)s。详情：%(err)s" #, python-format msgid "Can not find any generated debug report matching name %(name)s" -msgstr "找不到任何与%(name)s名字匹配的生成的诊断报告" +msgstr "找不到任何与%(name)s名字匹配的诊断报告" #, python-format msgid "Unable to generate debug report %(name)s. Details: %(err)s" @@ -1366,7 +1364,7 @@ msgstr "名字必须是一个字符串。只允许字母、数字和连字符 (' #, python-format msgid "Storage server %(server)s was not used by Kimchi" -msgstr "存储服务器%(server)s没被Kimchi使用" +msgstr "存储服务器%(server)s未被Kimchi使用" #, python-format msgid "Distro '%(name)s' does not exist" @@ -1430,7 +1428,7 @@ msgid "Device name %(dev_name)s already exists in vm %(vm_name)s" msgstr "设备%(dev_name)s在vm%(vm_name)s上已存在" msgid "Can't specify a directory for a CDROM device path" -msgstr "不能为CDROM设备路径指定一个目录" +msgstr "CDROM设备路径不能是一个目录" #, python-format msgid "The storage device %(dev_name)s does not exist in the guest %(vm_name)s" @@ -1449,16 +1447,16 @@ msgid "Error while removing storage device: %(error)s" msgstr "移除存储设备时出错：%(error)s" msgid "Do not support guest CDROM hot plug attachment" -msgstr "不支持客户机热插拔挂载CDROM" +msgstr "不支持客户机热插拔CDROM" msgid "Specify type and path to add a new virtual machine disk" -msgstr "指定类型和路径来增加一个新的虚拟机磁盘" +msgstr "为新虚拟机磁盘指定类型和路径" msgid "Specify path to update virtual machine disk" -msgstr "指定路径来更新虚拟机磁盘" +msgstr "指定更新虚拟机磁盘的路径" msgid "YUM Repository ID must be one word only string." -msgstr "YUM软件仓库ID必须是一个单词或者字符串" +msgstr "YUM软件仓库ID必须是只包含一个单词的字符串" msgid "Repository URL must be an http://, ftp:// or file:// URL." msgstr "软件仓库URL必须是http://、 ftp:// 或 file://" @@ -1472,7 +1470,7 @@ msgid "Distribution to DEB repository must be a string" msgstr "DEB仓库的发行版本必须是一个字符串" msgid "Components to DEB repository must be listed in a array" -msgstr "DEB仓库的组件必须列到一个数组" +msgstr "DEB仓库的组件必须以数组形式列出" msgid "Components to DEB repository must be a string" msgstr "DEB仓库的组件必须是一个字符串" @@ -1484,10 +1482,10 @@ msgid "YUM Repository name must be string." msgstr "YUM仓库的名字必须是一个字符串" msgid "GPG check must be a boolean value." -msgstr "GPG核对必须是一个布尔值" +msgstr "GPG校验必须是一个布尔值" msgid "GPG key must be a URL pointing to the ASCII-armored file." -msgstr "GPG键必须是一个指向ASCII盔甲文件的URL" +msgstr "GPG键必须是一个指向ASCII转义文件（.asc文件）的URL" #, python-format msgid "Could not update repository %(repo_id)s." @@ -1507,7 +1505,7 @@ msgstr "您的系统无法识别软件管理工具" #, python-format msgid "Repository %(repo_id)s is already enabled." -msgstr "软件仓库%(repo_id)s已经使能。" +msgstr "软件仓库%(repo_id)s已经启用。" #, python-format msgid "Repository %(repo_id)s is already disabled." @@ -1517,16 +1515,15 @@ msgstr "软件仓库%(repo_id)s已经禁用。" msgid "Could not remove repository %(repo_id)s." msgstr "不能移除软件仓库%(repo_id)s" -#, python-format msgid "Could not write repository configuration file %(repo_file)s" -msgstr "不能写软件仓库的配置文件%(repo_file)s" +msgstr "无法写软件仓库的配置文件%(repo_file)s" msgid "Specify repository distribution in order to create a DEB repository." msgstr "指定软件仓库发行版本来创建一个DEB仓库。" #, python-format msgid "Could not enable repository %(repo_id)s." -msgstr "不能使能软件仓库%(repo_id)s" +msgstr "不能启用软件仓库%(repo_id)s" #, python-format msgid "Could not disable repository %(repo_id)s." -- 1.8.5.3

3 2

[PATCH] Chinese translation for release 1.2
by shaohef＠linux.vnet.ibm.com 28 Mar '14

28 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Chinese translation for release 1.2 Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- po/zh_CN.po | 666 ++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 404 insertions(+), 262 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 8298492..7377c0f 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-18 08:09-0300\n" +"POT-Creation-Date: 2014-03-27 01:00+0800\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" @@ -54,7 +54,7 @@ msgstr "虚拟机名称" msgid "" "The name used to identify the virtual machine. If omitted, a name will be " "chosen based on the template used." -msgstr "" +msgstr "名字用来标识虚拟机。如果省略，将会基于使用的模板选择一个名字。" msgid "Template" msgstr "模板" @@ -86,9 +86,8 @@ msgstr "创建" msgid "Edit Guest" msgstr "修改客户机" -#, fuzzy msgid "General" -msgstr "生成" +msgstr "常规" msgid "Storage" msgstr "存储" @@ -103,16 +102,16 @@ msgid "Icon" msgstr "图标" msgid "Attach" -msgstr "" +msgstr "装载" msgid "Save" msgstr "保存" msgid "Replace" -msgstr "" +msgstr "替换" msgid "Detach" -msgstr "" +msgstr "卸载" msgid "Start" msgstr "启用" @@ -130,7 +129,7 @@ msgid "Connect" msgstr "连接到" msgid "Manage Media" -msgstr "" +msgstr "管理光盘介质" msgid "Edit" msgstr "编辑" @@ -169,21 +168,22 @@ msgid "Failed to get application configuration" msgstr "获取应用配置失败" msgid "This is not a valid Linux path" -msgstr "" +msgstr "这不是一个有效的Linux路径" msgid "This is not a valid URL." -msgstr "" +msgstr "这不是一个有效的URL" msgid "No such data available." -msgstr "" +msgstr "没有可用的数据" msgid "options needed." -msgstr "" +msgstr "选项缺失" msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " msgstr "" +"连接不上主机。核对主机系统是启动的，并且能通过网络连接主机。HTTP请求响应：%1" msgid "Delete Confirmation" msgstr "删除确认" @@ -200,9 +200,17 @@ msgstr "确认" msgid "Warning" msgstr "警告" -#, fuzzy msgid "Loading..." -msgstr "正在生成..." +msgstr "正在加载..." + +msgid "An error occurs while checking for packages update." +msgstr "检查软件更新时发生错误。" + +msgid "Retry" +msgstr "重试" + +msgid "Detailed message:" +msgstr "详细消息：" msgid "No iso found" msgstr "没有发现ISO文件" @@ -211,13 +219,13 @@ msgid "This is not a valid ISO file." msgstr "这不是一个有效的ISO文件" msgid "It will take long time. Do you want to continue?" -msgstr "" +msgstr "这需要一段时间。你愿意继续吗？" msgid "This will permanently delete the template. Would you like to continue?" -msgstr "" +msgstr "这将永久删除模板。你愿意继续吗？" msgid "Unable to shut down system as there are some virtual machines running!" -msgstr "" +msgstr "有虚拟机在运行，不能关闭主机。" msgid "Max:" msgstr "最大：" @@ -245,27 +253,76 @@ msgid "" "shut down/restarting?" msgstr "关闭或者重启主机会导致没有保存的工作丢失。继续关机/重启？" +msgid "" +"Repository will be removed permanently and can't be recovered. Do you want " +"to continue?" +msgstr "软件仓库将被永久删除，不能恢复。继续？" + +msgid "Repositories" +msgstr "软件仓库" + +msgid "ID" +msgstr "标识符" + +msgid "Base URL" +msgstr "基本URL" + +msgid "Is Mirror" +msgstr "是镜像" + +msgid "URL Args" +msgstr "URL参数" + +msgid "Enabled" +msgstr "使能的" + +msgid "GPG Check" +msgstr "GPG核对" + +msgid "GPG Key" +msgstr "GPG键" + +msgid "Add" +msgstr "增加" + +msgid "Remove" +msgstr "删除" + +msgid "Failed." +msgstr "失败" + +msgid "Enable" +msgstr "使能" + +msgid "Disable" +msgstr "禁用" + msgid "Software Updates" -msgstr "" +msgstr "软件更新" msgid "Package Name" -msgstr "" +msgstr "软件包名称" msgid "Version" msgstr "版本" msgid "Architecture" -msgstr "" +msgstr "体系结构" msgid "Repository" -msgstr "" +msgstr "软件仓库" msgid "Update All" -msgstr "" +msgstr "更新所有" -#, fuzzy msgid "Updating..." -msgstr "正在生成..." +msgstr "正在更新..." + +msgid "Failed to retrieve updates." +msgstr "获取更新失败" + +msgid "Failed to update package(s)." +msgstr "更新软件包失败" msgid "" "Debug report will be removed permanently and can't be recovered. Do you want " @@ -275,9 +332,6 @@ msgstr "诊断报告将被永久删除，并且不能恢复。继续？" msgid "Debug Reports" msgstr "主机诊断报告" -msgid "File Path" -msgstr "文件路径" - msgid "Generated Time" msgstr "生成时间" @@ -290,43 +344,39 @@ msgstr "正在生成..." msgid "Rename" msgstr "重命名" -msgid "Remove" -msgstr "删除" - msgid "Download" msgstr "下载" msgid "Report name should contain only letters, digits and/or hyphen ('-')." -msgstr "" +msgstr "报告名字中只能包含字母、数字或连字符（-）。" msgid "" "This will delete the virtual machine and its virtual disks. This operation " "cannot be undone. Would you like to continue?" -msgstr "" +msgstr "这将删除虚拟机和它的虚拟磁盘。该操作不能撤销，继续吗？" msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " "to detach it?" -msgstr "" +msgstr "CDROM将被永久卸载，你可以重新装载它。继续卸载？" msgid "Attaching..." -msgstr "" +msgstr "正在装载" -#, fuzzy msgid "Replacing..." -msgstr "正在生成..." +msgstr "正在替换..." msgid "Successfully attached!" -msgstr "" +msgstr "成功装载" msgid "Successfully replaced!" -msgstr "" +msgstr "成功替换" msgid "Successfully detached!" -msgstr "" +msgstr "成功卸载" msgid "The VLAN id must be between 1 and 4094." -msgstr "" +msgstr "VLAN 标识符必须在1和4094之间" msgid "unavailable" msgstr "无法获取" @@ -341,7 +391,7 @@ msgstr "创建一个网络" msgid "" "This will permanently delete the storage pool. Would you like to continue?" -msgstr "" +msgstr "这将永久删除存储池。继续？" msgid "This storage pool is empty." msgstr "这个存储池为空" @@ -351,23 +401,29 @@ msgid "" "to continue? " msgstr "你的磁盘将会格式化，磁盘上的数据会丢失，你确定要继续吗？" +msgid "SCSI Fibre Channel" +msgstr "SCSI光纤通道" + +msgid "No SCSI adapters found." +msgstr "没有发现SCSI适配器" + msgid "The storage pool name can not be blank." -msgstr "" +msgstr "存储池的名称不能为空" msgid "The storage pool path can not be blank." -msgstr "" +msgstr "存储池的路径不能为空" msgid "NFS server mount path can not be blank." msgstr "NFS服务器挂载路径不能为空" msgid "Invalid storage pool name. It should not contain '/'." -msgstr "无效的存储池的名字。名字不能包含‘/’。" +msgstr "无效的存储池的名字。名字中不能包含‘/’。" msgid "Invalid NFS mount path." -msgstr "" +msgstr "无效的NFS挂载路径" msgid "No logical device selected." -msgstr "" +msgstr "没有选择逻辑设备" msgid "The iSCSI target can not be blank." msgstr "iSCSI目标不能为空" @@ -379,19 +435,18 @@ msgid "This is not a valid Server Name or IP. please, modify it." msgstr "这不是一个有效的服务器名或IP，请修改" msgid "Looking for available partitions ..." -msgstr "" +msgstr "查找有效的分区 ..." -#, fuzzy msgid "No available partitions found." msgstr "没有发现模板" msgid "" "This storage pool is not persistent. Instead of deactivate, this action will " "permanently delete it. Would you like to continue?" -msgstr "" +msgstr "存储池不是持久化的。这个操作将会永久删除存储池而不是停用。继续？" msgid "Help" -msgstr "" +msgstr "帮助" msgid "Log out" msgstr "登出" @@ -415,6 +470,56 @@ msgid "" "The name used to identify the report. If omitted, a name will be chosen " "based on current time. Name can contain: letters, digits and hyphen (\"-\")." msgstr "" +"名字用来标识诊断报告。如果省略，将会基于当前时间生成一个新名字。名字中可以包" +"含字母、数字和连字符（-）" + +msgid "Add a Repository" +msgstr "增加一个软件仓库" + +msgid "Identifier" +msgstr "标识符" + +msgid "Single word, unique identifier for the repository." +msgstr "一个单词，唯一标识软件仓库" + +msgid "Textual name for the repository." +msgstr "软件仓库的字面名字" + +msgid "URL" +msgstr "URL" + +msgid "Required Field" +msgstr "必需的字段" + +msgid "URL to the repository. Supported protocols are http, ftp, and file." +msgstr "软件仓库的URL，支持的协议有http、ftp、和file" + +msgid "Repository is a mirror." +msgstr "软件仓库是一个镜像" + +msgid "Distribution" +msgstr "发行版" + +msgid "Distribution of the DEB repository." +msgstr "DEB仓库的发行版" + +msgid "Components" +msgstr "组件" + +msgid "List of components in DEB repository." +msgstr "DEB仓库中的组件列表" + +msgid "Edit Repository" +msgstr "修改软件仓库" + +msgid "Mirror List URL" +msgstr "镜像列表URL" + +msgid "Yes" +msgstr "是" + +msgid "No" +msgstr "否" msgid "Define a New Storage Pool" msgstr "定义一个新的存储池" @@ -442,19 +547,19 @@ msgid "" msgstr "如果目录不存在，KIMCHI会自动在系统中创建一个新的目录" msgid "NFS Server IP" -msgstr "" +msgstr "NFS服务器IP" msgid "NFS server IP or hostname. It can be input or chosen from history." -msgstr "" +msgstr "NFS服务器IP或者主机名，可以直接输入或者从历史记录中选取。" msgid "NFS Path" msgstr "NFS 路径" msgid "The NFS exported path on NFS server." -msgstr "" +msgstr "NFS服务器上导出的NFS路径" msgid "Device path" -msgstr "" +msgstr "设备路径" msgid "iSCSI Server" msgstr "iSCSI服务器" @@ -480,6 +585,9 @@ msgstr "添加ISCSI认证" msgid "iSCSI Authentication" msgstr "iSCSI认证" +msgid "SCSI Adapter" +msgstr "SCSI适配器" + msgid "CPU" msgstr "处理器" @@ -505,7 +613,7 @@ msgid "Basic Information" msgstr "基本信息" msgid "OS Distro" -msgstr "操作系统发布版本" +msgstr "操作系统发行版本" msgid "OS Code Name" msgstr "操作系统代码" @@ -520,7 +628,7 @@ msgid "Collecting data after leaving this page" msgstr "离开该页面继续收集数据" msgid "Update Progress" -msgstr "" +msgstr "更新进度" msgid "Network Name" msgstr "网络名称" @@ -547,7 +655,7 @@ msgid "NAT: outbound physical network connection only" msgstr "NAT: 从虚拟机到物理网络单向连接" msgid "Bridged: Virtual machines are connected to physical network directly" -msgstr "" +msgstr "桥接：虚拟机可以直接连接到物理网络中。" msgid "Destination" msgstr "目标设备" @@ -556,7 +664,7 @@ msgid "Enable VLAN" msgstr "启用VLAN" msgid "VLAN ID" -msgstr "" +msgstr "VLAN标识符" msgid "No templates found." msgstr "没有发现模板" @@ -637,10 +745,10 @@ msgid "I want to use a specific ISO file" msgstr "指定一个ISO文件" msgid "Loading default remote ISOs ..." -msgstr "" +msgstr "加载默认的远程ISOs ..." msgid "Arch: " -msgstr "" +msgstr "体系结构：" msgid "I want to use a custom URL" msgstr "我想用一个自定义的URL" @@ -660,108 +768,107 @@ msgstr "磁盘（GB）" msgid "CDROM" msgstr "光驱" -#, fuzzy msgid "Graphics" -msgstr "显示" +msgstr "图形" msgid "Storage Pool" msgstr "存储池" #, python-format msgid "Unkown parameter specified %(value)s" -msgstr "" +msgstr "未知的指定参数：%(value)s" #, python-format msgid "Delete is not allowed for %(resource)s" -msgstr "" +msgstr "%(resource)s不允许删除" #, python-format msgid "%(resource)s does not implement update method" -msgstr "" +msgstr "%(resource)s 没有实现更新方法" #, python-format msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "" +msgstr "%(resource)s不允许被更新参数%(params)s。" #, python-format msgid "Create is not allowed for %(resource)s" -msgstr "" +msgstr "%(resource)s不允许创建" msgid "Unable to parse JSON request" -msgstr "" +msgstr "不能解析JSON请求" -msgid "This API only supports" -msgstr "" +msgid "This API only supports JSON" +msgstr "这个API仅支持JSON" msgid "Datastore is not initiated in the model object." -msgstr "" +msgstr "model对象中没有初始化数据存储。" #, python-format msgid "Authentication failed for user '%(userid)s'. [Error code: %(code)s]" -msgstr "" +msgstr "用户 '%(userid)s' 验证失败。[错误代码： %(code)s]" msgid "You are not authorized to access Kimchi" -msgstr "" +msgstr "你没有被授权访问Kimchi" #, python-format msgid "Specify %(item)s to login into Kimchi" -msgstr "" +msgstr "指定 %(item)s 登陆Kimchi" msgid "This operation is not allowed as you have restricted access to Kimchi." -msgstr "" +msgstr "你被限制访问Kimchi，该操作不允许。" #, python-format msgid "Error while getting block devices. Details: %(err)s" -msgstr "" +msgstr "获取块设备时出错。详情：%(err)s" #, python-format msgid "Error while getting block device information for %(device)s." -msgstr "" +msgstr "获取会设备 %(device)s 信息时出错。" #, python-format msgid "Unable to find distro file: %(filename)s" -msgstr "" +msgstr "找不到发行版文件：%(filename)s" #, python-format msgid "" "Unable to parse distro file: %(filename)s. Make sure, it is a JSON file." -msgstr "" +msgstr "不能解析发行版文件：%(filename)s。确定它是一个JSON格式的文件。" #, python-format msgid "Unable to login to iSCSI host target %(portal)s. Details: %(err)s" -msgstr "" +msgstr "不能登陆iSCSI主机上的目标 %(portal)s。详情：%(err)s" #, python-format msgid "Unable to login to iSCSI host %(host)s target %(target)s" -msgstr "" +msgstr "不能登陆iSCSI主机%(host)s上的目标%(target)s。" #, python-format msgid "Unable to find ISO file ISO %(filename)s" -msgstr "" +msgstr "找不到ISO文件： %(filename)s" #, python-format msgid "The ISO file %(filename)s is not bootable" -msgstr "" +msgstr "ISO文件%(filename)s不是可引导的。" #, python-format msgid "The ISO file %(filename)s does not have a valid El Torito boot record" -msgstr "" +msgstr "ISO文件%(filename)s没有有效的El Torito引导记录。" #, python-format msgid "Invalid El Torito validation entry in ISO %(filename)s" -msgstr "" +msgstr "在ISO %(filename)s，无效的El Torito检验条目。" #, python-format msgid "Invalid El Torito boot indicator in ISO %(filename)s" -msgstr "" +msgstr "无效的El Torito引导指示在ISO %(filename)s中" #, python-format msgid "Unexpected volume type for primary volume in ISO %(filename)s" -msgstr "" +msgstr "在ISO%(filename)s中，主卷的卷类型不可识别" #, python-format msgid "Bad format while reading volume descriptor in ISO %(filename)s" -msgstr "" +msgstr "读ISO %(filename)s的描述符遇到错误格式" #, python-format msgid "" @@ -771,650 +878,685 @@ msgid "" "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x " "'path_to_iso'.Details: %(err)s" msgstr "" +"hypervisor没有权限访问ISO %(filename)s。可以将ISO移到/var/lib/libvirt目录下，" +"或者如果可能，为'%(user)s'用户设置访问权限，或者将'%(user)s'用户增加到ISO路径" +"所在的组，或者为所有的用户增加访问权限 'chmod -R o+x '，该方法不推荐。详情：" +"%(err)s" #, python-format msgid "Virtual machine %(name)s already exists" -msgstr "" +msgstr "虚拟机%(name)s已经存在" #, python-format msgid "Virtual machine %(name)s does not exist" -msgstr "" +msgstr "虚拟机%(name)s不存在" #, python-format msgid "" "Unable to rename virtual machine %(name)s. The name %(new_name)s already " "exists or it is not powered off." msgstr "" +"不能重命名虚拟机%(name)s。虚拟机不是关机状态，或者‘%(new_name)s’名字已经存" +"在。" #, python-format msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s" -msgstr "" +msgstr "不能获取停止状态的虚拟机%(name)s的抓屏" msgid "Remote ISO image is not supported by this server." -msgstr "" +msgstr "该server不支持远程ISO镜像。" #, python-format msgid "Screenshot not supported for virtual machine %(name)s" -msgstr "" +msgstr "虚拟机 %(name)s 不支持抓屏" #, python-format msgid "Unable to create virtual machine %(name)s. Details: %(err)s" -msgstr "" +msgstr "不能创建虚拟机%(name)s。详情：%(err)s" #, python-format msgid "Unable to rename virtual machine %(name)s. Details: %(err)s" -msgstr "" +msgstr "不能重命名虚拟机%(name)s。详情：%(err)s" -msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)" -msgstr "" +#, python-format +msgid "Unable to retrieve virtual machine %(name)s. Details: %(err)s" +msgstr "不能获取虚拟机%(name)s。详情：%(err)s" #, python-format msgid "Unable to connect to powered off machine %(name)s." -msgstr "" +msgstr "不能连接已关闭的机器%(name)s。" msgid "Virtual machine name must be a string" -msgstr "" +msgstr "虚拟机名字必须是个字符串" #, python-format msgid "Invalid template URI: %(value)s specified for virtual machine" -msgstr "" +msgstr "给虚拟机指定的模板URI%(value)s无效" #, python-format msgid "Invalid storage pool URI: %(value)s specified for virtual machine" -msgstr "" +msgstr "给虚拟机指定的存储池URI%(value)s无效" msgid "Supported virtual machine graphics are spice or VNC" -msgstr "" +msgstr "支持的虚拟机图形是spice或者VNC" msgid "Graphics address to listen on must be IPv4 or IPv6" -msgstr "" +msgstr "监听的图形网路地址必须是IPv4或者IPv6" msgid "Specify a template to create a virtual machine from" -msgstr "" +msgstr "指定一个模板用来创建一个虚拟机" msgid "Volume list (LUNs names) not given." -msgstr "" +msgstr "卷列表（LUNs名字）没有给定。" msgid "" "Virtual machine volumes must be a list of strings with distinct LUNs names." -msgstr "" +msgstr "虚拟机的卷必须是一个含有清楚的LUNs名的字符串列表" #, python-format msgid "Unable to start virtual machine %(name)s. Details: %(err)s" -msgstr "" +msgstr "不能启动虚拟机 %(name)s. 详情：%(err)s" #, python-format msgid "Unable to stop virtual machine %(name)s. Details: %(err)s" -msgstr "" +msgstr "不能停止虚拟机 %(name)s. 详情：%(err)s" #, python-format msgid "Unable to delete virtual machine %(name)s. Details: %(err)s" -msgstr "" +msgstr "不能删除虚拟机 %(name)s. 详情：%(err)s" #, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" -msgstr "" +msgstr "在虚拟机 %(name)s 不存在 %(iface)s 接口" #, python-format msgid "" "Network %(network)s specified for virtual machine %(name)s does not exist" -msgstr "" +msgstr "为虚拟机%(name)s指定的网络%(network)s不存在" msgid "Do not support guest interface hot plug attachment" -msgstr "" +msgstr "不支持客户机接口的热插拔挂载" msgid "Supported virtual machine interfaces type is only network" -msgstr "" +msgstr "只支持网络类型的虚拟机接口" msgid "Network name for virtual machine interface must be a string" -msgstr "" +msgstr "虚拟机接口的网络名字必须是字符串" msgid "Invalid network model card specified for virtual machine interface" -msgstr "" +msgstr "虚拟机接口指定的网络模型卡无效" msgid "Specify type and network to add a new virtual machine interface" -msgstr "" +msgstr "指定类型和网络来怎加一个新的虚拟机接口" #, python-format msgid "Template %(name)s already exists" -msgstr "" +msgstr "模板 %(name)s 已经存在" #, python-format msgid "Template %(name)s does not exist" -msgstr "" +msgstr "模板 %(name)s 不存在" #, python-format msgid "" "Network '%(network)s' specified for template %(template)s does not exist" -msgstr "" +msgstr "为模板 %(template)s 指定的网络 '%(network)s' 不存在" #, python-format msgid "" "Storage pool %(pool)s specified for template %(template)s does not exist" -msgstr "" +msgstr "为模板 %(template)s 指定的存储池 '%(pool)s' 不存在" #, python-format msgid "Storage pool %(pool)s specified for template %(template)s is not active" -msgstr "" +msgstr "为模板 %(template)s 指定的存储池 '%(pool)s' 没有激活" #, python-format msgid "Invalid parameter '%(param)s' specified for CDROM." -msgstr "" +msgstr "为CDROM指定的参数 '%(param)s' 无效" #, python-format msgid "Network %(network)s specified for template %(template)s is not active" -msgstr "" +msgstr "为模板 %(template)s 指定的网络 '%(network)s' 没有激活" msgid "Template name must be a string" -msgstr "" +msgstr "模板的名字必须是一个字符串" msgid "Template icon must be a path to the image" -msgstr "" +msgstr "模板的图标必须是一个指向镜像的路径" msgid "Template distribution must be a string" -msgstr "" +msgstr "模板的发行版必须是一个字符串" msgid "Template distribution version must be a string" -msgstr "" +msgstr "模板的发行版版本号必须是一个字符串" msgid "The number of CPUs must be a integer" -msgstr "" +msgstr "CPUs的个数必须是一个整数" msgid "Amount of memory (MB) must be an integer greater than 512" -msgstr "" +msgstr "总内存数（MB为单位）必须是一个大于512的整数" msgid "Template CDROM must be a local or remote ISO file" -msgstr "" +msgstr "模板的CDROM必须是一个本地或者远程的ISO文件" #, python-format msgid "Invalid storage pool URI %(value)s specified for template" -msgstr "" +msgstr "给模板指定了无效的存储池URI%(value)s" msgid "Specify an ISO image as CDROM to create a template" -msgstr "" +msgstr "指定一个ISO的镜像作为CDROM来创建一个模板" msgid "All networks for the template must be specified in a list." -msgstr "" +msgstr "为模板指定的网络必须在一个列表中" + +msgid "Must specify a volume to a template, when storage pool is iscsi or scsi" +msgstr "当模板的存储池是iscsi或scsi时，必须为模板指定一个卷" + +#, python-format +msgid "The volume: %(volume)s in not in storage pool %(pool)s" +msgstr "存储池%(pool)s中没有存储卷%(volume)s" #, python-format msgid "Storage pool %(name)s already exists" -msgstr "" +msgstr "存储池%(name)s已经存在" #, python-format msgid "Storage pool %(name)s does not exist" -msgstr "" +msgstr "存储池%(name)s不存在" msgid "Autostart flag must be true or false" -msgstr "" +msgstr "自启动标志必须是true或者false" #, python-format msgid "Specify %(item)s in order to create the storage pool %(name)s" -msgstr "" +msgstr "指定%(item)s来创建一个存储池%(name)s" #, python-format msgid "Unable to delete active storage pool %(name)s" -msgstr "" +msgstr "不能删除激活的存储池 %(name)s" #, python-format msgid "Unable to list storage pools. Details: %(err)s" -msgstr "" +msgstr "不能列举存储池。详情： %(err)s" #, python-format msgid "Unable to create storage pool %(name)s. Details: %(err)s" -msgstr "" +msgstr "不能创建存储池 %(name)s。详情： %(err)s" #, python-format msgid "" "Unable to get number of storage volumes in storage pool %(name)s. Details: " "%(err)s" -msgstr "" +msgstr "不能获取储存池%(name)s中卷的数目。详情： %(err)s" #, python-format msgid "Unable to activate storage pool %(name)s. Details: %(err)s" -msgstr "" +msgstr "不能激活储存池%(name)s。详情： %(err)s" #, python-format msgid "Unable to deactivate storage pool %(name)s. Details: %(err)s" -msgstr "" +msgstr "不能停用储存池%(name)s。详情： %(err)s" #, python-format msgid "Unable to delete storage pool %(name)s. Details: %(err)s" -msgstr "" +msgstr "不能删除储存池%(name)s。详情： %(err)s" #, python-format msgid "" "Unable to create NFS Pool as export path %(path)s may block during mount" -msgstr "" +msgstr "不能创建NFS存储池，可能导出路径%(path)s在挂载时被阻塞了" #, python-format msgid "Unable to create NFS Pool as export path %(path)s mount failed" -msgstr "" +msgstr "不能创建NFS存储池，挂载导出路径%(path)s失败" #, python-format msgid "Unsupported storage pool type: %(type)s" -msgstr "" +msgstr "不支持的存储池类型：%(type)s" #, python-format msgid "Error while getting xml for storage pool %(pool)s" -msgstr "" +msgstr "获取存储池 %(pool)s 的xml时出错" msgid "Storage pool name must be a string" -msgstr "" +msgstr "存储池名字必须是一个字符串" msgid "Supported storage pool types are dir, netfs, logical and kimchi-iso" -msgstr "" +msgstr "支持的存储池类型是dir、netfs、logical 和 kimchi-iso" msgid "Storage pool path must be a string" -msgstr "" +msgstr "存储池路径必须是字符串" msgid "Storage pool host must be a IP or hostname" -msgstr "" +msgstr "存储池主机必须是一个IP后者主机名" msgid "Storage pool devices must be the full path to the block device" -msgstr "" +msgstr "存储池设备必须是完整的块设备路径" msgid "Storage pool devices parameter must be a list" -msgstr "" +msgstr "存储池设备参数必须是一个列表" msgid "Target IQN of an iSCSI pool must be a string" -msgstr "" +msgstr "iSCSI存储池的目标IQN必须是字符串" msgid "Port of a remote storage server must be an integer between 1 and 65535" -msgstr "" +msgstr "远程存储服务器的端口必须是1到65535之间的整数" msgid "Login username of the iSCSI target must be a string" -msgstr "" +msgstr "iSCSI目标的登陆用户名必须是一个字符串" msgid "Login password of the iSCSI target must be a string" -msgstr "" +msgstr "iSCSI目标的登陆密码必须是一个字符串" msgid "Specify name and type to create a storage pool" -msgstr "" +msgstr "指定名字和类型来创建一个存储池" #, python-format msgid "" "%(disk)s is not a valid disk/partition. Could not add it to the pool " "%(pool)s." -msgstr "" +msgstr "%(disk)s 不是有效的磁盘/分区。不能被添加到存储池%(pool)s中" #, python-format msgid "Error while extending logical pool %(pool)s. Details: %(err)s" -msgstr "" +msgstr "扩展逻辑卷%(pool)s失败。详情：%(err)s" msgid "The parameter disks only can be updated for logical storage pool." -msgstr "" +msgstr "磁盘参数只能被用在逻辑存储池更新。" msgid "The SCSI host adapter name must be a string." -msgstr "" +msgstr "SCSI主机适配器名字必须是个字符串" msgid "The storage pool kimchi_isos is reserved for internal use" -msgstr "" +msgstr "存储池kimchi_isos留作内部使用" #, python-format msgid "" "Unable to activate NFS storage pool %(name)s. NFS server %(server)s is " "unreachable." -msgstr "" +msgstr "不能激活NFS存储池%(name)s。NFS服务器%(server)s不可到达。" #, python-format msgid "" "Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is " "unreachable." -msgstr "" +msgstr "不能停用NFS存储池%(name)s。NFS服务器%(server)s不可到达。" #, python-format msgid "" "Unable to deactivate pool %(name)s as it is associated with some templates" -msgstr "" +msgstr "不能停用存储池%(name)s，该存储池与一些模板关联" #, python-format msgid "Unable to delete pool %(name)s as it is associated with some templates" -msgstr "" +msgstr "不能删除存储池%(name)s，该存储池与一些模板关联" #, python-format msgid "" "A volume group named '%(name)s' already exists. Please, choose another name " "to create the logical pool." -msgstr "" +msgstr "卷组'%(name)s'已经存在，请选择其它的名字来创建逻辑存储池。" #, python-format msgid "Storage volume %(name)s already exists" -msgstr "" +msgstr "存储卷%(name)s已经存在" #, python-format msgid "Storage volume %(name)s does not exist in storage pool %(pool)s" -msgstr "" +msgstr "存储卷%(name)s不存在存储池%(pool)s中" #, python-format msgid "" "Unable to create storage volume %(volume)s becuase storage pool %(pool)s is " "not active" -msgstr "" +msgstr "不能创建存储卷%(volume)s，因为存储池%(pool)s没有激活" #, python-format msgid "Specify %(item)s in order to create storage volume %(volume)s" -msgstr "" +msgstr "指定%(item)s来创建存储卷%(volume)s" #, python-format msgid "" "Unable to retrieve storage volume %(volume)s because storage pool %(pool)s " "is not active" -msgstr "" +msgstr "不能获取存储卷%(volume)s，因为存储池%(pool)s没有激活" #, python-format msgid "" "Unable to list storage volumes because storage pool %(pool)s is not active" -msgstr "" +msgstr "不能列出存储卷，因为存储池%(pool)s没有激活" #, python-format msgid "" "Unable to create storage volume %(name)s in storage pool %(pool)s. Details: " "%(err)s" -msgstr "" +msgstr "不能在存储池%(pool)s中创建存储卷%(name)s。详情：%(err)s" #, python-format msgid "" "Unable to list storage volumes in storage pool %(pool)s. Details: %(err)s" -msgstr "" +msgstr "不能在存储池%(pool)s中列出存储卷。详情：%(err)s" #, python-format msgid "Unable to wipe storage volumes %(name)s. Details: %(err)s" -msgstr "" +msgstr "不能擦除存储卷%(name)s。详情：%(err)s" #, python-format msgid "Unable to delete storage volume %(name)s. Details: %(err)s" -msgstr "" +msgstr "不能删除存储卷%(name)s。详情：%(err)s" #, python-format msgid "Unable to resize storage volume %(name)s. Details: %(err)s" -msgstr "" +msgstr "不能改变存储卷%(name)s的大小。详情：%(err)s" #, python-format msgid "Storage type %(type)s does not support volume create and delete" -msgstr "" +msgstr "存储类型%(type)s不支持卷的创建和删除" msgid "Storage volume name must be a string" -msgstr "" +msgstr "存储卷的名字必须是字符串" msgid "Storage volume allocation must be an integer number" -msgstr "" +msgstr "存储卷分配额必须是整数" msgid "Storage volume format not supported" -msgstr "" +msgstr "存储卷格式不支持" msgid "Storage volume requires a volume name" -msgstr "" +msgstr "存储卷需要名字" #, python-format msgid "Interface %(name)s does not exist" -msgstr "" +msgstr "接口%(name)s不存在" #, python-format msgid "Network %(name)s already exists" -msgstr "" +msgstr "网络%(name)s已经存在" #, python-format msgid "Network %(name)s does not exist" -msgstr "" +msgstr "网络%(name)s不存在" #, python-format msgid "Subnet %(subnet)s specified for network %(network)s is not valid." -msgstr "" +msgstr "给网络%(network)s指定的子网%(subnet)s无效" #, python-format msgid "Specify a network interface to create bridged network %(name)s" -msgstr "" +msgstr "指定一个网络接口来创建桥接类型的网络%(name)s" #, python-format msgid "Unable to delete active network %(name)s" -msgstr "" +msgstr "不能删除激活的网络%(name)s" #, python-format msgid "Interface %(iface)s specified for network %(network)s is already in use" -msgstr "" +msgstr "给网络%(network)s指定的接口%(iface)s已被使用" msgid "Interface should be bare NIC, bonding or bridge device." -msgstr "" +msgstr "接口应该是一个裸的网络接口卡、bonding或者桥接设备。" #, python-format msgid "Unable to create network %(name)s. Details: %(err)s" -msgstr "" +msgstr "不能创建网络%(name)s。详情：%(err)s" #, python-format msgid "Unable to find a free IP address for network '%(name)s'" -msgstr "" +msgstr "不能为网络'%(name)s'找到一个未使用的IP网络地址。" +#, python-format msgid "" "Unable to create VLAN tagged bridge using interface %(iface)s. Details: " -"%(err)" -msgstr "" +"%(err)s" +msgstr "不能在接口%(iface)s上创建一个VLAN标签的桥。详情：%(err)s" msgid "Network name must be a string" -msgstr "" +msgstr "网络名称必须是字符串" msgid "Supported network types are isolated, NAT and bridge" -msgstr "" +msgstr "支持的网络类型有隔离、NAT和桥接" msgid "Network subnet must be a string with IP address and prefix or netmask" -msgstr "" +msgstr "网络子网必须是一个IP地址加网络前缀或子网掩码的字符串" msgid "Network interface must be a string" -msgstr "" +msgstr "网络接口必须是一个字符串" msgid "Network VLAN ID must be an integer between 1 and 4094" -msgstr "" +msgstr "网络VLAN标识符必须是1到4094之间的整数" msgid "Specify name and type to create a Network" -msgstr "" +msgstr "指定名字和类型来创建网络" #, python-format msgid "" "Unable to delete network %(name)s. There are some virtual machines and/or " "templates linked to this network." -msgstr "" +msgstr "不能删除网络%(name)s。有虚拟机或者模板与这个网络关联" #, python-format msgid "" "Unable to deactivate network %(name)s. There are some virtual machines and/" "or templates linked to this network." -msgstr "" +msgstr "不能停用网络%(name)s。有虚拟机或者模板与这个网络关联" + +#, python-format +msgid "Bridge device %(name)s can not be the trunk device of a VLAN." +msgstr "桥设备%(name)s不能是一个VLAN的trunk设备" #, python-format msgid "Debug report %(name)s does not exist" -msgstr "" +msgstr "诊断报告%(name)s不存在" msgid "Debug report tool not found in system" -msgstr "" +msgstr "系统上没有诊断报告工具" #, python-format msgid "Unable to create debug report %(name)s. Details: %(err)s." -msgstr "" +msgstr "不能创建诊断报告%(name)s。详情：%(err)s" #, python-format msgid "Can not find any generated debug report matching name %(name)s" -msgstr "" +msgstr "找不到任何与%(name)s名字匹配的生成的诊断报告" #, python-format msgid "Unable to generate debug report %(name)s. Details: %(err)s" -msgstr "" +msgstr "不能生成诊断报告%(name)s。详情：%(err)s" msgid "You should give a name for the debug file report." -msgstr "" +msgstr "应该为诊断文件报告指定一个名字。" msgid "" "Name should be a string. Only letters, digits and hyphen ('-') are allowed." -msgstr "" +msgstr "名字必须是一个字符串。只允许字母、数字和连字符 ('-')。" #, python-format msgid "Storage server %(server)s was not used by Kimchi" -msgstr "" +msgstr "存储服务器%(server)s没被Kimchi使用" #, python-format msgid "Distro '%(name)s' does not exist" -msgstr "" +msgstr "发行版本'%(name)s'不存在" #, python-format msgid "Partition %(name)s does not exist in the host" -msgstr "" +msgstr "主机中上没有分区%(name)s" msgid "Unable to shutdown host machine as there are running virtual machines" -msgstr "" +msgstr "有虚拟机在运行，不能关闭主机" msgid "Unable to reboot host machine as there are running virtual machines" -msgstr "" +msgstr "有虚拟机在运行，不能重起主机" #, python-format msgid "Node device '%(name)s' not found" -msgstr "" +msgstr "没有找到节点设备'%(name)s'" msgid "No packages marked for update" -msgstr "" +msgstr "没有软件包标识要升级" #, python-format msgid "Package %(name)s is not marked to be updated." -msgstr "" +msgstr "软件包%(name)s没有标识为要升级" #, python-format msgid "Error while getting packages marked to be updated. Details: %(err)s" -msgstr "" +msgstr "获取标识为要升级的软件包时出错。详情：%(err)s" msgid "There is no compatible package manager for this system." -msgstr "" +msgstr "系统上没有兼容的软件包管理器" #, python-format msgid "Unable to find %(item)s in datastore" -msgstr "" +msgstr "在数据存储中找不到%(item)s" #, python-format msgid "Invalid URI %(uri)s" -msgstr "" +msgstr "无效的URI %(uri)s" #, python-format msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds" -msgstr "" +msgstr "命令'%(cmd)s'运行%(seconds)s秒后超时。" msgid "Unable to choose a virutal machine name" -msgstr "" +msgstr "不能选择虚拟机名字" msgid "Invalid CDROM device name" -msgstr "" +msgstr "无效的CDROM设备名字" msgid "Invalid storage type. Types supported: 'cdrom'" -msgstr "" +msgstr "无效的存储类型。支持的类型：'cdrom'" #, python-format msgid "The path '%(value)s' is not valid local/remote path for the device" -msgstr "" +msgstr "设备路径'%(value)s'不是一个有效的本地/远程路径" #, python-format msgid "Device name %(dev_name)s already exists in vm %(vm_name)s" -msgstr "" +msgstr "设备%(dev_name)s在vm%(vm_name)s上已存在" msgid "Can't specify a directory for a CDROM device path" -msgstr "" +msgstr "不能为CDROM设备路径指定一个目录" #, python-format msgid "The storage device %(dev_name)s does not exist in the guest %(vm_name)s" -msgstr "" +msgstr "存储设备%(dev_name)s在客户机%(vm_name)s上不存在。" #, python-format msgid "Error while creating new storage device: %(error)s" -msgstr "" +msgstr "创建新的存储设备时出错：%(error)s" #, python-format msgid "Error while updating storage device: %(error)s" -msgstr "" +msgstr "更新存储设备时出错：%(error)s" #, python-format msgid "Error while removing storage device: %(error)s" -msgstr "" +msgstr "移除存储设备时出错：%(error)s" msgid "Do not support guest CDROM hot plug attachment" -msgstr "" +msgstr "不支持客户机热插拔挂载CDROM" msgid "Specify type and path to add a new virtual machine disk" -msgstr "" +msgstr "指定类型和路径来增加一个新的虚拟机磁盘" msgid "Specify path to update virtual machine disk" -msgstr "" +msgstr "指定路径来更新虚拟机磁盘" msgid "YUM Repository ID must be one word only string." -msgstr "" +msgstr "YUM软件仓库ID必须是一个单词或者字符串" msgid "Repository URL must be an http://, ftp:// or file:// URL." -msgstr "" +msgstr "软件仓库URL必须是http://、 ftp:// 或 file://" msgid "" "Repository configuration is a dictionary with specific values according to " "repository type." -msgstr "" +msgstr "软件仓库配置是一个与仓库键和特定值对应的字典" msgid "Distribution to DEB repository must be a string" -msgstr "" +msgstr "DEB仓库的发行版本必须是一个字符串" msgid "Components to DEB repository must be listed in a array" -msgstr "" +msgstr "DEB仓库的组件必须列到一个数组" msgid "Components to DEB repository must be a string" -msgstr "" +msgstr "DEB仓库的组件必须是一个字符串" msgid "Mirror list to DEB repository must be a string" -msgstr "" +msgstr "DEB仓库的镜像列表必须是一个字符串" msgid "YUM Repository name must be string." -msgstr "" +msgstr "YUM仓库的名字必须是一个字符串" msgid "GPG check must be a boolean value." -msgstr "" +msgstr "GPG核对必须是一个布尔值" msgid "GPG key must be a URL pointing to the ASCII-armored file." -msgstr "" +msgstr "GPG键必须是一个指向ASCII盔甲文件的URL" #, python-format msgid "Could not update repository %(repo_id)s." -msgstr "" +msgstr "不能更新软件仓库%(repo_id)s" #, python-format msgid "Repository %(repo_id)s does not exist." -msgstr "" +msgstr "软件仓库%(repo_id)s不存在。" msgid "" "Specify repository base URL or mirror list in order to create a YUM " "repository." -msgstr "" +msgstr "指定软件仓库的基本URL或镜像列表来创建一个YUM软件仓库。" msgid "Repository management tool was not recognized for your system." -msgstr "" +msgstr "您的系统无法识别软件管理工具" #, python-format msgid "Repository %(repo_id)s is already enabled." -msgstr "" +msgstr "软件仓库%(repo_id)s已经使能。" #, python-format msgid "Repository %(repo_id)s is already disabled." -msgstr "" +msgstr "软件仓库%(repo_id)s已经禁用。" #, python-format msgid "Could not remove repository %(repo_id)s." -msgstr "" +msgstr "不能移除软件仓库%(repo_id)s" #, python-format msgid "Could not write repository configuration file %(repo_file)s" -msgstr "" +msgstr "不能写软件仓库的配置文件%(repo_file)s" msgid "Specify repository distribution in order to create a DEB repository." -msgstr "" +msgstr "指定软件仓库发行版本来创建一个DEB仓库。" #, python-format msgid "Could not enable repository %(repo_id)s." -msgstr "" +msgstr "不能使能软件仓库%(repo_id)s" #, python-format msgid "Could not disable repository %(repo_id)s." -msgstr "" +msgstr "不能禁用软件仓库%(repo_id)s" msgid "YUM Repository ID already exists" -msgstr "" +msgstr "YUM仓库ID已经存在" + +msgid "YUM Repository name must be a string" +msgstr "YUM仓库名字必须是一个字符串" -#~ msgid "Create template successfully" -#~ msgstr "创建模板成功" +#, python-format +msgid "Unable to list repositories. Details: '%(err)s'" +msgstr "不能列举软件仓库。详情：'%(err)s'" + +#, python-format +msgid "Unable to retrieve repository information. Details: '%(err)s'" +msgstr "不能获取软件仓库的信息。详情：'%(err)s'" + +#, python-format +msgid "Unable to add repository. Details: '%(err)s'" +msgstr "不能增加软件仓库。详情：'%(err)s'" + +#, python-format +msgid "Unable to remove repository. Details: '%(err)s'" +msgstr "不能移除软件仓库。详情：'%(err)s'" -- 1.8.5.3

4 4

[PATCH 0/3] Create and use jQuery form extensions
by Adam King 28 Mar '14

28 Mar '14

Extend base classes to support form processing Extend jQuery form Make use of the new forms handling capabilities Adam King (3): Extend base classes to support form processing Extend jQuery form Make use of the new forms handling capabilities ui/js/src/kimchi.form.js | 76 +++++++++------------------- ui/js/src/kimchi.grid.js | 2 +- ui/js/src/kimchi.object.js | 85 ++++++++++++++++++++++++++++++++ ui/js/src/kimchi.repository_edit_main.js | 31 +----------- ui/js/src/kimchi.string.js | 45 +++++++++++++++++ 5 files changed, 154 insertions(+), 85 deletions(-) create mode 100644 ui/js/src/kimchi.object.js create mode 100644 ui/js/src/kimchi.string.js -- 1.8.1.4

1 0

[PATCH 0/3] Create and use jQuery form extensions
by Adam King 28 Mar '14

28 Mar '14

Extend base classes to support form processing Extend jQuery form Make use of the new forms handling capabilities Adam King (3): Extend base classes to support form processing Extend jQuery form Make use of the new forms handling capabilities ui/js/src/kimchi.form.js | 76 +++++++++------------------- ui/js/src/kimchi.grid.js | 2 +- ui/js/src/kimchi.object.js | 85 ++++++++++++++++++++++++++++++++ ui/js/src/kimchi.repository_edit_main.js | 31 +----------- ui/js/src/kimchi.string.js | 45 +++++++++++++++++ 5 files changed, 154 insertions(+), 85 deletions(-) create mode 100644 ui/js/src/kimchi.object.js create mode 100644 ui/js/src/kimchi.string.js -- 1.8.1.4

1 0

[PATCH 0/3] Create and use jQuery form extensions
by Adam King 28 Mar '14

28 Mar '14

Extend base classes to support form processing Extend jQuery form Make use of the new forms handling capabilities Adam King (3): Extend base classes to support form processing Extend jQuery form Make use of the new forms handling capabilities ui/js/src/kimchi.form.js | 76 +++++++++------------------- ui/js/src/kimchi.grid.js | 2 +- ui/js/src/kimchi.object.js | 85 ++++++++++++++++++++++++++++++++ ui/js/src/kimchi.repository_edit_main.js | 31 +----------- ui/js/src/kimchi.string.js | 45 +++++++++++++++++ 5 files changed, 154 insertions(+), 85 deletions(-) create mode 100644 ui/js/src/kimchi.object.js create mode 100644 ui/js/src/kimchi.string.js -- 1.8.1.4

1 0

[PATCH 0/3] Create and use jQuery form extensions
by Adam King 28 Mar '14

28 Mar '14

Update fundamental classes Extend jQuery form handling Make use of the new function in the edit repo Adam King (3): Extend base classes to support form processing Extend jQuery form Make use of the new forms handling capabilities ui/js/src/kimchi.form.js | 76 +++++++++------------------- ui/js/src/kimchi.grid.js | 2 +- ui/js/src/kimchi.object.js | 85 ++++++++++++++++++++++++++++++++ ui/js/src/kimchi.repository_edit_main.js | 31 +----------- ui/js/src/kimchi.string.js | 45 +++++++++++++++++ 5 files changed, 154 insertions(+), 85 deletions(-) create mode 100644 ui/js/src/kimchi.object.js create mode 100644 ui/js/src/kimchi.string.js -- 1.8.1.4

1 0

[PATCH 0/3] Create and use jQuery form extensions
by Adam King 28 Mar '14

28 Mar '14

Update fundamental classes Extend jQuery form handling Make use of the new function in the edit repo Adam King (3): Extend base classes to support form processing Extend jQuery form Make use of the new forms handling capabilities ui/js/src/kimchi.form.js | 76 +++++++++------------------- ui/js/src/kimchi.grid.js | 2 +- ui/js/src/kimchi.object.js | 85 ++++++++++++++++++++++++++++++++ ui/js/src/kimchi.repository_edit_main.js | 31 +----------- ui/js/src/kimchi.string.js | 45 +++++++++++++++++ 5 files changed, 154 insertions(+), 85 deletions(-) create mode 100644 ui/js/src/kimchi.object.js create mode 100644 ui/js/src/kimchi.string.js -- 1.8.1.4

1 0

[PATCH V2 0/5] Fix 'disk full' issue
by Rodrigo Trujillo 27 Mar '14

27 Mar '14

V2: Address Aline's comments: - Change error message - Aggregate 'if's V1: If the disk where objectstore (Kimchi database) is full, then a lot of errors will be raised without any special treatment. This can lead the system to an unexpected state. This patchset modifies kimchi in order to give the right treatment to exceptions, showing the error to the user or hidding when possible. Rodrigo Trujillo (5): Fix 'disk full' issue: Change objectstore exception handling Fix 'disk full' issue: Fix Templates db store/delete error handling Fix 'disk full' issue: Fix storage volume error handling Fix 'disk full' issue: Fix storagepool and asynctasks error handling Fix 'disk full' issue: Fix vms/screenshot db store/delete error handling src/kimchi/asynctask.py | 7 ++-- src/kimchi/i18n.py | 5 +++ src/kimchi/model/storagepools.py | 8 +++-- src/kimchi/model/storagevolumes.py | 49 ++++++++++++++++---------- src/kimchi/model/templates.py | 22 ++++++++---- src/kimchi/model/vms.py | 70 +++++++++++++++++++++++++++----------- src/kimchi/objectstore.py | 7 ++++ 7 files changed, 118 insertions(+), 50 deletions(-) -- 1.8.5.3

1 6

Kimchi 1.2 is released!
by Aline Manera 26 Mar '14

26 Mar '14

On behalf of everyone who has worked hard on this release, I am pleased to announce the availability of *Kimchi 1.**2*! This release adds many new features including: * Guest spice console support * Manage guest CDROM devices * iSCSI storage pool * SCSI Fibre Channel storage pool * NFS pool: Discover available export paths given an NFS server * Bridge VLAN tagging * Update system packages * Manage system repositories * Add help pages for each tab We have worked hard to ensure that Kimchi runs well on the most popular Linux distributions including: Fedora 20, Ubuntu 13.10, openSUSE 13.1, and RHEL 6.5. Kimchi uses standard Linux interfaces so it should run well on many other distributions too. You can easily grab this release in tarball format or via git: * https://github.com/kimchi-project/kimchi/archive/kimchi-1.2.0.tar.gz * git clone https://github.com/kimchi-project/kimchi.git Go ahead! Give it a try and let us know what you think! Regards, ---- Aline Manera

1 0

[PATCH] Remove LUN assignment in VM
by Aline Manera 26 Mar '14

26 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> It will be done in Template level. Remove it from VM and update docs accordingly. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- docs/API.md | 2 -- src/kimchi/API.json | 9 +-------- src/kimchi/i18n.py | 2 -- src/kimchi/model/vms.py | 16 +--------------- 4 files changed, 2 insertions(+), 27 deletions(-) diff --git a/docs/API.md b/docs/API.md index f928320..65044f8 100644 --- a/docs/API.md +++ b/docs/API.md @@ -55,8 +55,6 @@ the following general conventions: Independent Computing Environments * null: Graphics is disabled or type not supported * listen: The network which the vnc/spice server listens on. - * volumes *(optional)*: List of Fibre channel LUN names to be assigned as - disk to VM. Required if pool is type SCSI. ### Resource: Virtual Machine diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 8ecd665..5ca94e3 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -190,14 +190,7 @@ "pattern": "^/storagepools/[^/]+/?$", "error": "KCHVM0013E" }, - "graphics": { "$ref": "#/kimchitype/graphics" }, - "volumes": { - "description": "list of scsi volumes to be assigned to the new VM.", - "type": "array", - "items": { "type": "string" }, - "uniqueItems": true, - "error": "KCHVM0018E" - } + "graphics": { "$ref": "#/kimchitype/graphics" } } }, "vm_update": { diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 398d49a..fabb0b4 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -76,8 +76,6 @@ messages = { "KCHVM0014E": _("Supported virtual machine graphics are spice or VNC"), "KCHVM0015E": _("Graphics address to listen on must be IPv4 or IPv6"), "KCHVM0016E": _("Specify a template to create a virtual machine from"), - "KCHVM0017E": _("Volume list (LUNs names) not given."), - "KCHVM0018E": _("Virtual machine volumes must be a list of strings with distinct LUNs names."), "KCHVM0019E": _("Unable to start virtual machine %(name)s. Details: %(err)s"), "KCHVM0020E": _("Unable to stop virtual machine %(name)s. Details: %(err)s"), "KCHVM0021E": _("Unable to delete virtual machine %(name)s. Details: %(err)s"), diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index ef1d617..c8dfc90 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -29,7 +29,7 @@ from kimchi import vnc from kimchi import xmlutils from kimchi.config import READONLY_POOL_TYPE from kimchi.exception import InvalidOperation, InvalidParameter -from kimchi.exception import MissingParameter, NotFoundError, OperationFailed +from kimchi.exception import NotFoundError, OperationFailed from kimchi.model.config import CapabilitiesModel from kimchi.model.templates import TemplateModel from kimchi.model.utils import get_vm_name @@ -153,11 +153,6 @@ class VMsModel(object): 'diskRdKB': diskRdKB, 'diskWrKB': diskWrKB}) - def _get_volume_path(self, pool, vol): - conn = self.conn.get() - pool = conn.storagePoolLookupByName(pool) - return pool.storageVolLookupByName(vol).path() - def create(self, params): conn = self.conn.get() t_name = template_name_from_uri(params['template']) @@ -186,15 +181,6 @@ class VMsModel(object): vol_list = [] if t._get_storage_type() in ["iscsi", "scsi"]: vol_list = [] - elif t._get_storage_type() in READONLY_POOL_TYPE: - if not params.get('volumes'): - raise MissingParameter('KCHVM0017E') - else: - # Get system path of the LUNs - pool = t.info['storagepool'].split('/')[-1] - for vol in params.get('volumes'): - path = self._get_volume_path(pool, vol) - vol_list.append((vol, path)) else: vol_list = t.fork_vm_storage(vm_uuid) -- 1.7.10.4

1 1

[PATCH] Translate pt_BR.po files
by Ramon Medeiros 26 Mar '14

26 Mar '14

Translation to pt_Br, by me and Rodrigo. Ramon Medeiros (1): Translate pt_BR.po file po/pt_BR.po | 505 ++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 272 insertions(+), 233 deletions(-) -- 1.8.3.1

2 2

[PATCH] bug fix: fix the string format %(pool).
by shaohef＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> a "s" should be subfix in string format %(pool). Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index de029f5..8b88cae 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -108,7 +108,7 @@ messages = { "KCHTMPL0016E": _("Specify an ISO image as CDROM to create a template"), "KCHTMPL0017E": _("All networks for the template must be specified in a list."), "KCHTMPL0018E": _("Must specify a volume to a template, when storage pool is iscsi or scsi"), - "KCHTMPL0019E": _("The volume: %(volume)s in not in storage pool %(pool)"), + "KCHTMPL0019E": _("The volume: %(volume)s in not in storage pool %(pool)s"), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), -- 1.8.5.3

3 2

[PATCH V3 0/3] Fix non persistent network handling
by Rodrigo Trujillo 26 Mar '14

26 Mar '14

V3: Changes mockmodel and tests (Royce suggestion) V2: Address Ming comments: - Updates API.md - remove useless comments and return V1: Kimchi networks have the same problem storage had. Non persistent networks are not stop, they are removed by libvirt and this causes an error in Kimchi. Rodrigo Trujillo (3): Fix non persistent network handling (backend) Fix non persistent network handling (frontend) Fix non persistent network handling (mockmodel/tests) docs/API.md | 2 ++ src/kimchi/control/networks.py | 3 ++- src/kimchi/mockmodel.py | 7 +++++- src/kimchi/model/networks.py | 3 ++- tests/test_model.py | 1 + tests/test_rest.py | 1 + ui/js/src/kimchi.network.js | 55 ++++++++++++++++++++++++++++-------------- ui/pages/i18n.html.tmpl | 1 + 8 files changed, 52 insertions(+), 21 deletions(-) -- 1.8.5.3

2 5

[PATCH] Add error handling for repo management
by Adam King 26 Mar '14

26 Mar '14

ListRepo call had no error handler. Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.host.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index acd8e8e..e94bad6 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -176,6 +176,15 @@ kimchi.host_main = function() { repositoriesGrid.setData(repositories); } } + }, + function(error) { + var message = error && error['responseJSON'] && error['responseJSON']['reason']; + + if($.isFunction(gridCallback)) { + gridCallback([]); + } + repositoriesGrid && + repositoriesGrid.showMessage(message || i18n['KCHUPD6008M']); }); $('#repositories-grid-remove-button').prop('disabled', true); -- 1.8.1.4

2 2

[PATCH v2] Logical Storage Pool: Detect and Enumerate Multipath Block Devices
by zhshzhou＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> When creating a logical storage pool Kimci ignores multipath block devices. This is on purpose because at the time the kimchi.disks was implemented, there was not enough time to test every kind of devices. This patch adds the missing support for multipath block devices. After this patch, the kimchi.disks will include multipath devices in the available partition list. The front-end code is also changed accordingly. v2 Use the major device number to determine if a deivce is a multipath one. Use indexOf of the array object to determine if an element is in array. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/disks.py | 13 ++++++++++++- ui/js/src/kimchi.storagepool_add_main.js | 3 ++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/kimchi/disks.py b/src/kimchi/disks.py index ce0c5bb..5f004b3 100644 --- a/src/kimchi/disks.py +++ b/src/kimchi/disks.py @@ -27,8 +27,19 @@ from kimchi.exception import OperationFailed from kimchi.utils import kimchi_log +def _get_friendly_dm_path(maj_min): + """ Returns user friendly dm path given the device number 'major:min' """ + dm_name = "/sys/dev/block/%s/dm/name" % maj_min + with open(dm_name) as dm_f: + content = dm_f.read().rstrip('\n') + return "/dev/mapper/" + content + + def _get_dev_node_path(maj_min): """ Returns device node path given the device number 'major:min' """ + if maj_min.startswith('253:'): + return _get_friendly_dm_path(maj_min) + uevent = "/sys/dev/block/%s/uevent" % maj_min with open(uevent) as ueventf: content = ueventf.read() @@ -137,7 +148,7 @@ def get_partitions_names(): # leaf means a partition, a disk has no partition, or a disk not held # by any multipath device. Physical volume belongs to no volume group # is also listed. Extended partitions should not be listed. - if not (dev['type'] in ['part', 'disk'] and + if not (dev['type'] in ['part', 'disk', 'mpath'] and dev['fstype'] in ['', 'LVM2_member'] and dev['mountpoint'] == "" and _get_vgname(devNodePath) == "" and diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 10833be..a3b60f7 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -27,8 +27,9 @@ kimchi.initStorageAddPage = function() { if (data.length > 0) { var deviceHtml = $('#partitionTmpl').html(); var listHtml = ''; + valid_types = ['part', 'disk', 'mpath']; $.each(data, function(index, value) { - if (value.type === 'part' || value.type === 'disk') { + if (valid_types.indexOf(value.type) != -1) { listHtml += kimchi.template(deviceHtml, value); } }); -- 1.8.5.3

3 2

[PATCH] validate the volume parameter when the pool of template is iscsi or scsi
by shaohef＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> When the pool of template is iscsi or scsi, the volume parameter can not be NULL. And as we discussion, we do not mix disks from 2 different types of storage pools, for instance: we do not create a template with 2 disks, where one comes from a SCSI pool and other is a .img in a DIR pool. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 2 ++ src/kimchi/model/templates.py | 50 +++++++++++++++++++++++++++++++++---------- 2 files changed, 41 insertions(+), 11 deletions(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 1f84034..bcc15b7 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -107,6 +107,8 @@ messages = { "KCHTMPL0015E": _("Invalid storage pool URI %(value)s specified for template"), "KCHTMPL0016E": _("Specify an ISO image as CDROM to create a template"), "KCHTMPL0017E": _("All networks for the template must be specified in a list."), + "KCHTMPL0018E": _("Must specify a volume to a template, when storage pool is iscsi or scsi"), + "KCHTMPL0019E": _("The volume: %(volume)s in not in storage pool %(pool)"), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), diff --git a/src/kimchi/model/templates.py b/src/kimchi/model/templates.py index d49632e..0e5c2b2 100644 --- a/src/kimchi/model/templates.py +++ b/src/kimchi/model/templates.py @@ -55,15 +55,17 @@ class TemplatesModel(object): params['name'] = name conn = self.conn.get() - pool_uri = params.get(u'storagepool', '') if pool_uri: - pool_name = pool_name_from_uri(pool_uri) try: - conn.storagePoolLookupByName(pool_name.encode("utf-8")) + pool_name = pool_name_from_uri(pool_uri) + pool = conn.storagePoolLookupByName(pool_name.encode("utf-8")) except Exception: raise InvalidParameter("KCHTMPL0004E", {'pool': pool_name, 'template': name}) + tmp_volumes = [disk['volume'] for disk in params.get('disks', []) + if 'volume' in disk] + self.template_volume_validate(tmp_volumes, pool) for net_name in params.get(u'networks', []): try: @@ -83,6 +85,28 @@ class TemplatesModel(object): with self.objstore as session: return session.get_list('template') + def template_volume_validate(self, tmp_volumes, pool): + kwargs = {'conn': self.conn, 'objstore': self.objstore} + pool_type = xmlutils.xpath_get_text(pool.XMLDesc(0), "/pool/@type")[0] + pool_name = pool.name() + + # as we discussion, we do not mix disks from 2 different types of + # storage pools, for instance: we do not create a template with 2 + # disks, where one comes from a SCSI pool and other is a .img in + # a DIR pool. + if pool_type in ['iscsi', 'scsi']: + if not tmp_volumes: + raise InvalidParameter("KCHTMPL0018E") + + storagevolumes = __import__("kimchi.model.storagevolumes", + fromlist=['']) + pool_volumes = storagevolumes.StorageVolumesModel( + **kwargs).get_list(pool_name) + vols = set(tmp_volumes) - set(pool_volumes) + if vols: + raise InvalidParameter("KCHTMPL0019E", {'pool': pool_name, + 'volume': vols}) + class TemplateModel(object): def __init__(self, **kargs): @@ -128,18 +152,22 @@ class TemplateModel(object): new_t.update(params) ident = name + conn = self.conn.get() pool_uri = new_t.get(u'storagepool', '') - pool_name = pool_name_from_uri(pool_uri) - try: - conn = self.conn.get() - conn.storagePoolLookupByName(pool_name.encode("utf-8")) - except Exception: - raise InvalidParameter("KCHTMPL0004E", {'pool': pool_name, - 'template': name}) + + if pool_uri: + try: + pool_name = pool_name_from_uri(pool_uri) + pool = conn.storagePoolLookupByName(pool_name.encode("utf-8")) + except Exception: + raise InvalidParameter("KCHTMPL0004E", {'pool': pool_name, + 'template': name}) + tmp_volumes = [disk['volume'] for disk in new_t.get('disks', []) + if 'volume' in disk] + self.templates.template_volume_validate(tmp_volumes, pool) for net_name in params.get(u'networks', []): try: - conn = self.conn.get() conn.networkLookupByName(net_name) except Exception: raise InvalidParameter("KCHTMPL0003E", {'network': net_name, -- 1.8.5.3

4 6

[PATCH ] Fix a typo.
by Leonardo Garcia 26 Mar '14

26 Mar '14

From: Leonardo Garcia <lagarcia(a)br.ibm.com> Signed-off-by: Leonardo Garcia <lagarcia(a)br.ibm.com> --- src/kimchi/model/debugreports.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/model/debugreports.py b/src/kimchi/model/debugreports.py index 6ae282a..7254b1b 100644 --- a/src/kimchi/model/debugreports.py +++ b/src/kimchi/model/debugreports.py @@ -117,7 +117,7 @@ class DebugReportsModel(object): except Exception, e: # No need to call cb to update the task status here. - # The task object will catch the exception rasied here + # The task object will catch the exception raised here # and update the task status there log = logging.getLogger('Model') log.warning('Exception in generating debug file: %s', e) -- 1.8.5.3

5 4

[PATCH] bug fix: fix the string format.
by shaohef＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> a "s" should be subfix in string format. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 398d49a..de70522 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -68,7 +68,7 @@ messages = { "KCHVM0006E": _("Screenshot not supported for virtual machine %(name)s"), "KCHVM0007E": _("Unable to create virtual machine %(name)s. Details: %(err)s"), "KCHVM0008E": _("Unable to rename virtual machine %(name)s. Details: %(err)s"), - "KCHVM0009E": _("Unable to retrieve virtual machine %(name)s. Details: %(err)"), + "KCHVM0009E": _("Unable to retrieve virtual machine %(name)s. Details: %(err)s"), "KCHVM0010E": _("Unable to connect to powered off machine %(name)s."), "KCHVM0011E": _("Virtual machine name must be a string"), "KCHVM0012E": _("Invalid template URI: %(value)s specified for virtual machine"), @@ -173,7 +173,7 @@ messages = { "KCHNET0007E": _("Interface should be bare NIC, bonding or bridge device."), "KCHNET0008E": _("Unable to create network %(name)s. Details: %(err)s"), "KCHNET0009E": _("Unable to find a free IP address for network '%(name)s'"), - "KCHNET0010E": _("Unable to create VLAN tagged bridge using interface %(iface)s. Details: %(err)"), + "KCHNET0010E": _("Unable to create VLAN tagged bridge using interface %(iface)s. Details: %(err)s"), "KCHNET0011E": _("Network name must be a string"), "KCHNET0012E": _("Supported network types are isolated, NAT and bridge"), "KCHNET0013E": _("Network subnet must be a string with IP address and prefix or netmask"), -- 1.8.5.3

2 1

[PATCH] error message fix.
by shaohef＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> This error message is not obscure. Fix it. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index de70522..d9d2ee7 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -29,7 +29,7 @@ messages = { "KCHAPI0004E": _("Parameters %(params)s are not allowed to be updated in %(resource)s"), "KCHAPI0005E": _("Create is not allowed for %(resource)s"), "KCHAPI0006E": _("Unable to parse JSON request"), - "KCHAPI0007E": _("This API only supports"), + "KCHAPI0007E": _("This API only supports JSON"), "KCHASYNC0001E": _("Datastore is not initiated in the model object."), -- 1.8.5.3

2 1

[PATCH] Properly display YUM exception
by Aline Manera 26 Mar '14

26 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> When YUM raises an error it does not set the message exception so while using e.message we get an empty string. Fix it by using str(e) Also releases Kimchi lock before raises the exception. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/repositories.py | 2 +- src/kimchi/swupdate.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/kimchi/repositories.py b/src/kimchi/repositories.py index 1c74f04..3407263 100644 --- a/src/kimchi/repositories.py +++ b/src/kimchi/repositories.py @@ -123,7 +123,7 @@ class YumRepo(object): yb.doUnlock() except Exception, e: kimchiLock.release() - raise OperationFailed(errcode, {'err': e.message}) + raise OperationFailed(errcode, {'err': str(e)}) return repos diff --git a/src/kimchi/swupdate.py b/src/kimchi/swupdate.py index 9489900..ef77e3b 100644 --- a/src/kimchi/swupdate.py +++ b/src/kimchi/swupdate.py @@ -155,7 +155,8 @@ class YumUpdate(object): self._pkgs = yb.doPackageLists('updates') yb.doUnlock() except Exception, e: - raise OperationFailed('KCHPKGUPD0003E', {'err': e.message}) + kimchiLock.release() + raise OperationFailed('KCHPKGUPD0003E', {'err': str(e)}) def getPackagesList(self): """ -- 1.7.10.4

2 2

[PATCH] fix lock for apt package manager
by lvroyce＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Tested with: 1.Model test update/add/remove repositories. 2.UI test. Global lock is acquired for kimchi to update/add/remove and list package informations. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/repositories.py | 50 ++++++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/src/kimchi/repositories.py b/src/kimchi/repositories.py index 1c74f04..98fc3de 100644 --- a/src/kimchi/repositories.py +++ b/src/kimchi/repositories.py @@ -310,6 +310,7 @@ class AptRepo(object): getattr(__import__('apt_pkg'), 'init_config')() getattr(__import__('apt_pkg'), 'init_system')() config = getattr(__import__('apt_pkg'), 'config') + self.pkg_lock = getattr(__import__('apt_pkg'), 'SystemLock') module = __import__('aptsources.sourceslist', globals(), locals(), ['SourcesList'], -1) @@ -322,6 +323,16 @@ class AptRepo(object): fd.write("# This file is managed by Kimchi and it must not " "be modified manually\n") + def _get_repos(self): + try: + with self.pkg_lock(): + repos = self._sourceslist() + repos.refresh() + except Exception, e: + raise OperationFailed('KCHREPOS0025E', {'err': e.message}) + + return repos + def _get_repo_id(self, repo): data = urlparse.urlparse(repo.uri) name = data.hostname or data.path @@ -329,8 +340,7 @@ class AptRepo(object): def _get_source_entry(self, repo_id): kimchiLock.acquire() - repos = self._sourceslist() - repos.refresh() + repos = self._get_repos() kimchiLock.release() for r in repos: @@ -354,8 +364,7 @@ class AptRepo(object): _get_repo_id() """ kimchiLock.acquire() - repos = self._sourceslist() - repos.refresh() + repos = self._get_repos() kimchiLock.release() res = [] @@ -400,12 +409,15 @@ class AptRepo(object): dist = config['dist'] comps = config.get('comps', []) - kimchiLock.acquire() - repos = self._sourceslist() - repos.refresh() - source_entry = repos.add('deb', uri, dist, comps, file=self.filename) - repos.save() - kimchiLock.release() + with kimchiLock: + try: + repos = self._get_repos() + source_entry = repos.add('deb', uri, dist, comps, file=self.filename) + with self.pkg_lock(): + repos.save() + except Exception as e: + raise OperationFailed("KCHREPOS0026E", {'err': e.message}) + return self._get_repo_id(source_entry) @@ -430,11 +442,11 @@ class AptRepo(object): kimchiLock.acquire() try: - repos = self._sourceslist() - repos.refresh() - repos.remove(r) - repos.add(line, r.uri, r.dist, r.comps, file=self.filename) - repos.save() + repos = self._get_repos() + with self.pkg_lock(): + repos.remove(r) + repos.add(line, r.uri, r.dist, r.comps, file=self.filename) + repos.save() except: if enable: raise OperationFailed("KCHREPOS0020E", {'repo_id': repo_id}) @@ -476,10 +488,10 @@ class AptRepo(object): kimchiLock.acquire() try: - repos = self._sourceslist() - repos.refresh() - repos.remove(r) - repos.save() + repos = self._get_repos() + with self.pkg_lock(): + repos.remove(r) + repos.save() except: raise OperationFailed("KCHREPOS0017E", {'repo_id': repo_id}) finally: -- 1.8.3.2

2 3

[PATCH 0/2] Fixes for apt swupdate
by lvroyce＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Tested: Ubuntu 13.10 Royce Lv (2): Fix swupdate listing Add lock in swupdate src/kimchi/swupdate.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) -- 1.8.3.2

2 3

[PATCH] Sort device paths shown when creating a logical storage pool
by Rodrigo Trujillo 26 Mar '14

26 Mar '14

This path sorts the output list of devices by their paths, improving the user experience. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storagepool_add_main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 10833be..97a30d1 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -26,6 +26,7 @@ kimchi.initStorageAddPage = function() { kimchi.listHostPartitions(function(data) { if (data.length > 0) { var deviceHtml = $('#partitionTmpl').html(); + data.sort(function (a, b){return a.path.localeCompare(b.path)}); var listHtml = ''; $.each(data, function(index, value) { if (value.type === 'part' || value.type === 'disk') { -- 1.8.5.3

2 1

[PATCH 0/3] create a VM from an iscsi pool template
by shaohef＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> This patch just support create vm on iscsi lun. Now we have support iSCSI or SCSI pool. Here we want to create volumes for VM in those pools. The best way to do it is on template level - and not on vm level For if we create a template just assign a iSCSI or SCSI pool, the user still need to choose a volume for his VM. Also as we discussion, we do not mix disks from 2 different types of storage pools, for instance: we do not create a template with 2 disks, where one comes from a ISCSI pool and other is a .img in a DIR pool. ShaoHe Feng (3): add a method to get iscsi storage pool auth information. generate a iscsi volume disk for a guest create a VM from an iscsi pool template. src/kimchi/model/templates.py | 11 +++++++++++ src/kimchi/model/vms.py | 4 +++- src/kimchi/vmtemplate.py | 37 ++++++++++++++++++++++++++++++++++++- 3 files changed, 50 insertions(+), 2 deletions(-) -- 1.8.5.3

2 5

[PATCH V2 0/3] create a VM from an iscsi pool template
by shaohef＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V1 -> V2: address aline's comment. storage_type = self._get_storage_type() if storage_type == 'iscsi': .... elif storage_type == 'scsi': This patch just support create vm on iscsi lun. Now we have support iSCSI or SCSI pool. Here we want to create volumes for VM in those pools. The best way to do it is on template level - and not on vm level For if we create a template just assign a iSCSI or SCSI pool, the user still need to choose a volume for his VM. Also as we discussion, we do not mix disks from 2 different types of storage pools, for instance: we do not create a template with 2 disks, where one comes from a ISCSI pool and other is a .img in a DIR pool. ShaoHe Feng (3): add a method to get iscsi storage pool auth information. generate a iscsi volume disk for a guest create a VM from an iscsi pool template. src/kimchi/model/templates.py | 11 +++++++++++ src/kimchi/model/vms.py | 4 +++- src/kimchi/vmtemplate.py | 38 +++++++++++++++++++++++++++++++++++++- 3 files changed, 51 insertions(+), 2 deletions(-) -- 1.8.5.3

2 5

[PATCH] create a VM from an scsi pool template
by shaohef＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> support to create a VM from a scsi pool template. >From the libvirt document: we can create a lun disk for vm by two format: <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> <source pool='scsi-pool' volume='unit:0:0:0' /> <target dev='vda' bus='virtio'/> </disk> and <disk type='block' device='lun'> <driver name='qemu' type='raw' cache='none'/> <source dev='/dev/disk'/> <target dev='sda' bus='scsi'/> </disk> The later, VM disk is "block" and the device "lun", except that generic SCSI commands from the guest are accepted and passed through to the physical device, and this will only be recognized for actual raw devices. This is high performance than the former. But later, disk device='lun' is only valid for block type disk source. It does not support a volume from a pool formate like: <source pool='scsi-pool' volume='unit:0:0:0' /> So I assign the disk source is block instead of volume from a pool in both passthrough or non-passthrough. 1. how to test this patch: create a scsi pool named "my-scsi" by virsh 2.get the volumes name of this pool: $ sudo virsh vol-list my-scsi Name Path ----------------------------------------- unit:0:0:0 /dev/disk/by-id/wwn-0x60014056aefaef96d4e4033953d9627d 3. create a template with this pool like this: $ curl -u <user> -H "Content-Type: application/json" \ -H "Accept: application/json" \ http://localhost:8000/templates/ -X POST -d ' { "cpus": 1, "cdrom":"/home/shhfeng/iso/f17.iso", "name":"F17-SCSI", "storagepool":"/storagepools/my-scsi", "disks":[ { "index":0, "volume":"unit:0:0:0" } ] }' 4. create a VM with this template and start it. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/model/vms.py | 2 +- src/kimchi/vmtemplate.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index 483b9ae..ef1d617 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -184,7 +184,7 @@ class VMsModel(object): # If storagepool is SCSI, volumes will be LUNs and must be passed by # the user from UI or manually. vol_list = [] - if t._get_storage_type() == "iscsi": + if t._get_storage_type() in ["iscsi", "scsi"]: vol_list = [] elif t._get_storage_type() in READONLY_POOL_TYPE: if not params.get('volumes'): diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 4ecba6e..e753ec2 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -181,7 +181,10 @@ class VMTemplate(object): graphics_xml = graphics_xml + spicevmc_xml return graphics_xml - def _get_scsi_disks_xml(self, luns): + def _get_scsi_disks_xml(self): + luns = [disk['volume'] for disk in self.info.get('disks', {}) + if 'volume' in disk] + ret = "" # Passthrough configuration disk_xml = """ @@ -193,8 +196,10 @@ class VMTemplate(object): if not self.fc_host_support: disk_xml = disk_xml.replace('volume','block') + pool = self._storage_validate() # Creating disk xml for each lun passed - for index,(lun, path) in enumerate(luns): + for index, lun in enumerate(luns): + path = pool.storageVolLookupByName(lun).path() dev = "sd%s" % string.lowercase[index] params = {'src': path, 'dev': dev} ret = ret + disk_xml % params @@ -309,7 +314,7 @@ class VMTemplate(object): if storage_type == "iscsi": params['disks'] = self._get_iscsi_disks_xml() elif storage_type == "scsi": - params['disks'] = self._get_scsi_disks_xml(kwargs.get('volumes')) + params['disks'] = self._get_scsi_disks_xml() else: params['disks'] = self._get_disks_xml(vm_uuid) -- 1.8.5.3

2 2

[PATCH] UI: template edit page support scsi lun
by shaohef＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> User can choose a volume of scsi/iscsi pool from the template edit page. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_edit_main.js | 38 +++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 58f4506..b7d6cb6 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -32,19 +32,39 @@ kimchi.template_edit_main = function() { $('input[name="disks"]').val(disks[0].size); var options = [{label: 'VNC', value: 'vnc'}, {label: 'Spice', value: 'spice'}]; kimchi.select('template-edit-graphics-list', options); + var scsipools = {}; kimchi.listStoragePools(function(result) { var options = []; if (result && result.length) { $.each(result, function(index, storagePool) { if ((storagePool.state=="active") && (storagePool.type !== 'kimchi-iso')) { - options.push({ - label: storagePool.name, - value: '/storagepools/' + storagePool.name - }); + if ((storagePool.type == 'iscsi') || (storagePool.type == 'scsi')){ + scsipools[storagePool.name] = []; + kimchi.listStorageVolumes(storagePool.name, function(result) { + if (result && result.length) { + $.each(result, function(index, storageVolume) { + options.push({ + label: storagePool.name + '/' + storageVolume.name, + value: '/storagepools/' + storagePool.name + '/' + storageVolume.name + }); + scsipools[storagePool.name].push(storageVolume) + }); + } + kimchi.select('template-edit-storagePool-list', options); + }); + } + else { + options.push({ + label: storagePool.name, + value: '/storagepools/' + storagePool.name + }); + } } }); } - kimchi.select('template-edit-storagePool-list', options); + if ($.isEmptyObject(scsipools)) { + kimchi.select('template-edit-storagePool-list', options); + } }); kimchi.listNetworks(function(result) { if(result && result.length > 0) { @@ -91,6 +111,14 @@ kimchi.template_edit_main = function() { }); data['memory'] = Number(data['memory']); data['cpus'] = Number(data['cpus']); + storagepool = data['storagepool']; + storageArray = storagepool.split("/"); + if (storageArray.length > 3){ + /* Support only 1 disk at this moment */ + delete data["disks"][0].size; + data["disks"][0].volume = storageArray.pop(); + data['storagepool'] = storageArray.join("/"); + } var networks = templateEditForm.serializeObject().networks; if (networks instanceof Array) { data.networks = networks; -- 1.8.5.3

2 2

[PATCH] Help for scsi fibre channel
by Kersten Richter 26 Mar '14

26 Mar '14

Added help for scsi fibre channel on storage page. Signed-off-by: Kersten Richter <kersten(a)us.ibm.com> --- ui/pages/help/storage.dita | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ui/pages/help/storage.dita b/ui/pages/help/storage.dita index 97ee0cc..284eabb 100644 --- a/ui/pages/help/storage.dita +++ b/ui/pages/help/storage.dita @@ -65,7 +65,7 @@ the following:<dl><dlentry> <li>In the <uicontrol>Storage pool name</uicontrol> field, type the name to be used to identify the storage pool.</li> <li>In the <uicontrol>Storage pool type</uicontrol> list, select the -type: <dl rev="rev1"><dlentry> +type: <dl><dlentry> <dt><uicontrol>DIR</uicontrol></dt> <dd>Specifies a directory pool. When selecting <uicontrol>DIR</uicontrol>, type the <uicontrol>Storage path</uicontrol> (file path to the storage @@ -85,10 +85,14 @@ the iSCSI server. You can optionally select to add iSCSI authentication.</dd> <dt><uicontrol>Logical</uicontrol></dt> <dd>Specifies a logical volume storage pool. Select the location to the device in <uicontrol>Device path</uicontrol>.</dd> -</dlentry></dl><?Pub Caret 591?></li> +</dlentry><dlentry> +<dt><uicontrol>SCSI Fibre Channel</uicontrol></dt> +<dd>Specifies a pool based on an SCSI Fibre Channel. Select which +SCSI adapter to use.</dd> +</dlentry></dl><?Pub Caret 0?></li> <li>Click <uicontrol>Create</uicontrol>.</li> </ol> </p> </csbody> </cshelp> </cshelp> -<?Pub *0000003764?> +<?Pub *0000003914?> -- 1.7.1

2 2

[V2 0/2] Fibre Channel SCSI Storage Pool UI
by huoyuxin＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> V1 - V2: Address comments of Message Id, menu width Yu Xin Huo (2): Fibre Channel SCSI Storage Pool UI Add translation for FC SCSI Storage Pool po/en_US.po | 6 +++++ po/kimchi.pot | 6 +++++ po/pt_BR.po | 6 +++++ po/zh_CN.po | 6 +++++ ui/css/theme-default/storage.css | 2 +- ui/js/src/kimchi.api.js | 14 +++++++++++++ ui/js/src/kimchi.storagepool_add_main.js | 31 ++++++++++++++++++++++++++++- ui/pages/i18n.html.tmpl | 2 +- ui/pages/storagepool-add.html.tmpl | 12 +++++++++++ 9 files changed, 81 insertions(+), 4 deletions(-)

2 4

[PATCH] Fix for repositories help
by Kersten Richter 26 Mar '14

26 Mar '14

Edited file host.dita Signed-off-by: Kersten Richter <kersten(a)us.ibm.com> --- ui/pages/help/host.dita | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ui/pages/help/host.dita b/ui/pages/help/host.dita index 9f42575..cd693b3 100644 --- a/ui/pages/help/host.dita +++ b/ui/pages/help/host.dita @@ -43,9 +43,14 @@ All</uicontrol>. You cannot select individual packages for updates.</dd> <dd>This section displays repositories that are associated with the host system. You can add, enable, edit, or remove repositories. Adding a repository associates it with the host system while enabling a repository -allows the host to access it. You can add <filepath>yum</filepath> repositories -and <filepath>deb</filepath> repositories. You may not be able to -add a <uicontrol>GPG Check</uicontrol> to all types of repositories.</dd> +allows the host to access it. If your system is Red Hat Enterprise +Linux or Fedora, you can add <filepath>yum</filepath> repositories. +If your system is Ubuntu or Debian, then add <filepath>deb</filepath> repositories.<p>If +you are working with yum repositories, you can add a GPG check to +verify that a package from this repository have not been corrupted. +Select a repository and then <uicontrol>Edit</uicontrol>. Select <uicontrol>Yes</uicontrol> to +enable GPG Check and then enter a URL to the GPG key file for the +repository.</p><?Pub Caret 156?></dd> </dlentry><dlentry> <dt>Debug reports</dt> <dd>This section displays debug reports, including name and file path. @@ -58,8 +63,8 @@ configuration and diagnostic information, such as the running kernel version, loaded modules, and system and service configuration files. The command also runs external programs to collect further information and stores this output in the resulting archive.</p> </dd> -</dlentry></dl><?Pub Caret 901?></p> +</dlentry></dl></p> </csbody> <?tm 1392659967 1?> </cshelp> -<?Pub *0000003172?> +<?Pub *0000003492?> -- 1.7.1

2 2

[PATCH] Added help for repositories
by Kersten Richter 26 Mar '14

26 Mar '14

Added help for yum and deb repositories to the host.dita file. Signed-off-by: Kersten Richter <kersten(a)us.ibm.com> --- ui/pages/help/host.dita | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ui/pages/help/host.dita b/ui/pages/help/host.dita index 1b60b27..9f42575 100644 --- a/ui/pages/help/host.dita +++ b/ui/pages/help/host.dita @@ -39,6 +39,14 @@ have updates available, including package name, version, architecture, and repository. You can update all of the packages listed by selecting <uicontrol>Update All</uicontrol>. You cannot select individual packages for updates.</dd> </dlentry><dlentry> +<dt>Repositories</dt> +<dd>This section displays repositories that are associated with the +host system. You can add, enable, edit, or remove repositories. Adding +a repository associates it with the host system while enabling a repository +allows the host to access it. You can add <filepath>yum</filepath> repositories +and <filepath>deb</filepath> repositories. You may not be able to +add a <uicontrol>GPG Check</uicontrol> to all types of repositories.</dd> +</dlentry><dlentry> <dt>Debug reports</dt> <dd>This section displays debug reports, including name and file path. You can select from options to generate a new report, or rename, remove, @@ -50,8 +58,8 @@ configuration and diagnostic information, such as the running kernel version, loaded modules, and system and service configuration files. The command also runs external programs to collect further information and stores this output in the resulting archive.</p> </dd> -</dlentry></dl><?Pub Caret 693?></p> +</dlentry></dl><?Pub Caret 901?></p> </csbody> <?tm 1392659967 1?> </cshelp> -<?Pub *0000002695?> +<?Pub *0000003172?> -- 1.7.1

2 2

[PATCH 0/7] Updates to Manage Repositories
by Adam King 26 Mar '14

26 Mar '14

This series updates HLWs original set to work with the new repo management posted by Aline. It also depends on [PATCH] bug fix: Allow user specifies the repository name when adding a new YUM repo Adam King (2): Update form.serializeObject method to handle deep object serialization Update grid widget to populate fields from deeply nested objects Hongliang Wang (5): Repository Management - Add i18n Strings Repository Management - Add API Support Repository Management - Add Repository Support Repository Management - Edit Repository Support Repository Management - Integrate into Host Tab po/POTFILES.in | 2 + ui/css/theme-default/host.css | 8 ++ ui/css/theme-default/repository-add.css | 39 +++++++ ui/css/theme-default/repository-edit.css | 87 +++++++++++++++ ui/js/src/kimchi.api.js | 76 ++++++++++++- ui/js/src/kimchi.form.js | 66 +++++++++-- ui/js/src/kimchi.grid.js | 22 +++- ui/js/src/kimchi.host.js | 181 +++++++++++++++++++++++++++++++ ui/js/src/kimchi.repository_add_main.js | 91 ++++++++++++++++ ui/js/src/kimchi.repository_edit_main.js | 94 ++++++++++++++++ ui/pages/i18n.html.tmpl | 19 ++++ ui/pages/repository-add.html.tmpl | 108 ++++++++++++++++++ ui/pages/repository-edit.html.tmpl | 115 ++++++++++++++++++++ ui/pages/tabs/host.html.tmpl | 13 +++ 14 files changed, 905 insertions(+), 16 deletions(-) create mode 100644 ui/css/theme-default/repository-add.css create mode 100644 ui/css/theme-default/repository-edit.css create mode 100644 ui/js/src/kimchi.repository_add_main.js create mode 100644 ui/js/src/kimchi.repository_edit_main.js create mode 100644 ui/pages/repository-add.html.tmpl create mode 100644 ui/pages/repository-edit.html.tmpl -- 1.8.1.4

2 8

[PATCH] Template: Check if the host supports Spice
by zhshzhou＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> On some architecture of hosts, such as ppc64 hosts, QEMU is not compiled with Spice. So we'd like to disable Spice on these hosts. Unfortunately even QEMU is not compiled with Spice, 'qemu --help' still prints Spice related help. In this patch we use ldd to determine if QEMU is linked to libspice-server.so, and provide this information through the /config/capabilities URI. The front-end code then checks the capabilities and add or remove Spice from the graphic options respectively. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- docs/API.md | 1 + src/kimchi/config.py.in | 10 +++++++--- src/kimchi/mockmodel.py | 1 + src/kimchi/model/config.py | 15 ++++++++++++++- tests/test_rest.py | 1 + ui/js/src/kimchi.api.js | 6 ++++-- ui/js/src/kimchi.template_edit_main.js | 13 +++++++++++-- 7 files changed, 39 insertions(+), 8 deletions(-) diff --git a/docs/API.md b/docs/API.md index a380558..3711fbe 100644 --- a/docs/API.md +++ b/docs/API.md @@ -573,6 +573,7 @@ creation. * **GET**: Retrieve capabilities information * libvirt_stream_protocols: list of which network protocols are accepted for iso streaming by libvirt + * qemu_spice: True, if QEMU supports Spice; False, otherwise * qemu_stream: True, if QEMU supports ISO streaming; False, otherwise * screenshot: True, if libvirt stream functionality can create screenshot file without problems; False, otherwise or None if the functionality was diff --git a/src/kimchi/config.py.in b/src/kimchi/config.py.in index cf8497a..d15a6b5 100644 --- a/src/kimchi/config.py.in +++ b/src/kimchi/config.py.in @@ -54,15 +54,19 @@ def get_debugreports_path(): return os.path.join(paths.state_dir, 'debugreports') -def find_qemu_binary(): +def find_qemu_binary(find_emulator=False): try: connect = libvirt.open('qemu:///system') except Exception, e: raise Exception("Unable to get qemu binary location: %s" % e) try: xml = connect.getCapabilities() - expr = "/capabilities/guest/arch[@name='%s']\ - /domain[@type='kvm']/emulator" % platform.machine() + if find_emulator: + expr = "/capabilities/guest/arch[@name='%s']\ + /emulator" % platform.machine() + else: + expr = "/capabilities/guest/arch[@name='%s']\ + /domain[@type='kvm']/emulator" % platform.machine() res = xpath_get_text(xml, expr) location = res[0] except Exception, e: diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index faf1049..7b567cb 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -65,6 +65,7 @@ class MockModel(object): def capabilities_lookup(self, *ident): return {'libvirt_stream_protocols': ['http', 'https', 'ftp', 'ftps', 'tftp'], + 'qemu_spice': True, 'qemu_stream': True, 'screenshot': True, 'system_report_tool': True, diff --git a/src/kimchi/model/config.py b/src/kimchi/model/config.py index a6a25e4..7f553ea 100644 --- a/src/kimchi/model/config.py +++ b/src/kimchi/model/config.py @@ -23,6 +23,7 @@ import cherrypy from kimchi.basemodel import Singleton from kimchi.config import config as kconfig +from kimchi.config import find_qemu_binary from kimchi.distroloader import DistroLoader from kimchi.exception import NotFoundError from kimchi.featuretests import FeatureTests @@ -30,7 +31,7 @@ from kimchi.model.debugreports import DebugReportsModel from kimchi.repositories import Repositories from kimchi.screenshot import VMScreenshot from kimchi.swupdate import SoftwareUpdate -from kimchi.utils import check_url_path, kimchi_log +from kimchi.utils import check_url_path, kimchi_log, run_command class ConfigModel(object): @@ -72,6 +73,17 @@ class CapabilitiesModel(object): kimchi_log.info("*** Feature tests completed ***") _set_capabilities.priority = 90 + def _qemu_support_spice(self): + qemu_path = find_qemu_binary(find_emulator=True) + out, err, rc = run_command(['ldd', qemu_path]) + if rc != 0: + kimchi_log.error('Failed to find qemu binary dependencies: %s', err) + return False + for line in out.split('\n'): + if line.lstrip().startswith('libspice-server.so'): + return True + return False + def lookup(self, *ident): report_tool = DebugReportsModel.get_system_report_tool() try: @@ -89,6 +101,7 @@ class CapabilitiesModel(object): repo_mngt_tool = repo._pkg_mnger.TYPE return {'libvirt_stream_protocols': self.libvirt_stream_protocols, + 'qemu_spice': self._qemu_support_spice(), 'qemu_stream': self.qemu_stream, 'screenshot': VMScreenshot.get_stream_test_result(), 'system_report_tool': bool(report_tool), diff --git a/tests/test_rest.py b/tests/test_rest.py index 3f2e449..ca4eeed 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -1346,6 +1346,7 @@ class RestTests(unittest.TestCase): conf = json.loads(resp) self.assertIn('libvirt_stream_protocols', conf) self.assertIn('qemu_stream', conf) + self.assertIn('qemu_spice', conf) self.assertIn('screenshot', conf) self.assertIn('system_report_tool', conf) self.assertIn('update_tool', conf) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 4310435..075b9d0 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -49,14 +49,16 @@ var kimchi = { * Get host capabilities * suc: callback if succeed err: callback if failed */ - getCapabilities : function(suc, err) { + getCapabilities : function(suc, err, done) { + done = typeof done !== 'undefined' ? done: function(){}; kimchi.requestJSON({ url : "/config/capabilities", type : "GET", contentType : "application/json", dataType : "json", success: suc, - error: err + error: err, + complete: done }); }, diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 58f4506..9c429c4 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -30,8 +30,17 @@ kimchi.template_edit_main = function() { } var disks = template.disks; $('input[name="disks"]').val(disks[0].size); - var options = [{label: 'VNC', value: 'vnc'}, {label: 'Spice', value: 'spice'}]; - kimchi.select('template-edit-graphics-list', options); + + var options = [{label: 'VNC', value: 'vnc'}]; + kimchi.getCapabilities(function(result) { + if (result.qemu_spice == true) { + options.push({label: 'Spice', value: 'spice'}) + } + }, function() { + }, function(){ + kimchi.select('template-edit-graphics-list', options); + }); + kimchi.listStoragePools(function(result) { var options = []; if (result && result.length) { -- 1.8.5.3

4 4

[PATCH] Logical Storage Pool: Detect and Enumerate Multipath Block Devices
by zhshzhou＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> When creating a logical storage pool Kimci ignores multipath block devices. This is on purpose because at the time the kimchi.disks was implemented, there was not enough time to test every kind of devices. This patch adds the missing support for multipath block devices. After this patch, the kimchi.disks will include multipath devices in the available partition list. The front-end code is also changed accordingly. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/disks.py | 20 +++++++++++++++++++- ui/js/src/kimchi.storagepool_add_main.js | 3 ++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/kimchi/disks.py b/src/kimchi/disks.py index ce0c5bb..6817ab4 100644 --- a/src/kimchi/disks.py +++ b/src/kimchi/disks.py @@ -17,6 +17,7 @@ # 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 errno import re import subprocess @@ -27,8 +28,25 @@ from kimchi.exception import OperationFailed from kimchi.utils import kimchi_log +def _get_friendly_dm_path(maj_min): + """ Returns user friendly dm path given the device number 'major:min' """ + dm_name = "/sys/dev/block/%s/dm/name" % maj_min + try: + with open(dm_name) as dm_f: + content = dm_f.read().rstrip('\n') + except IOError as e: + if not e.errno == errno.ENOENT: + raise + return None + return "/dev/mapper/" + content + + def _get_dev_node_path(maj_min): """ Returns device node path given the device number 'major:min' """ + dm_path = _get_friendly_dm_path(maj_min) + if dm_path is not None: + return dm_path + uevent = "/sys/dev/block/%s/uevent" % maj_min with open(uevent) as ueventf: content = ueventf.read() @@ -137,7 +155,7 @@ def get_partitions_names(): # leaf means a partition, a disk has no partition, or a disk not held # by any multipath device. Physical volume belongs to no volume group # is also listed. Extended partitions should not be listed. - if not (dev['type'] in ['part', 'disk'] and + if not (dev['type'] in ['part', 'disk', 'mpath'] and dev['fstype'] in ['', 'LVM2_member'] and dev['mountpoint'] == "" and _get_vgname(devNodePath) == "" and diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 10833be..f3b85d2 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -28,7 +28,8 @@ kimchi.initStorageAddPage = function() { var deviceHtml = $('#partitionTmpl').html(); var listHtml = ''; $.each(data, function(index, value) { - if (value.type === 'part' || value.type === 'disk') { + valid_types = {part: 'part', disk: 'disk', mpath: 'mpath'}; + if (value.type in valid_types) { listHtml += kimchi.template(deviceHtml, value); } }); -- 1.8.5.3

4 5

[PATCH V2 ] Adds 'in_use' info to API.md
by Rodrigo Trujillo 26 Mar '14

26 Mar '14

The network lookup function returns the new field "in_use". API.md was not updated properly. This patch fixes this. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- docs/API.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/API.md b/docs/API.md index b8f941a..a9ac15b 100644 --- a/docs/API.md +++ b/docs/API.md @@ -485,6 +485,7 @@ A interface represents available interface on host. * active: The Network is ready for use * inactive: The Network is not available * autostart: Network autostart onboot + * in_use: Indicates ('true') if some guest is attached to this network and 'false' otherwise. * vms: all vms attached to this network * subnet: Network segment in slash-separated format with ip address and prefix * dhcp: DHCP services on the virtual network is enabled. -- 1.8.5.3

2 2

[PATCH 1/2] Bug fix: specify the class attribute when change pool state dot.
by shaohef＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> After we list the storage pools, it will change other element with the same class attribute in other page. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storage_main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index c2c721d..6052510 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -49,7 +49,7 @@ kimchi.storageBindClick = function() { } }); - $('.active').each(function(index) { + $('.list-storage .storage-state .active').each(function(index) { if ('active' === $(this).data('state')) { $(this).show(); } else { -- 1.8.5.3

3 6

[PATCH ] Optimize return code check.
by Leonardo Garcia 26 Mar '14

26 Mar '14

From: Leonardo Garcia <lagarcia(a)br.ibm.com> Instead of doing two comparisons, make just one and make this check faster. Signed-off-by: Leonardo Garcia <lagarcia(a)br.ibm.com> --- src/kimchi/model/debugreports.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/kimchi/model/debugreports.py b/src/kimchi/model/debugreports.py index 6ae282a..479d936 100644 --- a/src/kimchi/model/debugreports.py +++ b/src/kimchi/model/debugreports.py @@ -68,10 +68,7 @@ class DebugReportsModel(object): command = ['sosreport', '--batch', '--name=%s' % name] output, error, retcode = run_command(command) - if retcode < 0: - raise OperationFailed("KCHDR0003E", {'name': name, - 'err': retcode}) - elif retcode > 0: + if retcode != 0: raise OperationFailed("KCHDR0003E", {'name': name, 'err': retcode}) -- 1.8.5.3

4 3

[PATCH V2] Show error message from debug report generation async task
by Rodrigo Trujillo 26 Mar '14

26 Mar '14

If the process of generating a debug report in Kimchi fails while it was executing (e.g. due to running out of disk space to generate the report), the error message was not being shown in the Kimchi UI. Basically src/kimchi/control/tasks.py was putting the error message in a JSON field called message, while the UI was looking for the error message in a field called reason. 'reason' is used in standard exception json returned only. Signed-off-by: Leonardo Garcia <lagarcia(a)br.ibm.com> Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.report_add_main.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.report_add_main.js b/ui/js/src/kimchi.report_add_main.js index 15cc76b..8759c2b 100644 --- a/ui/js/src/kimchi.report_add_main.js +++ b/ui/js/src/kimchi.report_add_main.js @@ -23,9 +23,11 @@ kimchi.report_add_main = function() { result: result }); }, function(result) { - if (result['reason']) { - var errText = result['reason']; + // Error message from Async Task status + if (result['message']) { + var errText = result['message']; } + // Error message from standard kimchi exception else { var errText = result['responseJSON']['reason']; } -- 1.8.5.3

2 2

[PATCH] bug fix: Lock YUM operations
by Aline Manera 26 Mar '14

26 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> In addition to cherrypy lock - that avoids concurrent requests - we also need to use the yum.doLock() to avoid different applications running YUM, example, Kimchi and Package Kit. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/i18n.py | 4 ++++ src/kimchi/repositories.py | 27 ++++++++++++++++++++------- src/kimchi/swupdate.py | 9 +++++++-- 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index c084e21..398d49a 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -249,4 +249,8 @@ messages = { "KCHREPOS0021E": _("Could not disable repository %(repo_id)s."), "KCHREPOS0022E": _("YUM Repository ID already exists"), "KCHREPOS0023E": _("YUM Repository name must be a string"), + "KCHREPOS0024E": _("Unable to list repositories. Details: '%(err)s'"), + "KCHREPOS0025E": _("Unable to retrieve repository information. Details: '%(err)s'"), + "KCHREPOS0026E": _("Unable to add repository. Details: '%(err)s'"), + "KCHREPOS0027E": _("Unable to remove repository. Details: '%(err)s'"), } diff --git a/src/kimchi/repositories.py b/src/kimchi/repositories.py index bdf5df5..1c74f04 100644 --- a/src/kimchi/repositories.py +++ b/src/kimchi/repositories.py @@ -115,14 +115,26 @@ class YumRepo(object): self._confdir = d break + def _get_repos(self, errcode): + try: + yb = self._yb() + yb.doLock() + repos = yb.repos + yb.doUnlock() + except Exception, e: + kimchiLock.release() + raise OperationFailed(errcode, {'err': e.message}) + + return repos + def getRepositoriesList(self): """ Return a list of repositories IDs """ kimchiLock.acquire() - repos = self._yb().repos.repos.keys() + repos = self._get_repos('KCHREPOS0024E') kimchiLock.release() - return repos + return repos.repos.keys() def getRepo(self, repo_id): """ @@ -130,8 +142,9 @@ class YumRepo(object): repository ID format with the information of a YumRepository object. """ kimchiLock.acquire() - repos = self._yb().repos + repos = self._get_repos('KCHREPOS0025E') kimchiLock.release() + if repo_id not in repos.repos.keys(): raise NotFoundError("KCHREPOS0012E", {'repo_id': repo_id}) @@ -169,7 +182,7 @@ class YumRepo(object): repo_id = "kimchi_repo_%s" % str(int(time.time() * 1000)) kimchiLock.acquire() - repos = self._yb().repos + repos = self._get_repos('KCHREPOS0026E') kimchiLock.release() if repo_id in repos.repos.keys(): raise InvalidOperation("KCHREPOS0022E", {'repo_id': repo_id}) @@ -199,7 +212,7 @@ class YumRepo(object): def toggleRepo(self, repo_id, enable): kimchiLock.acquire() - repos = self._yb().repos + repos = self._get_repos('KCHREPOS0011E') kimchiLock.release() if repo_id not in repos.repos.keys(): raise NotFoundError("KCHREPOS0012E", {'repo_id': repo_id}) @@ -234,7 +247,7 @@ class YumRepo(object): Update a given repository in repositories.Repositories() format """ kimchiLock.acquire() - repos = self._yb().repos + repos = self._get_repos('KCHREPOS0011E') kimchiLock.release() if repo_id not in repos.repos.keys(): raise NotFoundError("KCHREPOS0012E", {'repo_id': repo_id}) @@ -265,7 +278,7 @@ class YumRepo(object): Remove a given repository """ kimchiLock.acquire() - repos = self._yb().repos + repos = self._get_repos('KCHREPOS0027E') kimchiLock.release() if repo_id not in repos.repos.keys(): raise NotFoundError("KCHREPOS0012E", {'repo_id': repo_id}) diff --git a/src/kimchi/swupdate.py b/src/kimchi/swupdate.py index 625b091..9489900 100644 --- a/src/kimchi/swupdate.py +++ b/src/kimchi/swupdate.py @@ -149,8 +149,13 @@ class YumUpdate(object): """ Update the list of packages to be updated in the system. """ - self._yb = getattr(__import__('yum'), 'YumBase')() - self._pkgs = self._yb.doPackageLists('updates') + try: + yb = getattr(__import__('yum'), 'YumBase')() + yb.doLock() + self._pkgs = yb.doPackageLists('updates') + yb.doUnlock() + except Exception, e: + raise OperationFailed('KCHPKGUPD0003E', {'err': e.message}) def getPackagesList(self): """ -- 1.7.10.4

2 2

[PATCH 0/5] Fix 'disk full' issue
by Rodrigo Trujillo 25 Mar '14

25 Mar '14

If the disk where objectstore (Kimchi database) is full, then a lot of errors will be raised without any special treatment. This can lead the system to an unexpected state. This patchset modifies kimchi in order to give the right treatment to exceptions, showing the error to the user or hidding when possible. Rodrigo Trujillo (5): Fix 'disk full' issue: Change objectstore exception handling Fix 'disk full' issue: Fix Templates db store/delete error handling Fix 'disk full' issue: Fix storage volume error handling Fix 'disk full' issue: Fix storagepool and asynctasks error handling Fix 'disk full' issue: Fix vms/screenshot db store/delete error handling src/kimchi/asynctask.py | 7 ++-- src/kimchi/i18n.py | 5 +++ src/kimchi/model/storagepools.py | 8 +++-- src/kimchi/model/storagevolumes.py | 45 +++++++++++++++---------- src/kimchi/model/templates.py | 22 ++++++++---- src/kimchi/model/vms.py | 68 +++++++++++++++++++++++++++----------- src/kimchi/objectstore.py | 8 +++++ 7 files changed, 113 insertions(+), 50 deletions(-) -- 1.8.5.3

2 13

[PATCH ] Show error message if debug report generation errors.
by Leonardo Garcia 25 Mar '14

25 Mar '14

From: Leonardo Garcia <lagarcia(a)br.ibm.com> If the process of generating a debug report in Kimchi fails while it was executing (e.g. due to running out of disk space to generate the report), the error message was not being shown in the Kimchi UI. Basically src/kimchi/control/tasks.py was putting the error message in a JSON field called message, while the UI was looking for the error message in a field called reason. Signed-off-by: Leonardo Garcia <lagarcia(a)br.ibm.com> --- ui/js/src/kimchi.report_add_main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/js/src/kimchi.report_add_main.js b/ui/js/src/kimchi.report_add_main.js index 15cc76b..3248e2f 100644 --- a/ui/js/src/kimchi.report_add_main.js +++ b/ui/js/src/kimchi.report_add_main.js @@ -23,11 +23,11 @@ kimchi.report_add_main = function() { result: result }); }, function(result) { - if (result['reason']) { - var errText = result['reason']; + if (result['message']) { + var errText = result['message']; } else { - var errText = result['responseJSON']['reason']; + var errText = result['responseJSON']['message']; } result && kimchi.message.error(errText) submitButton -- 1.8.5.3

3 2

[PATCH 0/2] Fixes on Update feature
by Aline Manera 25 Mar '14

25 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> Aline Manera (2): bug fix: Display update progress on real time bug fix: Update progress area when an error occurs during update process src/kimchi/swupdate.py | 16 +++++++++++----- ui/js/src/kimchi.host.js | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) -- 1.7.10.4

3 6

[PATCH] bug fix: Allow user specifies the repository name when adding a new YUM repo
by Aline Manera 25 Mar '14

25 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> The backend already supports the repo_name as an optional parameter while creating a new YUM repo but the jsonschema and docs are not consistent with that. Fix it. Also insert repo_name under "config" as it is YUM specific information. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- docs/API.md | 1 + src/kimchi/API.json | 5 +++++ src/kimchi/i18n.py | 1 + src/kimchi/mockmodel.py | 7 ++++--- src/kimchi/repositories.py | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/docs/API.md b/docs/API.md index a380558..fed7f5e 100644 --- a/docs/API.md +++ b/docs/API.md @@ -854,6 +854,7 @@ http://, ftp:// or file:// URL. * repo_id *(optional)*: Unique YUM repository ID * config: A dictionary that contains specific data according to repository type. + * repo_name *(optional)*: YUM Repository name * mirrorlist *(optional)*: Specifies a URL to a file containing a list of baseurls for YUM repository * dist: Distribution to DEB repository diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 9bde6a2..8ecd665 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -552,6 +552,11 @@ "error": "KCHREPOS0006E" } }, + "repo_name": { + "description": "YUM repository name", + "type": "string", + "error": "KCHREPOS0023E" + }, "mirrorlist": { "description": "URL to a file containing a list of baseurls", "type": "string", diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 1f84034..c084e21 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -248,4 +248,5 @@ messages = { "KCHREPOS0020E": _("Could not enable repository %(repo_id)s."), "KCHREPOS0021E": _("Could not disable repository %(repo_id)s."), "KCHREPOS0022E": _("YUM Repository ID already exists"), + "KCHREPOS0023E": _("YUM Repository name must be a string"), } diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index 01480f4..b272933 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -1135,13 +1135,14 @@ class MockRepositories(object): def addRepository(self, params): # Create and enable the repository repo_id = params['repo_id'] + config = params.get('config', {}) repo = {'repo_id': repo_id, 'baseurl': params.get('baseurl'), 'enabled': True, - 'config': {'repo_name': params.get('repo_name', repo_id), - 'gpgkey': params.get('gpgkey', []), + 'config': {'repo_name': config.get('repo_name', repo_id), + 'gpgkey': config.get('gpgkey', []), 'gpgcheck': True, - 'mirrorlist': params.get('mirrorlist', "")} + 'mirrorlist': config.get('mirrorlist', "")} } self._repos[repo_id] = repo diff --git a/src/kimchi/repositories.py b/src/kimchi/repositories.py index 39dde12..93603e8 100644 --- a/src/kimchi/repositories.py +++ b/src/kimchi/repositories.py @@ -174,7 +174,7 @@ class YumRepo(object): if repo_id in repos.repos.keys(): raise InvalidOperation("KCHREPOS0022E", {'repo_id': repo_id}) - repo_name = params.get('repo_name', None) + repo_name = config.get('repo_name', None) if repo_name is None: repo_name = repo_id -- 1.7.10.4

2 2

[PATCH V2] bug fix: Instantiate the apt-get manager when update the apt-get packages list
by Aline Manera 25 Mar '14

25 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> V1 - V2: - Follow Zhen Zhou suggestion I tested it on Ubuntu. Aline Manera (1): bug fix: Instantiate the apt-get manager when update the apt-get packages list src/kimchi/swupdate.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 1.7.10.4

2 3

[PATCH V4 0/4] check the python code with pyflakes
by shaohef＠linux.vnet.ibm.com 25 Mar '14

25 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V3 -> V4 address Rodrigo's comment. add delete the cloned template in rollback. V2 -> V3 address zhengsheng's comment. improve the SKIP_PYFLAKES_ERR list. V1 -> V2 address Crístian'comment: remove the whole statement "info = self._get_vm(name).inf" address ming's comment: break down the patch into small patches by the pyflakes error. Pyflakes analyzes programs and detects various errors. It works by parsing the source file, not importing it, so it is safe to use on modules with side effects. It's also much faster. This is important to improve the code quality. ShaoHe Feng (4): make pyflakes happly, remove the unused import module make pyflakes happly, remove unused availables add template_delete to rollback after create a template run pyflakes when make check Makefile.am | 7 +++++++ configure.ac | 7 +++++++ contrib/DEBIAN/control.in | 1 + contrib/kimchi.spec.fedora.in | 1 + docs/README.md | 6 +++--- src/kimchi/control/plugins.py | 2 +- src/kimchi/featuretests.py | 2 -- src/kimchi/mockmodel.py | 5 ++--- src/kimchi/model/storagepools.py | 2 +- src/kimchi/screenshot.py | 1 - src/kimchi/template.py | 1 - tests/test_model.py | 2 ++ tests/test_server.py | 1 - ui/pages/help/gen-index.py | 1 - 14 files changed, 25 insertions(+), 14 deletions(-) -- 1.8.5.3

4 14

[PATCH v2] Issue#349: Software Update Grid Keeps Loading when Error Returns
by Hongliang Wang 25 Mar '14

25 Mar '14

Software update grid keeps loading on UI when server returns 500 error. Instead, we shall remove the loading UI and add a message UI to let the user know something is wrong, as well as add a button to allow the user retry. v1 -> v2: 2a) Made message more user-friendly and informative (Aline's comment) Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/grid.css | 20 +++++++++++++ ui/js/src/kimchi.api.js | 4 +-- ui/js/src/kimchi.grid.js | 66 +++++++++++++++++++++++++++++++++---------- ui/js/src/kimchi.host.js | 11 +++++++- ui/pages/i18n.html.tmpl | 5 ++++ 5 files changed, 87 insertions(+), 19 deletions(-) diff --git a/ui/css/theme-default/grid.css b/ui/css/theme-default/grid.css index 44ae614..684dd7b 100644 --- a/ui/css/theme-default/grid.css +++ b/ui/css/theme-default/grid.css @@ -239,3 +239,23 @@ height: 48px; width: 49px; } + +.grid-message { + background: white; + box-sizing: border-box; + bottom: 0; + left: 0; + overflow: auto; + padding: .2em .5em; + position: absolute; + right: 0; + z-index: 5; +} + +.grid-message-text { + line-height: 25px; +} + +.retry-button { + margin: 0 1em; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 4310435..11f83df 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -838,10 +838,8 @@ var kimchi = { }, 200); break; case 'finished': - suc(result); - break; case 'failed': - err(result); + suc(result); break; default: break; diff --git a/ui/js/src/kimchi.grid.js b/ui/js/src/kimchi.grid.js index 540f1ba..f35228d 100644 --- a/ui/js/src/kimchi.grid.js +++ b/ui/js/src/kimchi.grid.js @@ -62,6 +62,18 @@ kimchi.widget.Grid = function(params) { '</div>', '</div>', '</div>', + '<div class="grid-message hidden">', + '<div class="grid-message-text">', + i18n['KCHGRD6002M'], + '<button class="retry-button btn-small">', + i18n['KCHGRD6003M'], + '</button>', + '</div>', + '<div class="detailed-title">', + i18n['KCHGRD6004M'], + '</div>', + '<div class="detailed-text"></div>', + '</div>', '</div>' ]; @@ -161,6 +173,9 @@ kimchi.widget.Grid = function(params) { var maskNode = $('.grid-mask', gridNode); maskNode.css('top', captionHeight + 'px'); + var messageNode = $('.grid-message', gridNode); + messageNode.css('top', captionHeight + 'px'); + var fillBody = function(container, fields, data) { var tbody = ($('tbody', container).length && $('tbody', container)) || $('<tbody></tbody>').appendTo(container); @@ -384,28 +399,49 @@ kimchi.widget.Grid = function(params) { $('body').on('mousemove', positionResizer); $('body').on('mouseup', endResizing); + this.showMessage = function(msg) { + $('.detailed-text', messageNode).text(msg); + $(messageNode).removeClass('hidden'); + }; + + this.hideMessage = function() { + $(messageNode).addClass('hidden'); + }; + this.destroy = function() { $('body').off('mousemove', positionResizer); $('body').off('mouseup', endResizing); }; var data = params['data']; - if(!data) { - return; - } + var self = this; + var reload = function() { + if(!data) { + return; + } - if($.isArray(data)) { - this.setData(data); - return; - } + $(messageNode).addClass('hidden'); - if($.isFunction(data)) { - var self = this; - var loadData = data; - maskNode.removeClass('hidden'); - loadData(function(data) { + if($.isArray(data)) { self.setData(data); - maskNode.addClass('hidden'); - }); - } + return; + } + + if($.isFunction(data)) { + var loadData = data; + maskNode.removeClass('hidden'); + loadData(function(data) { + self.setData(data); + maskNode.addClass('hidden'); + }); + } + }; + + var reloadButton = $('.retry-button', gridNode); + $(reloadButton).on('click', function(event) { + reload(); + }); + + this.reload = reload; + reload(); }; diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index ae2ee7d..53a4541 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -57,7 +57,9 @@ kimchi.host_main = function() { kimchi.topic('kimchi/softwareUpdated').publish({ result: result }); - }, function(result) { + }, function(error) { + var message = error && error['responseJSON'] && error['responseJSON']['reason']; + kimchi.message.error(message || i18n['KCHUPD6009M']); $(updateButton).text(i18n['KCHUPD6006M']).prop('disabled', false); }, reloadProgressArea); } @@ -100,6 +102,13 @@ kimchi.host_main = function() { var updateButton = $('#' + softwareUpdatesGridID + '-update-button'); $(updateButton).prop('disabled', softwareUpdates.length === 0); + }, function(error) { + var message = error && error['responseJSON'] && error['responseJSON']['reason']; + if($.isFunction(gridCallback)) { + gridCallback([]); + } + softwareUpdatesGrid && + softwareUpdatesGrid.showMessage(message || i18n['KCHUPD6008M']); }); }; diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index 2f47e50..9f7537f 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -60,6 +60,9 @@ var i18n = { 'KCHAPI6006M': "$_("Warning")", 'KCHGRD6001M': "$_("Loading...")", + 'KCHGRD6002M': "$_("An error occurs while checking for packages update.")", + 'KCHGRD6003M': "$_("Retry")", + 'KCHGRD6004M': "$_("Detailed message:")", 'KCHTMPL6001W': "$_("No iso found")", @@ -87,6 +90,8 @@ var i18n = { 'KCHUPD6005M': "$_("Repository")", 'KCHUPD6006M': "$_("Update All")", 'KCHUPD6007M': "$_("Updating...")", + 'KCHUPD6008M': "$_("Failed to retrieve updates.")", + 'KCHUPD6009M': "$_("Failed to update package(s).")", 'KCHDR6001M': "$_("Debug report will be removed permanently and can't be recovered. Do you want to continue?")", -- 1.8.1.4

2 2

[PATCH] hack for create a vm from scsi/iscsi volume
by shaohef＠linux.vnet.ibm.com 25 Mar '14

25 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> after apply this patch. you can find a usb scsi targe, and create a scsi pool on this usb scsi target. and then create a VM on the lun of this pool. This patch is just for scsi test. Do not need to merge this patch. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/model/host.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/kimchi/model/host.py b/src/kimchi/model/host.py index 7b151f2..feee1c3 100644 --- a/src/kimchi/model/host.py +++ b/src/kimchi/model/host.py @@ -244,6 +244,14 @@ class DevicesModel(object): def _get_devices_fc_host(self): conn = self.conn.get() # Libvirt < 1.0.5 does not support fc_host capability + ret = [] + scsi_hosts = conn.listDevices('scsi_host', 0) + for host in scsi_hosts: + xml = conn.nodeDeviceLookupByName(host).XMLDesc(0) + path = '/device/path' + if 'usb' in xmlutils.xpath_get_text(xml, path)[0]: + ret.append(host) + return ret if not CapabilitiesModel().fc_host_support: ret = [] scsi_hosts = conn.listDevices('scsi_host', 0) -- 1.8.5.3

1 0

[WIP 1/2] UI: add list Host Devices API
by shaohef＠linux.vnet.ibm.com 25 Mar '14

25 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> This API is used to get the Devices of Host. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.api.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 4310435..d6d7c4b 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -706,6 +706,18 @@ var kimchi = { }); }, + listHostDevices: function(cap, suc, err) { + parameters = cap && "?_cap=" + cap + kimchi.requestJSON({ + url : kimchi.url + 'host/devices' + parameters, + type : 'GET', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err + }); + }, + getStorageServers: function(type, suc, err) { var url = kimchi.url + 'storageservers?_target_type=' + type; kimchi.requestJSON({ -- 1.8.5.3

3 4

Planning for next release
by Aline Manera 25 Mar '14

25 Mar '14

Hi all, In some days we will have Kimchi 1.2 released so we need to start planning the next release. I would like to ask to everyone input your ideas into the Backlog <https://github.com/kimchi-project/kimchi/wiki/Todo-Backlog> page More than add new features to Kimchi we need to think about improving what is in Kimchi today. Any suggestion is very welcome. Thanks, Aline Manera

1 0

Call for translations
by Aline Manera 25 Mar '14

25 Mar '14

Hi all, As Kimchi 1.2 will be released in some days we need to get all messages translated. So I would like to call for final translation of the code. According to the following statistics, the current code needs some work: en_US.po: 153 translated messages, 5 fuzzy translations, 240 untranslated messages. pt_BR.po: 141 translated messages, 5 fuzzy translations, 252 untranslated messages. zh_CN.po: 151 translated messages, 6 fuzzy translations, 241 untranslated messages. Thanks for your help! Aline Manera

1 0

[PATCH] bug fix: instantiate the Yum manager when update the yum packages list
by shaohef＠linux.vnet.ibm.com 24 Mar '14

24 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> an instance just refresh packagekit once. for example: $ sudo PYTHONPATH=src python -c ' > from yum import YumBase > YumBase().doPackageLists("updates") > _yb = YumBase() > _yb.doPackageLists("updates") > _yb.doPackageLists("updates") > ' Loaded plugins: langpacks, refresh-packagekit Loaded plugins: langpacks, refresh-packagekit you can seen the second _yb.doPackageLists will not refresh packagekit. The apt manager may also has the same problem. But not test it on ubuntu, will send a patch later after I have check. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/swupdate.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kimchi/swupdate.py b/src/kimchi/swupdate.py index ff5c9d1..dc48153 100644 --- a/src/kimchi/swupdate.py +++ b/src/kimchi/swupdate.py @@ -136,14 +136,14 @@ class YumUpdate(object): """ def __init__(self): self._pkgs = {} - self._yb = getattr(__import__('yum'), 'YumBase')() + self._yb = getattr(__import__('yum'), 'YumBase') self.update_cmd = ["yum", "-y", "update"] def _refreshUpdateList(self): """ Update the list of packages to be updated in the system. """ - self._pkgs = self._yb.doPackageLists('updates') + self._pkgs = self._yb().doPackageLists('updates') def getPackagesList(self): """ -- 1.8.5.3

4 4

[PATCH] run pyflakes when make check
by shaohef＠linux.vnet.ibm.com 24 Mar '14

24 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Pyflakes analyzes programs and detects various errors. It works by parsing the source file, not importing it, so it is safe to use on modules with side effects. It's also much faster. This is important to improve the code quality. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- Makefile.am | 7 +++++++ configure.ac | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/Makefile.am b/Makefile.am index 2fdafb1..c68f050 100644 --- a/Makefile.am +++ b/Makefile.am @@ -71,7 +71,14 @@ PEP8_WHITELIST = \ tests/utils.py \ $(NULL) +SKIP_PYFLAKES_ERR = "\./src/kimchi/websocket\.py" + check-local: + find . -path './.git' -prune -type f -o \ + -name '*.py' -o -name '*.py.in' | xargs $(PYFLAKES) | \ + grep -w -v $(SKIP_PYFLAKES_ERR) | \ + while read LINE; do echo "$$LINE"; false; done + $(PEP8) --version $(PEP8) --filename '*.py,*.py.in' $(PEP8_WHITELIST) diff --git a/configure.ac b/configure.ac index 365348f..a625f35 100644 --- a/configure.ac +++ b/configure.ac @@ -42,6 +42,13 @@ AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([0.10]) AC_PATH_PROG([CHEETAH], [cheetah], [/usr/bin/cheetah]) +# Checking for pyflakes +AC_PATH_PROG([PYFLAKES], [pyflakes]) +if test "x$PYFLAKES" = "x"; then + AC_MSG_WARN([pyflakes not found]) +fi + + AC_CONFIG_FILES([ po/Makefile.in po/gen-pot -- 1.8.5.3

2 1

[PATCH V5 0/4] check the python code with pyflakes
by shaohef＠linux.vnet.ibm.com 24 Mar '14

24 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V4 -> V5 We do not need pyflakes to run or build Kimchi. It is only used for developers to check code style. V3 -> V4 address Rodrigo's comment. add delete the cloned template in rollback. V2 -> V3 address zhengsheng's comment. improve the SKIP_PYFLAKES_ERR list. V1 -> V2 address Crístian'comment: remove the whole statement "info = self._get_vm(name).inf" address ming's comment: break down the patch into small patches by the pyflakes error. Pyflakes analyzes programs and detects various errors. It works by parsing the source file, not importing it, so it is safe to use on modules with side effects. It's also much faster. This is important to improve the code quality. ShaoHe Feng (4): make pyflakes happly, remove the unused import module make pyflakes happly, remove unused availables add template_delete to rollback after create a template run pyflakes when make check Makefile.am | 7 +++++++ configure.ac | 7 +++++++ src/kimchi/control/plugins.py | 2 +- src/kimchi/featuretests.py | 2 -- src/kimchi/mockmodel.py | 5 ++--- src/kimchi/model/storagepools.py | 2 +- src/kimchi/screenshot.py | 1 - src/kimchi/template.py | 1 - tests/test_model.py | 2 ++ tests/test_server.py | 1 - ui/pages/help/gen-index.py | 1 - 11 files changed, 20 insertions(+), 11 deletions(-) -- 1.8.5.3

2 5

[PATCH v5] Remove debug report's file path from UI
by Mark Wu 24 Mar '14

24 Mar '14

Now the file path displayed on UI is "/data/debugreports/<reportname>/", It's misleading because people could assume it's path on file system, but it's the uri path in fact. We don't need expose the URI path because the download button can help user to get the file. So this patch removes it from UI. And this patch also renames debug report's 'file' attribute to 'uri', because we use it to represent the download uri path. Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- docs/API.md | 2 +- src/kimchi/control/debugreports.py | 4 ++-- src/kimchi/mockmodel.py | 2 +- src/kimchi/model/debugreports.py | 2 +- tests/test_rest.py | 2 +- ui/css/theme-default/host.css | 4 ---- ui/js/src/kimchi.host.js | 4 ---- ui/pages/i18n.html.tmpl | 1 - 8 files changed, 6 insertions(+), 15 deletions(-) diff --git a/docs/API.md b/docs/API.md index 8d6682b..a380558 100644 --- a/docs/API.md +++ b/docs/API.md @@ -672,7 +672,7 @@ specific to the low level collection tool being used. * **GET**: Retrieve the full description of Debug Report * name: The debug report name used to identify the report - * file: The debug report file name used to identify the report + * uri: The URI path to download a debug report * time: The time when the debug report is created * **DELETE**: Remove the Debug Report diff --git a/src/kimchi/control/debugreports.py b/src/kimchi/control/debugreports.py index 9922cfa..3c12230 100644 --- a/src/kimchi/control/debugreports.py +++ b/src/kimchi/control/debugreports.py @@ -37,7 +37,7 @@ class DebugReport(Resource): @property def data(self): return {'name': self.ident, - 'file': self.info['file'], + 'uri': self.info['uri'], 'time': self.info['ctime']} @@ -47,4 +47,4 @@ class DebugReportContent(Resource): def get(self): self.lookup() - raise internal_redirect(self.info['file']) + raise internal_redirect(self.info['uri']) diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index d40f61a..01480f4 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -311,7 +311,7 @@ class MockModel(object): 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) - return {'file': file_target, + return {'uri': file_target, 'ctime': ctime} def debugreportcontent_lookup(self, name): diff --git a/src/kimchi/model/debugreports.py b/src/kimchi/model/debugreports.py index c6e698b..6ae282a 100644 --- a/src/kimchi/model/debugreports.py +++ b/src/kimchi/model/debugreports.py @@ -162,7 +162,7 @@ class DebugReportModel(object): 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) - return {'file': file_target, + return {'uri': file_target, 'ctime': ctime} def delete(self, name): diff --git a/tests/test_rest.py b/tests/test_rest.py index fe8d3c4..3f2e449 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -1507,7 +1507,7 @@ class RestTests(unittest.TestCase): self.assertEquals(200, resp.status) resp = request(host, port, '/debugreports/report1') debugre = json.loads(resp.read()) - resp = request(host, port, debugre['file']) + resp = request(host, port, debugre['uri']) self.assertEquals(200, resp.status) def test_host(self): diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css index 0f8b941..8af34f5 100644 --- a/ui/css/theme-default/host.css +++ b/ui/css/theme-default/host.css @@ -215,14 +215,10 @@ } .debug-report-name, -.debug-report-file, .debug-report-time { width: 200px; } -.debug-report-file { - width: 300px; -} /* End of Debug Report */ /* Software Updates */ diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index ae2ee7d..5d32c4a 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -188,10 +188,6 @@ kimchi.host_main = function() { label: i18n['KCHDR6003M'], 'class': 'debug-report-name' }, { - name: 'file', - label: i18n['KCHDR6004M'], - 'class': 'debug-report-file' - }, { name: 'time', label: i18n['KCHDR6005M'], 'class': 'debug-report-time' diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index 2f47e50..a626759 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -92,7 +92,6 @@ var i18n = { 'KCHDR6001M': "$_("Debug report will be removed permanently and can't be recovered. Do you want to continue?")", 'KCHDR6002M': "$_("Debug Reports")", 'KCHDR6003M': "$_("Name")", - 'KCHDR6004M': "$_("File Path")", 'KCHDR6005M': "$_("Generated Time")", 'KCHDR6006M': "$_("Generate")", 'KCHDR6007M': "$_("Generating...")", -- 1.8.4.2

2 1

[PATCH] partitions: Fix when disk does not have extended partition
by lvroyce＠linux.vnet.ibm.com 24 Mar '14

24 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Disk may just have primary partitions, this makes getExtendedPartition return none and throw exception when refer to extended partition path. Fix this by check whether extended partition exists. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/disks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kimchi/disks.py b/src/kimchi/disks.py index cada869..ce0c5bb 100644 --- a/src/kimchi/disks.py +++ b/src/kimchi/disks.py @@ -86,8 +86,8 @@ def _is_dev_extended_partition(devType, devNodePath): return False diskPath = devNodePath.rstrip('0123456789') device = PDevice(diskPath) - disk = PDisk(device) - if disk.getExtendedPartition().path == devNodePath: + extended_part = PDisk(device).getExtendedPartition() + if extended_part and extended_part.path == devNodePath: return True return False -- 1.8.3.2

3 2

[PATCH V2 1/2] bug fix: instantiate the Yum manager when update the yum packages list
by shaohef＠linux.vnet.ibm.com 24 Mar '14

24 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> an instance just refresh packagekit once. for example: $ sudo PYTHONPATH=src python -c ' > from yum import YumBase > YumBase().doPackageLists("updates") > _yb = YumBase() > _yb.doPackageLists("updates") > _yb.doPackageLists("updates") > ' Loaded plugins: langpacks, refresh-packagekit Loaded plugins: langpacks, refresh-packagekit you can seen the second _yb.doPackageLists will not refresh packagekit. The apt manager may also has the same problem. But not test it on ubuntu, will send a patch later after I have check. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/swupdate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/swupdate.py b/src/kimchi/swupdate.py index 45f7920..3238e44 100644 --- a/src/kimchi/swupdate.py +++ b/src/kimchi/swupdate.py @@ -137,13 +137,13 @@ class YumUpdate(object): """ def __init__(self): self._pkgs = {} - self._yb = getattr(__import__('yum'), 'YumBase')() self.update_cmd = ["yum", "-y", "update"] def _refreshUpdateList(self): """ Update the list of packages to be updated in the system. """ + self._yb = getattr(__import__('yum'), 'YumBase')() self._pkgs = self._yb.doPackageLists('updates') def getPackagesList(self): -- 1.8.5.3

2 2

[PATCH v4] Remove debug report's file path from UI
by Mark Wu 24 Mar '14

24 Mar '14

Now the file path displayed on UI is "/data/debugreports/<reportname>/", It's misleading because people could assume it's path on file system, but it's the uri path in fact. We don't need expose the URI path because the download button can help user to get the file. So this patch removes it from UI. And this patch also renames debug report's 'file' attribute to 'uri', because we use it to represent the download uri path. Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- v3 -> v4: Update mockmodel accordingly. docs/API.md | 2 +- src/kimchi/control/debugreports.py | 2 +- src/kimchi/mockmodel.py | 2 +- src/kimchi/model/debugreports.py | 2 +- ui/css/theme-default/host.css | 4 ---- ui/js/src/kimchi.host.js | 4 ---- ui/pages/i18n.html.tmpl | 1 - 7 files changed, 4 insertions(+), 13 deletions(-) diff --git a/docs/API.md b/docs/API.md index 672ef14..105498a 100644 --- a/docs/API.md +++ b/docs/API.md @@ -672,7 +672,7 @@ specific to the low level collection tool being used. * **GET**: Retrieve the full description of Debug Report * name: The debug report name used to identify the report - * file: The debug report file name used to identify the report + * uri: The URI path to download a debug report * time: The time when the debug report is created * **DELETE**: Remove the Debug Report diff --git a/src/kimchi/control/debugreports.py b/src/kimchi/control/debugreports.py index 9922cfa..6efae23 100644 --- a/src/kimchi/control/debugreports.py +++ b/src/kimchi/control/debugreports.py @@ -37,7 +37,7 @@ class DebugReport(Resource): @property def data(self): return {'name': self.ident, - 'file': self.info['file'], + 'uri': self.info['uri'], 'time': self.info['ctime']} diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index 743c7c6..3690776 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -311,7 +311,7 @@ class MockModel(object): 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) - return {'file': file_target, + return {'uri': file_target, 'ctime': ctime} def debugreportcontent_lookup(self, name): diff --git a/src/kimchi/model/debugreports.py b/src/kimchi/model/debugreports.py index c6e698b..6ae282a 100644 --- a/src/kimchi/model/debugreports.py +++ b/src/kimchi/model/debugreports.py @@ -162,7 +162,7 @@ class DebugReportModel(object): 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) - return {'file': file_target, + return {'uri': file_target, 'ctime': ctime} def delete(self, name): diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css index 0f8b941..8af34f5 100644 --- a/ui/css/theme-default/host.css +++ b/ui/css/theme-default/host.css @@ -215,14 +215,10 @@ } .debug-report-name, -.debug-report-file, .debug-report-time { width: 200px; } -.debug-report-file { - width: 300px; -} /* End of Debug Report */ /* Software Updates */ diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index 6300f37..fa7b4c8 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -186,10 +186,6 @@ kimchi.host_main = function() { label: i18n['KCHDR6003M'], 'class': 'debug-report-name' }, { - name: 'file', - label: i18n['KCHDR6004M'], - 'class': 'debug-report-file' - }, { name: 'time', label: i18n['KCHDR6005M'], 'class': 'debug-report-time' diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index 2f47e50..a626759 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -92,7 +92,6 @@ var i18n = { 'KCHDR6001M': "$_("Debug report will be removed permanently and can't be recovered. Do you want to continue?")", 'KCHDR6002M': "$_("Debug Reports")", 'KCHDR6003M': "$_("Name")", - 'KCHDR6004M': "$_("File Path")", 'KCHDR6005M': "$_("Generated Time")", 'KCHDR6006M': "$_("Generate")", 'KCHDR6007M': "$_("Generating...")", -- 1.8.4.2

2 2

[PATCH V2 0/2] Fix non persistent network handling
by Rodrigo Trujillo 24 Mar '14

24 Mar '14

V2: Address Ming comments: - Updates API.md - remove useless comments and return V1: Kimchi networks have the same problem storage had. Non persistent networks are not stop, they are removed by libvirt and this causes an error in Kimchi. Rodrigo Trujillo (2): Fix non persistent network handling (backend) Fix non persistent network handling (frontend) docs/API.md | 2 ++ src/kimchi/control/networks.py | 3 ++- src/kimchi/model/networks.py | 3 ++- ui/js/src/kimchi.network.js | 55 ++++++++++++++++++++++++++++-------------- ui/pages/i18n.html.tmpl | 1 + 5 files changed, 44 insertions(+), 20 deletions(-) -- 1.8.5.3

2 3

[PATCH] Issue#349: Software Update Grid Keeps Loading when Error Returns
by Hongliang Wang 24 Mar '14

24 Mar '14

Software update grid keeps loading on UI when server returns 500 error. Instead, we shall remove the loading UI and add a message UI to let the user know something is wrong, as well as add a button to allow the user retry. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/grid.css | 20 +++++++++++++ ui/js/src/kimchi.api.js | 4 +-- ui/js/src/kimchi.grid.js | 66 +++++++++++++++++++++++++++++++++---------- ui/js/src/kimchi.host.js | 11 +++++++- ui/pages/i18n.html.tmpl | 5 ++++ 5 files changed, 87 insertions(+), 19 deletions(-) diff --git a/ui/css/theme-default/grid.css b/ui/css/theme-default/grid.css index 44ae614..684dd7b 100644 --- a/ui/css/theme-default/grid.css +++ b/ui/css/theme-default/grid.css @@ -239,3 +239,23 @@ height: 48px; width: 49px; } + +.grid-message { + background: white; + box-sizing: border-box; + bottom: 0; + left: 0; + overflow: auto; + padding: .2em .5em; + position: absolute; + right: 0; + z-index: 5; +} + +.grid-message-text { + line-height: 25px; +} + +.retry-button { + margin: 0 1em; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 4310435..11f83df 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -838,10 +838,8 @@ var kimchi = { }, 200); break; case 'finished': - suc(result); - break; case 'failed': - err(result); + suc(result); break; default: break; diff --git a/ui/js/src/kimchi.grid.js b/ui/js/src/kimchi.grid.js index 540f1ba..f35228d 100644 --- a/ui/js/src/kimchi.grid.js +++ b/ui/js/src/kimchi.grid.js @@ -62,6 +62,18 @@ kimchi.widget.Grid = function(params) { '</div>', '</div>', '</div>', + '<div class="grid-message hidden">', + '<div class="grid-message-text">', + i18n['KCHGRD6002M'], + '<button class="retry-button btn-small">', + i18n['KCHGRD6003M'], + '</button>', + '</div>', + '<div class="detailed-title">', + i18n['KCHGRD6004M'], + '</div>', + '<div class="detailed-text"></div>', + '</div>', '</div>' ]; @@ -161,6 +173,9 @@ kimchi.widget.Grid = function(params) { var maskNode = $('.grid-mask', gridNode); maskNode.css('top', captionHeight + 'px'); + var messageNode = $('.grid-message', gridNode); + messageNode.css('top', captionHeight + 'px'); + var fillBody = function(container, fields, data) { var tbody = ($('tbody', container).length && $('tbody', container)) || $('<tbody></tbody>').appendTo(container); @@ -384,28 +399,49 @@ kimchi.widget.Grid = function(params) { $('body').on('mousemove', positionResizer); $('body').on('mouseup', endResizing); + this.showMessage = function(msg) { + $('.detailed-text', messageNode).text(msg); + $(messageNode).removeClass('hidden'); + }; + + this.hideMessage = function() { + $(messageNode).addClass('hidden'); + }; + this.destroy = function() { $('body').off('mousemove', positionResizer); $('body').off('mouseup', endResizing); }; var data = params['data']; - if(!data) { - return; - } + var self = this; + var reload = function() { + if(!data) { + return; + } - if($.isArray(data)) { - this.setData(data); - return; - } + $(messageNode).addClass('hidden'); - if($.isFunction(data)) { - var self = this; - var loadData = data; - maskNode.removeClass('hidden'); - loadData(function(data) { + if($.isArray(data)) { self.setData(data); - maskNode.addClass('hidden'); - }); - } + return; + } + + if($.isFunction(data)) { + var loadData = data; + maskNode.removeClass('hidden'); + loadData(function(data) { + self.setData(data); + maskNode.addClass('hidden'); + }); + } + }; + + var reloadButton = $('.retry-button', gridNode); + $(reloadButton).on('click', function(event) { + reload(); + }); + + this.reload = reload; + reload(); }; diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index 6e4678f..2990cdd 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -57,7 +57,9 @@ kimchi.host_main = function() { kimchi.topic('kimchi/softwareUpdated').publish({ result: result }); - }, function(result) { + }, function(error) { + var message = error && error['responseJSON'] && error['responseJSON']['reason']; + kimchi.message.error(message || i18n['KCHUPD6009M']); $(updateButton).text(i18n['KCHUPD6006M']).prop('disabled', false); }, reloadProgressArea); } @@ -100,6 +102,13 @@ kimchi.host_main = function() { var updateButton = $('#' + softwareUpdatesGridID + '-update-button'); $(updateButton).prop('disabled', softwareUpdates.length === 0); + }, function(error) { + var message = error && error['responseJSON'] && error['responseJSON']['reason']; + if($.isFunction(gridCallback)) { + gridCallback([]); + } + softwareUpdatesGrid && + softwareUpdatesGrid.showMessage(message || i18n['KCHUPD6008M']); }); }; diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index 2f47e50..362cde2 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -60,6 +60,9 @@ var i18n = { 'KCHAPI6006M': "$_("Warning")", 'KCHGRD6001M': "$_("Loading...")", + 'KCHGRD6002M': "$_("Operation failed.")", + 'KCHGRD6003M': "$_("Retry")", + 'KCHGRD6004M': "$_("Detailed message:")", 'KCHTMPL6001W': "$_("No iso found")", @@ -87,6 +90,8 @@ var i18n = { 'KCHUPD6005M': "$_("Repository")", 'KCHUPD6006M': "$_("Update All")", 'KCHUPD6007M': "$_("Updating...")", + 'KCHUPD6008M': "$_("Failed to retrieve updates.")", + 'KCHUPD6009M': "$_("Failed to update package(s).")", 'KCHDR6001M': "$_("Debug report will be removed permanently and can't be recovered. Do you want to continue?")", -- 1.8.1.4

3 3

[PATCH] Fix build dependency of pep8
by lvroyce＠linux.vnet.ibm.com 22 Mar '14

22 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> On fresh installation, make check will fail because of lack of pep8 checker. Add it to build dependency. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- contrib/DEBIAN/control.in | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + docs/README.md | 7 ++++--- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index c2b2a40..0a730b6 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -24,6 +24,7 @@ Depends: python-cherrypy3 (>= 3.2.0), open-iscsi, firewalld Build-Depends: libxslt, + pep8, python-libxml2 Maintainer: Aline Manera <alinefm(a)br.ibm.com> Description: Kimchi web server diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index bf80104..18bd369 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -31,6 +31,7 @@ Requires: nfs-utils Requires: iscsi-initiator-utils BuildRequires: libxslt BuildRequires: libxml2-python +BuildRequires: python-pep8 %if 0%{?rhel} == 6 Requires: python-ordereddict diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index cba0899..efbb876 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -27,6 +27,7 @@ Requires: nfs-client Requires: open-iscsi BuildRequires: libxslt-tools BuildRequires: python-libxml2 +BuildRequires: python-pep8 %if 0%{?sles_version} == 11 Requires: python-ordereddict diff --git a/docs/README.md b/docs/README.md index 8b8b181..9875ee1 100644 --- a/docs/README.md +++ b/docs/README.md @@ -53,7 +53,8 @@ Install Dependencies PyPAM m2crypto python-jsonschema rpm-build \ qemu-kvm python-psutil python-ethtool sos \ python-ipaddr python-lxml nfs-utils \ - iscsi-initiator-utils libxslt pyparted + iscsi-initiator-utils libxslt pyparted \ + python-pep8 # If using RHEL6, install the following additional packages: $ sudo yum install python-unittest2 python-ordereddict # Restart libvirt to allow configuration changes to take effect @@ -75,7 +76,7 @@ for more information on how to configure your system to access this repository. python-pam python-m2crypto python-jsonschema \ qemu-kvm libtool python-psutil python-ethtool \ sosreport python-ipaddr python-lxml nfs-common \ - open-iscsi lvm2 xsltproc python-parted + open-iscsi lvm2 xsltproc python-parted pep8 Packages version requirement: python-jsonschema >= 1.3.0 @@ -89,7 +90,7 @@ for more information on how to configure your system to access this repository. python-pam python-M2Crypto python-jsonschema \ rpm-build kvm python-psutil python-ethtool \ python-ipaddr python-lxml nfs-client open-iscsi \ - libxslt-tools python-xml python-parted + libxslt-tools python-xml python-parted python-pep8 Packages version requirement: python-psutil >= 0.6.0 -- 1.8.3.2

4 3

2 errors on rhel7 beta
by Sheldon 21 Mar '14

21 Mar '14

1. can not install python-cheetah for missing Dependency. 1. --> Finished Dependency Resolution 2. Error: Package: python-cheetah-2.4.4-4.el7.x86_64 (epel) 3. Requires: python-pygments 4. You could try using --skip-broken to work around the problem 5. You could try running: rpm -Va --nofiles --nodigest I just install epel and cdrom repo. 2. can not start kimchid first time, restart kimchid again, it can works. 1. sudo ./src/kimchid 2. libvirt: Storage Driver error : Storage pool not found: no storage pool with matching name 'default' 3. Loading YumUpdate features. 4. Loaded plugins: langpacks, product-id 5. libvirt: Network Driver error : Network not found: no network with matching name 'default' 6. libvirt: Network Driver error : Failed to create symlink '/etc/libvirt/qemu/networks/autostart/default.xml' to '/etc/libvirt/qemu/networks/default.xml': File exists 7. Fatal: Cannot create default network because of KCHNET0008E: Unable to create network default. Details: Failed to create symlink '/etc/libvirt/qemu/networks/autostart/default.xml' to '/etc/libvirt/qemu/networks/default.xml': File exists, exit kimchid I run kimchi on nested kimchi. check the default network address, kimchi lookup 192.168.123.0/24 for default, it is different with the default network address on host. -- Thanks and best regards! Sheldon Feng(???)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

2 1

[PATCH] Adds 'in_use' info to API.md
by Rodrigo Trujillo 21 Mar '14

21 Mar '14

The network lookup function returns the new field "in_use". API.md was not updated properly. This patch fixes this. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- docs/API.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/API.md b/docs/API.md index b8f941a..103d88b 100644 --- a/docs/API.md +++ b/docs/API.md @@ -485,6 +485,7 @@ A interface represents available interface on host. * active: The Network is ready for use * inactive: The Network is not available * autostart: Network autostart onboot + * in_use: Indicates ('true') if some guest is attached to this network * vms: all vms attached to this network * subnet: Network segment in slash-separated format with ip address and prefix * dhcp: DHCP services on the virtual network is enabled. -- 1.8.5.3

2 1

[PATCH] Issue#352: Debug Report Section NOT Hidden for Non-root User
by Hongliang Wang 21 Mar '14

21 Mar '14

When a non-root user tries to request /debugreports, he will receive an HTTP 403 error. In this situation, we should hide the section. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.host.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index 6e4678f..ae2ee7d 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -202,6 +202,7 @@ kimchi.host_main = function() { var listDebugReports = function() { kimchi.listReports(function(reports) { + $('#debug-report-section').removeClass('hidden'); $.each(reports, function(i, item) { reports[i]['id'] = i + 1; }); @@ -211,6 +212,12 @@ kimchi.host_main = function() { else { initReportGrid(reports); } + }, function(error) { + if(error['status'] == 403) { + $('#debug-report-section').addClass('hidden'); + return; + } + $('#debug-report-section').removeClass('hidden'); }); }; @@ -281,7 +288,6 @@ kimchi.host_main = function() { } if(capabilities['system_report_tool']) { - $('#debug-report-section').removeClass('hidden'); listDebugReports(); kimchi.topic('kimchi/debugReportAdded') .subscribe(listDebugReports); -- 1.8.1.4

2 1

[PATCH 0/2] Fix non persistent network handling
by Rodrigo Trujillo 21 Mar '14

21 Mar '14

Kimchi networks have the same problem storage had. Non persistent networks are not stop, they are removed by libvirt and this causes an error in Kimchi. Rodrigo Trujillo (2): Fix non persistent network handling (backend) Fix non persistent network handling (frontend) src/kimchi/control/networks.py | 3 ++- src/kimchi/model/networks.py | 9 ++++++- ui/js/src/kimchi.network.js | 55 ++++++++++++++++++++++++++++-------------- ui/pages/i18n.html.tmpl | 1 + 4 files changed, 48 insertions(+), 20 deletions(-) -- 1.8.5.3

2 4

[PATCH 00/10] Fixes on repository management feature
by Aline Manera 20 Mar '14

20 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> This patch set also fixes the issue #336 (https://github.com/kimchi-project/kimchi/issues/336) In addition to several fixes found in repositories.py Aline Manera (10): bug fix: Expose repository management tool name bug fix: Reorganize repository information mockmodel: Move specific repository data under 'config' Update messages used in the repositories management feature bug fix: Raise exception comming from backend bug fix: Sort repositories bug fix: Let package manager tool create the repository ID bug fix: Do not store internal repository information Update test cases to reflect the repositories changes bug fix: Lock yum/apt operations docs/API.md | 82 +++-- po/en_US.po | 186 ++++++++--- po/kimchi.pot | 177 ++++++++--- po/pt_BR.po | 186 ++++++++--- po/zh_CN.po | 186 ++++++++--- src/kimchi/API.json | 111 ++++--- src/kimchi/config.py.in | 3 + src/kimchi/control/host.py | 3 +- src/kimchi/i18n.py | 36 ++- src/kimchi/mockmodel.py | 145 ++++----- src/kimchi/model/config.py | 6 +- src/kimchi/model/host.py | 30 +- src/kimchi/repositories.py | 730 +++++++++++++++++++------------------------- src/kimchi/swupdate.py | 7 + tests/test_model.py | 151 +++++---- tests/test_rest.py | 10 +- 16 files changed, 1188 insertions(+), 861 deletions(-) -- 1.7.10.4

4 17

[PATCH v3] VLAN: Do not allow bridge to be the trunk device
by zhshzhou＠linux.vnet.ibm.com 20 Mar '14

20 Mar '14

From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> In Linux networking, a usual VLAN + bridge network setup is as the following. eth0 |-> eth0.10 -> br10 -> vnet101, vnet102, ... |-> eth0.20 -> br20 -> vnet201, vnet202, ... While the eth0 trunk and VLAN interfaces provide the isolation service, the bridges provide the switching inside the respective VLAN. It's not very useful to have a bridge device as the trunk because the VLAN interfaces on a trunk should be isolated. This patch contains changes to the back-end and front-end. The back-end checks if the front-end submits an invalid setup to use a bridge as the VLAN trunk device and raises exception. Before this patch, if the user creates a bridged network over an existing bridge with VLAN tag set. The back-end just ignores the VLAN and creates an ordinary bridged network. After this patch, the back-end raises an exception with an explanation in this case. The front-end also checks the currently selected interface type. If the selected interface is a bridge, it disables the vlan check box, otherwise it enables the vlan check box. V2 Add front-end code to disable vlan check box if the selected interface is a bridge. V3 Clear the vlan check box and vlan id input box value when disabling them. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 1 + src/kimchi/model/networks.py | 2 ++ ui/js/src/kimchi.network.js | 14 ++++++++++++++ 3 files changed, 17 insertions(+) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 589c8cb..b463bd1 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -182,6 +182,7 @@ messages = { "KCHNET0016E": _("Specify name and type to create a Network"), "KCHNET0017E": _("Unable to delete network %(name)s. There are some virtual machines and/or templates linked to this network."), "KCHNET0018E": _("Unable to deactivate network %(name)s. There are some virtual machines and/or templates linked to this network."), + "KCHNET0019E": _("Bridge device %(name)s can not be the trunk device of a VLAN."), "KCHDR0001E": _("Debug report %(name)s does not exist"), "KCHDR0002E": _("Debug report tool not found in system"), diff --git a/src/kimchi/model/networks.py b/src/kimchi/model/networks.py index 27abd54..7872a73 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -151,6 +151,8 @@ class NetworksModel(object): raise MissingParameter("KCHNET0004E", {'name': params['name']}) if netinfo.is_bridge(iface): + if 'vlan_id' in params: + raise InvalidParameter('KCHNET0019E', {'name': iface}) params['bridge'] = iface elif netinfo.is_bare_nic(iface) or netinfo.is_bonding(iface): if params.get('vlan_id') is None: diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 7c4bc77..1642b99 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -215,10 +215,24 @@ kimchi.initNetworkDialog = function() { kimchi.openNetworkDialog = function(okCallback) { kimchi.getInterfaces(function(result) { var options = ""; + var nics = {}; for (var i = 0; i < result.length; i++) { options += "<option value=" + result[i].name + ">" + result[i].name + "</option>"; + nics[result[i].name] = result[i]; } $("#networkInterface").append(options); + onChange = function() { + if (nics[$("#networkInterface").val()].type === "bridge") { + $("#enableVlan").prop("checked", false); + $("#enableVlan").prop("disabled", true); + $("#networkVlanID").val(""); + $("#networkVlanID").prop("disabled", true); + } else { + $("#enableVlan").prop("disabled", false); + } + }; + $("#networkInterface").on("change", onChange); + onChange(); kimchi.setDefaultNetworkType(result.length!==0); }); $("#networkConfig").dialog({ -- 1.8.5.3

3 2

[PATCH] Fix iso streaming functions and feature tests
by Rodrigo Trujillo 20 Mar '14

20 Mar '14

The qemu dns test function was using IP instead of full hostname. This makes the function always return True. Also, changed the streaming protocols checking function supported by libvirt. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/featuretests.py | 3 ++- src/kimchi/model/vms.py | 12 ++++-------- src/kimchi/vmtemplate.py | 13 ++++++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/kimchi/featuretests.py b/src/kimchi/featuretests.py index 045f72b..a6a28fa 100644 --- a/src/kimchi/featuretests.py +++ b/src/kimchi/featuretests.py @@ -21,6 +21,7 @@ import cherrypy import libvirt import lxml.etree as ET import os +import socket import subprocess import threading @@ -140,7 +141,7 @@ class FeatureTests(object): @staticmethod def qemu_iso_stream_dns(): - host = cherrypy.server.socket_host + host = socket.getfqdn(cherrypy.server.socket_host) port = cherrypy.server.socket_port cmd = ["qemu-io", "-r", "http://%s:%d/images/icon-fedora.png" % (host, port), "-c", "'read -v 0 512'"] diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index 79b335c..d29b811 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -202,16 +202,12 @@ class VMsModel(object): with self.objstore as session: session.store('vm', vm_uuid, {'icon': icon}) - libvirt_stream = False - if len(self.caps.libvirt_stream_protocols) == 0: - libvirt_stream = True - graphics = params.get('graphics') xml = t.to_vm_xml(name, vm_uuid, - libvirt_stream=libvirt_stream, - qemu_stream_dns=self.caps.qemu_stream_dns, - graphics=graphics, - volumes=vol_list) + libvirt_stream_protocols=self.caps.libvirt_stream_protocols, + qemu_stream_dns=self.caps.qemu_stream_dns, + graphics=graphics, + volumes=vol_list) try: conn.defineXML(xml.encode('utf-8')) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 003e524..f810df6 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -81,7 +81,7 @@ class VMTemplate(object): except IsoFormatError: raise InvalidParameter("KCHISO0001E", {'filename': iso}) - def _get_cdrom_xml(self, libvirt_stream, qemu_stream_dns): + def _get_cdrom_xml(self, libvirt_stream_protocols, qemu_stream_dns): bus = self.info['cdrom_bus'] dev = "%s%s" % (self._bus_to_dev[bus], string.lowercase[self.info['cdrom_index']]) @@ -133,7 +133,7 @@ class VMTemplate(object): hostname = socket.gethostbyname(hostname) url = protocol + "://" + hostname + ":" + str(port) + url_path - if not libvirt_stream: + if protocol not in libvirt_stream_protocols: return qemu_stream_cmdline % {'url': url, 'bus': bus} params = {'protocol': protocol, 'url_path': url_path, @@ -281,9 +281,12 @@ class VMTemplate(object): params['disks'] = self._get_disks_xml(vm_uuid) qemu_stream_dns = kwargs.get('qemu_stream_dns', False) - libvirt_stream = kwargs.get('libvirt_stream', False) - cdrom_xml = self._get_cdrom_xml(libvirt_stream, qemu_stream_dns) - if not libvirt_stream and params.get('iso_stream', False): + libvirt_stream_protocols = kwargs.get('libvirt_stream_protocols', []) + cdrom_xml = self._get_cdrom_xml(libvirt_stream_protocols, + qemu_stream_dns) + + if not urlparse.urlparse(self.info['cdrom']).scheme in \ + libvirt_stream_protocols and params.get('iso_stream', False): params['qemu-namespace'] = QEMU_NAMESPACE params['qemu-stream-cmdline'] = cdrom_xml else: -- 1.8.5.3

3 3

[PATCH V3 0/4] check the python code with pyflakes
by shaohef＠linux.vnet.ibm.com 20 Mar '14

20 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V2 -> V3 address zhengsheng's comment. improve the SKIP_PYFLAKES_ERR list. V1 -> V2 address Crístian'comment: remove the whole statement "info = self._get_vm(name).inf" address ming's comment: break down the patch into small patches by the pyflakes error. Pyflakes analyzes programs and detects various errors. It works by parsing the source file, not importing it, so it is safe to use on modules with side effects. It's also much faster. This is important to improve the code quality. ShaoHe Feng (4): make pyflakes happly, remove the unused import module make pyflakes happly, remove unused availables add template_delete to rollback after create a template run pyflakes when make check Makefile.am | 7 +++++++ configure.ac | 7 +++++++ contrib/DEBIAN/control.in | 1 + contrib/kimchi.spec.fedora.in | 1 + docs/README.md | 6 +++--- src/kimchi/control/plugins.py | 2 +- src/kimchi/featuretests.py | 2 -- src/kimchi/mockmodel.py | 5 ++--- src/kimchi/model/storagepools.py | 2 +- src/kimchi/screenshot.py | 1 - src/kimchi/template.py | 1 - tests/test_model.py | 1 + tests/test_server.py | 1 - ui/pages/help/gen-index.py | 1 - 14 files changed, 24 insertions(+), 14 deletions(-) -- 1.8.5.3

2 7

[PATCH 0/7] [WIP] Updates to Manage Repositories
by Adam King 20 Mar '14

20 Mar '14

This series updates HLWs original set to work with the new repo management API set posted by Aline. There are some puts that the backend currently rejects that I think should be accepted. I will work with Aline to determine if its the PUT content or the backend that needs additional work. Adam King (2): Update form.serializeObject method to handle deep object serialization Update grid widget to populate fields from deeply nested objects Hongliang Wang (5): Repository Management - Add i18n Strings Repository Management - Add API Support Repository Management - Add Repository Support Repository Management - Edit Repository Support Repository Management - Integrate into Host Tab po/POTFILES.in | 2 + ui/css/theme-default/host.css | 8 ++ ui/css/theme-default/repository-add.css | 39 +++++++ ui/css/theme-default/repository-edit.css | 128 +++++++++++++++++++++ ui/js/src/kimchi.api.js | 76 ++++++++++++- ui/js/src/kimchi.form.js | 66 +++++++++-- ui/js/src/kimchi.grid.js | 17 ++- ui/js/src/kimchi.host.js | 185 +++++++++++++++++++++++++++++++ ui/js/src/kimchi.repository_add_main.js | 84 ++++++++++++++ ui/js/src/kimchi.repository_edit_main.js | 94 ++++++++++++++++ ui/pages/i18n.html.tmpl | 19 ++++ ui/pages/repository-add.html.tmpl | 115 +++++++++++++++++++ ui/pages/repository-edit.html.tmpl | 115 +++++++++++++++++++ ui/pages/tabs/host.html.tmpl | 13 +++ 14 files changed, 946 insertions(+), 15 deletions(-) create mode 100644 ui/css/theme-default/repository-add.css create mode 100644 ui/css/theme-default/repository-edit.css create mode 100644 ui/js/src/kimchi.repository_add_main.js create mode 100644 ui/js/src/kimchi.repository_edit_main.js create mode 100644 ui/pages/repository-add.html.tmpl create mode 100644 ui/pages/repository-edit.html.tmpl -- 1.8.1.4

1 7

About the TTY of the sudo command
by zhshzhou＠linux.vnet.ibm.com 20 Mar '14

20 Mar '14

Hi, I see in kimchid SystemD service file we assign a TTY to it just to avoid the sudo TTY missing error. I think in some setups other than SystemD the admin might also decide to require TTY for sudo and modify the sudo config, so the current solution is just a workaround for RHEL family distroes. Sometimes it's useful for a daemon provides a console interface on a TTY, but kimchid is not in this type. Maybe it's better to run sudo in a temporary PTY and avoid assigning a TTY to kimchid. Actually I'm fine with the current solution. Just happened to see to this problem and thought maybe we can improve it a little bit.

2 3

[PATCH 0/3] Improve error messages
by Crístian Viana 20 Mar '14

20 Mar '14

Crístian Viana (3): Do not show success messages Apply Kimchi standard error message Display the error code when displaying error msgs ui/css/theme-default/guest-cdrom-edit.css | 5 ----- ui/css/theme-default/guest-edit.css | 24 ------------------------ ui/css/theme-default/guest-storage-add.css | 5 ----- ui/css/theme-default/login-window.css | 9 --------- ui/css/theme-default/report-add.css | 4 ---- ui/js/src/kimchi.guest_cdrom_edit_main.js | 4 +--- ui/js/src/kimchi.guest_edit_main.js | 7 ------- ui/js/src/kimchi.guest_media_main.js | 3 --- ui/js/src/kimchi.guest_storage_add.main.js | 4 +--- ui/js/src/kimchi.login_window.js | 2 +- ui/js/src/kimchi.report_add_main.js | 6 ++---- ui/pages/guest-cdrom-edit.html.tmpl | 3 --- ui/pages/guest-edit.html.tmpl | 1 - ui/pages/guest-media.html.tmpl | 3 --- ui/pages/guest-storage-add.html.tmpl | 3 --- ui/pages/login-window.html.tmpl | 1 - ui/pages/report-add.html.tmpl | 1 - 17 files changed, 5 insertions(+), 80 deletions(-) -- 1.8.5.3

2 5

[PATCH] Doc: add work around to handle NFS root squash problem
by lvroyce＠linux.vnet.ibm.com 20 Mar '14

20 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Tested: 1. make 2. nfs pool and vm creation Default NFS server export path is configured as root squash, mapping root user to nobody. This results: 1. Root user cannot step into mount point if export path does not allow other to read/execute. So create volume will fail. 2. Even with other permission open, owner/group of volume created by root is still nobody/nogrp, and qemu permission is denied on such img. This work around instruct user to enable squash to given libvirt user to address the above problems. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- docs/README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index 5721878..17abe78 100644 --- a/docs/README.md +++ b/docs/README.md @@ -146,8 +146,15 @@ new template using the "+" button in the upper right corner. Known Issues ------------ -Kimchi is still experimental and should not be used in a production +1. Kimchi is still experimental and should not be used in a production environment. +2. When you are using NFS as storage pool, check the nfs export path permission +is configured as: + (1) export path need to be squashed as kvm gid and libvirt uid: + /my_export_path *(all_squash,anongid=<kvm-gid>, anonuid=<libvirt-uid>,rw,sync) + So that root user can create volume with right user/group. + (2) Chown of export path user as libvirt user, group as kvm group, + In order to make sure all mapped user can get into the mount point. Participating ------------- -- 1.8.1.2

3 5

[PATCH v2] Fix issue 348: NFS pool creation times out
by Christy Perez 20 Mar '14

20 Mar '14

Adding a 15 second timeout instead of two seconds. This makes kimchi more robust in the face of NFS issues such as the one described in Red Hat Bug 1023059. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/model/libvirtstoragepool.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/kimchi/model/libvirtstoragepool.py b/src/kimchi/model/libvirtstoragepool.py index b8f3d42..47b239b 100644 --- a/src/kimchi/model/libvirtstoragepool.py +++ b/src/kimchi/model/libvirtstoragepool.py @@ -91,10 +91,9 @@ class NetfsPoolDef(StoragePoolDef): export_path, mnt_point] umount_cmd = ["umount", "-f", export_path] mounted = False - # 2 seconds looks like a reasonable time to wait for a refresh - # in the UI and enough time to verify that the NFS server - # is down. - cmd_timeout = 2 + # Due to an NFS bug (See Red Hat BZ 1023059), NFSv4 exports may take + # 10-15 seconds to mount the first time. + cmd_timeout = 15 with RollbackContext() as rollback: rollback.prependDefer(os.rmdir, mnt_point) -- 1.8.5.3

3 3

[PATCH] Fix issue 348: NFS pool creation times out
by Christy Perez 19 Mar '14

19 Mar '14

Adding a 15 second timeout instead of two seconds. This makes kimchi more robust in the face of NFS issues such as the one described in Red Hat Bug 1023059. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/model/libvirtstoragepool.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/kimchi/model/libvirtstoragepool.py b/src/kimchi/model/libvirtstoragepool.py index b8f3d42..35666dc 100644 --- a/src/kimchi/model/libvirtstoragepool.py +++ b/src/kimchi/model/libvirtstoragepool.py @@ -91,10 +91,9 @@ class NetfsPoolDef(StoragePoolDef): export_path, mnt_point] umount_cmd = ["umount", "-f", export_path] mounted = False - # 2 seconds looks like a reasonable time to wait for a refresh - # in the UI and enough time to verify that the NFS server - # is down. - cmd_timeout = 2 + # Due to an NFS bug, NFSv4 exports may take 10-15 seconds to mount + # the first time. + cmd_timeout = 15 with RollbackContext() as rollback: rollback.prependDefer(os.rmdir, mnt_point) -- 1.8.5.3

1 1

[PATCH] Fix issue 348: NFS pool creation times out
by Christy Perez 19 Mar '14

19 Mar '14

Adding a 15 second timeout instead of two seconds. This makes kimchi more robust in the face of NFS issues such as this one. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/model/libvirtstoragepool.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/kimchi/model/libvirtstoragepool.py b/src/kimchi/model/libvirtstoragepool.py index b8f3d42..35666dc 100644 --- a/src/kimchi/model/libvirtstoragepool.py +++ b/src/kimchi/model/libvirtstoragepool.py @@ -91,10 +91,9 @@ class NetfsPoolDef(StoragePoolDef): export_path, mnt_point] umount_cmd = ["umount", "-f", export_path] mounted = False - # 2 seconds looks like a reasonable time to wait for a refresh - # in the UI and enough time to verify that the NFS server - # is down. - cmd_timeout = 2 + # Due to an NFS bug, NFSv4 exports may take 10-15 seconds to mount + # the first time. + cmd_timeout = 15 with RollbackContext() as rollback: rollback.prependDefer(os.rmdir, mnt_point) -- 1.8.5.3

3 3

[PATCH V2 0/4] check the python code with pyflakes
by shaohef＠linux.vnet.ibm.com 19 Mar '14

19 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V2 -> V3 address zhengsheng's comment. improve the SKIP_PYFLAKES_ERR list. V1 -> V2 address Crístian'comment: remove the whole statement "info = self._get_vm(name).inf" address ming's comment: break down the patch into small patches by the pyflakes error. Pyflakes analyzes programs and detects various errors. It works by parsing the source file, not importing it, so it is safe to use on modules with side effects. It's also much faster. This is important to improve the code quality. ShaoHe Feng (4): make pyflakes happly, remove the unused import module make pyflakes happly, remove unused availables add template_delete to rollback after create a template run pyflakes when make check Makefile.am | 7 +++++++ configure.ac | 7 +++++++ contrib/DEBIAN/control.in | 1 + contrib/kimchi.spec.fedora.in | 1 + docs/README.md | 6 +++--- src/kimchi/control/plugins.py | 2 +- src/kimchi/featuretests.py | 2 -- src/kimchi/mockmodel.py | 5 ++--- src/kimchi/model/storagepools.py | 2 +- src/kimchi/screenshot.py | 1 - src/kimchi/template.py | 1 - tests/test_model.py | 1 + tests/test_server.py | 1 - ui/pages/help/gen-index.py | 1 - 14 files changed, 24 insertions(+), 14 deletions(-) -- 1.8.5.3

2 5

[PATCH V2 0/4] check the python code with pyflakes
by shaohef＠linux.vnet.ibm.com 19 Mar '14

19 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V1 -> V2 address Crístian'comment: remove the whole statement "info = self._get_vm(name).inf" address ming's comment: break down the patch into small patches by the pyflakes error. Pyflakes analyzes programs and detects various errors. It works by parsing the source file, not importing it, so it is safe to use on modules with side effects. It's also much faster. This is important to improve the code quality. ShaoHe Feng (4): make pyflakes happly, remove the unused import module make pyflakes happly, remove unused availables add template_delete to rollback after create a template run pyflakes when make check Makefile.am | 7 +++++++ configure.ac | 7 +++++++ contrib/DEBIAN/control.in | 1 + contrib/kimchi.spec.fedora.in | 1 + docs/README.md | 6 +++--- src/kimchi/control/plugins.py | 2 +- src/kimchi/featuretests.py | 2 -- src/kimchi/mockmodel.py | 5 ++--- src/kimchi/model/storagepools.py | 2 +- src/kimchi/screenshot.py | 1 - src/kimchi/template.py | 1 - tests/test_model.py | 1 + tests/test_server.py | 1 - ui/pages/help/gen-index.py | 1 - 14 files changed, 24 insertions(+), 14 deletions(-) -- 1.8.5.3

2 5

[PATCH] Controller: Improve Kimchi Specific Exception Reporting
by zhshzhou＠linux.vnet.ibm.com 19 Mar '14

19 Mar '14

From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> The resource and collection class catches exception in the index method and translates to HTTP error code with error message. While this is good and friendly to the user, the exception handling code is somewhat ad-hoc. The first problem is that it does not catch and translate all the Kimchi exception. When new code or feature is added to Kimchi, it's possible that the new code raises an exception that is not expected before. In this case it fails to translate the error message, so the cherrypy framework translates it to HTTP code 500 with a vague message saying "The server encountered an internal error". This is not friendly to the user. In this patch it "except KimchiException" at the last of the except sequence, and translates it into HTTP error code 500 with specific error message, so that the user knows what's going on. The second problem is that the index method handles GET, POST, PUT and DELETE requests, and the error translating code for each type of request is duplicated. This is not necessary. So this patch merges the error handling code. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/control/base.py | 76 +++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 44 deletions(-) diff --git a/src/kimchi/control/base.py b/src/kimchi/control/base.py index d2d041e..320239b 100644 --- a/src/kimchi/control/base.py +++ b/src/kimchi/control/base.py @@ -26,6 +26,7 @@ from kimchi.control.utils import get_class_name, internal_redirect, model_fn from kimchi.control.utils import parse_request, validate_method from kimchi.control.utils import validate_params from kimchi.exception import InvalidOperation, InvalidParameter +from kimchi.exception import KimchiException from kimchi.exception import MissingParameter, NotFoundError, OperationFailed @@ -87,6 +88,8 @@ class Resource(object): raise cherrypy.HTTPError(500, e.message) except NotFoundError, e: raise cherrypy.HTTPError(404, e.message) + except KimchiException, e: + raise cherrypy.HTTPError(500, e.message) wrapper.__name__ = action_name wrapper.exposed = True @@ -116,31 +119,20 @@ class Resource(object): @cherrypy.expose def index(self): method = validate_method(('GET', 'DELETE', 'PUT')) - if method == 'GET': - try: - return self.get() - except NotFoundError, e: - raise cherrypy.HTTPError(404, e.message) - except InvalidOperation, e: - raise cherrypy.HTTPError(400, e.message) - except OperationFailed, e: - raise cherrypy.HTTPError(406, e.message) - elif method == 'DELETE': - try: - return self.delete() - except NotFoundError, e: - raise cherrypy.HTTPError(404, e.message) - except InvalidParameter, e: - raise cherrypy.HTTPError(400, e.message) - elif method == 'PUT': - try: - return self.update() - except InvalidParameter, e: - raise cherrypy.HTTPError(400, e.message) - except InvalidOperation, e: - raise cherrypy.HTTPError(400, e.message) - except NotFoundError, e: - raise cherrypy.HTTPError(404, e.message) + try: + return {'GET': self.get, + 'DELETE': self.delete, + 'PUT': self.update}[method]() + except InvalidOperation, e: + raise cherrypy.HTTPError(400, e.message) + except InvalidParameter, e: + raise cherrypy.HTTPError(400, e.message) + except NotFoundError, e: + raise cherrypy.HTTPError(404, e.message) + except OperationFailed, e: + raise cherrypy.HTTPError(500, e.message) + except KimchiException, e: + raise cherrypy.HTTPError(500, e.message) def update(self): try: @@ -269,29 +261,25 @@ class Collection(object): @cherrypy.expose def index(self, *args, **kwargs): method = validate_method(('GET', 'POST')) - if method == 'GET': - try: + try: + if method == 'GET': filter_params = cherrypy.request.params validate_params(filter_params, self, 'get_list') return self.get(filter_params) - except InvalidOperation, e: - raise cherrypy.HTTPError(400, e.message) - except NotFoundError, e: - raise cherrypy.HTTPError(404, e.message) - - elif method == 'POST': - try: + elif method == 'POST': return self.create(parse_request(), *args) - except MissingParameter, e: - raise cherrypy.HTTPError(400, e.message) - except InvalidParameter, e: - raise cherrypy.HTTPError(400, e.message) - except OperationFailed, e: - raise cherrypy.HTTPError(500, e.message) - except InvalidOperation, e: - raise cherrypy.HTTPError(400, e.message) - except NotFoundError, e: - raise cherrypy.HTTPError(404, e.message) + except InvalidOperation, e: + raise cherrypy.HTTPError(400, e.message) + except InvalidParameter, e: + raise cherrypy.HTTPError(400, e.message) + except MissingParameter, e: + raise cherrypy.HTTPError(400, e.message) + except NotFoundError, e: + raise cherrypy.HTTPError(404, e.message) + except OperationFailed, e: + raise cherrypy.HTTPError(500, e.message) + except KimchiException, e: + raise cherrypy.HTTPError(500, e.message) class AsyncCollection(Collection): -- 1.8.5.3

4 4

[PATCH v2] VLAN: Do not allow bridge to be the trunk device
by zhshzhou＠linux.vnet.ibm.com 19 Mar '14

19 Mar '14

From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> In Linux networking, a usual VLAN + bridge network setup is as the following. eth0 |-> eth0.10 -> br10 -> vnet101, vnet102, ... |-> eth0.20 -> br20 -> vnet201, vnet202, ... While the eth0 trunk and VLAN interfaces provide the isolation service, the bridges provide the switching inside the respective VLAN. It's not very useful to have a bridge device as the trunk because the VLAN interfaces on a trunk should be isolated. This patch contains changes to the back-end and front-end. The back-end checks if the front-end submits an invalid setup to use a bridge as the VLAN trunk device and raises exception. Before this patch, if the user creates a bridged network over an existing bridge with VLAN tag set. The back-end just ignores the VLAN and creates an ordinary bridged network. After this patch, the back-end raises an exception with an explanation in this case. The front-end also checks the currently selected interface type. If the selected interface is a bridge, it disables the vlan check box, otherwise it enables the vlan check box. V2 Add front-end code to disable vlan check box if the selected interface is a bridge. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 1 + src/kimchi/model/networks.py | 2 ++ ui/js/src/kimchi.network.js | 11 +++++++++++ 3 files changed, 14 insertions(+) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 589c8cb..b463bd1 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -182,6 +182,7 @@ messages = { "KCHNET0016E": _("Specify name and type to create a Network"), "KCHNET0017E": _("Unable to delete network %(name)s. There are some virtual machines and/or templates linked to this network."), "KCHNET0018E": _("Unable to deactivate network %(name)s. There are some virtual machines and/or templates linked to this network."), + "KCHNET0019E": _("Bridge device %(name)s can not be the trunk device of a VLAN."), "KCHDR0001E": _("Debug report %(name)s does not exist"), "KCHDR0002E": _("Debug report tool not found in system"), diff --git a/src/kimchi/model/networks.py b/src/kimchi/model/networks.py index 27abd54..7872a73 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -151,6 +151,8 @@ class NetworksModel(object): raise MissingParameter("KCHNET0004E", {'name': params['name']}) if netinfo.is_bridge(iface): + if 'vlan_id' in params: + raise InvalidParameter('KCHNET0019E', {'name': iface}) params['bridge'] = iface elif netinfo.is_bare_nic(iface) or netinfo.is_bonding(iface): if params.get('vlan_id') is None: diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 7c4bc77..2467425 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -215,10 +215,21 @@ kimchi.initNetworkDialog = function() { kimchi.openNetworkDialog = function(okCallback) { kimchi.getInterfaces(function(result) { var options = ""; + var nics = {}; for (var i = 0; i < result.length; i++) { options += "<option value=" + result[i].name + ">" + result[i].name + "</option>"; + nics[result[i].name] = result[i]; } $("#networkInterface").append(options); + onChange = function() { + if (nics[$("#networkInterface").val()].type === "bridge") { + $("#enableVlan").prop("disabled", true); + } else { + $("#enableVlan").prop("disabled", false); + } + }; + $("#networkInterface").on("change", onChange); + onChange(); kimchi.setDefaultNetworkType(result.length!==0); }); $("#networkConfig").dialog({ -- 1.8.5.3

1 0

[PATCH] VLAN: Do not allow bridge to be the trunk device
by zhshzhou＠linux.vnet.ibm.com 19 Mar '14

19 Mar '14

From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> In Linux networking, a usual VLAN + bridge network setup is as the following. eth0 |-> eth0.10 -> br10 -> vnet101, vnet102, ... |-> eth0.20 -> br20 -> vnet201, vnet202, ... While the eth0 trunk and VLAN interfaces provide the isolation service, the bridges provide the switching inside the respective VLAN. It's not very useful to have a bridge device as the trunk because the VLAN interfaces on a trunk should be isolated. This patch checks if the front-end submits an invalid setup to use a bridge as the VLAN trunk device and raises exception. Before this patch, if the user creates a bridged network over an existing bridge with VLAN tag set. The back-end just ignores the VLAN and creates an ordinary bridged network. After this patch, the back-end raises an exception with an explanation in this case, so the user knows what's going on and can re-try with correct parameters. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 1 + src/kimchi/model/networks.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 589c8cb..b463bd1 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -182,6 +182,7 @@ messages = { "KCHNET0016E": _("Specify name and type to create a Network"), "KCHNET0017E": _("Unable to delete network %(name)s. There are some virtual machines and/or templates linked to this network."), "KCHNET0018E": _("Unable to deactivate network %(name)s. There are some virtual machines and/or templates linked to this network."), + "KCHNET0019E": _("Bridge device %(name)s can not be the trunk device of a VLAN."), "KCHDR0001E": _("Debug report %(name)s does not exist"), "KCHDR0002E": _("Debug report tool not found in system"), diff --git a/src/kimchi/model/networks.py b/src/kimchi/model/networks.py index 0242156..531f614 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -151,6 +151,8 @@ class NetworksModel(object): raise MissingParameter("KCHNET0004E", {'name': params['name']}) if netinfo.is_bridge(iface): + if 'vlan_id' in params: + raise InvalidParameter('KCHNET0019E', {'name': iface}) params['bridge'] = iface elif netinfo.is_bare_nic(iface) or netinfo.is_bonding(iface): if params.get('vlan_id') is None: -- 1.8.5.3

3 3

[PATCH 0/6] [WIP] update manage repository UI to work with new API
by Adam King 19 Mar '14

19 Mar '14

host tab table population works. Edit populates fields correctly. Parse contents from the form does not yet work. Updae needed to kimchi.form.js Consider changing the name notation from [] to . to make it simpler to parse. Haven't touched add yet, but it should be a linear extrapolation from edit->save Patch set includes latest UI from the list. Adam King (1): manageRep update to match new BE Hongliang Wang (5): Repository Management - Add i18n Strings Repository Management - Add API Support Repository Management - Add Repository Support Repository Management - Edit Repository Support Repository Management - Integrate into Host Tab docs/API.html | 978 +++++++++++++++++++++++++++++++ po/POTFILES.in | 2 + ui/css/theme-default/host.css | 8 + ui/css/theme-default/repository-add.css | 39 ++ ui/css/theme-default/repository-edit.css | 128 ++++ ui/js/src/kimchi.api.js | 76 ++- ui/js/src/kimchi.grid.js | 17 +- ui/js/src/kimchi.host.js | 186 +++++- ui/js/src/kimchi.repository_add_main.js | 84 +++ ui/js/src/kimchi.repository_edit_main.js | 99 ++++ ui/pages/i18n.html.tmpl | 19 + ui/pages/repository-add.html.tmpl | 104 ++++ ui/pages/repository-edit.html.tmpl | 115 ++++ ui/pages/tabs/host.html.tmpl | 15 + 14 files changed, 1865 insertions(+), 5 deletions(-) create mode 100644 docs/API.html create mode 100644 ui/css/theme-default/repository-add.css create mode 100644 ui/css/theme-default/repository-edit.css create mode 100644 ui/js/src/kimchi.repository_add_main.js create mode 100644 ui/js/src/kimchi.repository_edit_main.js create mode 100644 ui/pages/repository-add.html.tmpl create mode 100644 ui/pages/repository-edit.html.tmpl -- 1.8.1.4

1 6

[PATCH v3] Remove debug report's file path from UI
by Mark Wu 19 Mar '14

19 Mar '14

Now the file path displayed on UI is "/data/debugreports/<reportname>/", It's misleading because people could assume it's path on file system, but it's the uri path in fact. We don't need expose the URI path because the download button can help user to get the file. So this patch removes it from UI. And this patch also renames debug report's 'file' attribute to 'uri', because we use it to represent the download uri path. Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- docs/API.md | 2 +- src/kimchi/control/debugreports.py | 2 +- src/kimchi/model/debugreports.py | 2 +- ui/css/theme-default/host.css | 4 ---- ui/js/src/kimchi.host.js | 4 ---- ui/pages/i18n.html.tmpl | 1 - 6 files changed, 3 insertions(+), 12 deletions(-) diff --git a/docs/API.md b/docs/API.md index 672ef14..105498a 100644 --- a/docs/API.md +++ b/docs/API.md @@ -672,7 +672,7 @@ specific to the low level collection tool being used. * **GET**: Retrieve the full description of Debug Report * name: The debug report name used to identify the report - * file: The debug report file name used to identify the report + * uri: The URI path to download a debug report * time: The time when the debug report is created * **DELETE**: Remove the Debug Report diff --git a/src/kimchi/control/debugreports.py b/src/kimchi/control/debugreports.py index 9922cfa..6efae23 100644 --- a/src/kimchi/control/debugreports.py +++ b/src/kimchi/control/debugreports.py @@ -37,7 +37,7 @@ class DebugReport(Resource): @property def data(self): return {'name': self.ident, - 'file': self.info['file'], + 'uri': self.info['uri'], 'time': self.info['ctime']} diff --git a/src/kimchi/model/debugreports.py b/src/kimchi/model/debugreports.py index c6e698b..6ae282a 100644 --- a/src/kimchi/model/debugreports.py +++ b/src/kimchi/model/debugreports.py @@ -162,7 +162,7 @@ class DebugReportModel(object): 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) - return {'file': file_target, + return {'uri': file_target, 'ctime': ctime} def delete(self, name): diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css index 0f8b941..8af34f5 100644 --- a/ui/css/theme-default/host.css +++ b/ui/css/theme-default/host.css @@ -215,14 +215,10 @@ } .debug-report-name, -.debug-report-file, .debug-report-time { width: 200px; } -.debug-report-file { - width: 300px; -} /* End of Debug Report */ /* Software Updates */ diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index 6300f37..fa7b4c8 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -186,10 +186,6 @@ kimchi.host_main = function() { label: i18n['KCHDR6003M'], 'class': 'debug-report-name' }, { - name: 'file', - label: i18n['KCHDR6004M'], - 'class': 'debug-report-file' - }, { name: 'time', label: i18n['KCHDR6005M'], 'class': 'debug-report-time' diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index 2f47e50..a626759 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -92,7 +92,6 @@ var i18n = { 'KCHDR6001M': "$_("Debug report will be removed permanently and can't be recovered. Do you want to continue?")", 'KCHDR6002M': "$_("Debug Reports")", 'KCHDR6003M': "$_("Name")", - 'KCHDR6004M': "$_("File Path")", 'KCHDR6005M': "$_("Generated Time")", 'KCHDR6006M': "$_("Generate")", 'KCHDR6007M': "$_("Generating...")", -- 1.8.4.2

3 4

[PATCH] [UI] Software Update: Enable "Update All" Button when Task Fails
by Hongliang Wang 18 Mar '14

18 Mar '14

"Update All" Button stays disabled even when the updating task fails. Fix it in this patch. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.host.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index f9696ea..91ac894 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -57,7 +57,9 @@ kimchi.host_main = function() { kimchi.topic('kimchi/softwareUpdated').publish({ result: result }); - }, function() {}, reloadProgressArea); + }, function(result) { + $(updateButton).text(i18n['KCHUPD6006M']).prop('disabled', false); + }, reloadProgressArea); } }], frozenFields: [], -- 1.8.1.4

2 2

dita warning when make.
by Sheldon 18 Mar '14

18 Mar '14

not sure are these warnings harmful. 1. xsltproc -o guests.html dita-help.xsl guests.dita 2. guests.dita:4: warning: failed to load external entity "-//IBM//DTD DITA CSHelp//EN" 3. "..\dtd\cshelp.dtd"> 4. ^ 5. xsltproc -o host.html dita-help.xsl host.dita 6. host.dita:4: warning: failed to load external entity "-//IBM//DTD DITA CSHelp//EN" 7. "..\dtd\cshelp.dtd"> 8. ^ 9. xsltproc -o network.html dita-help.xsl network.dita 10. network.dita:4: warning: failed to load external entity "-//IBM//DTD DITA CSHelp//EN" 11. "..\dtd\cshelp.dtd"> 12. ^ 13. xsltproc -o storage.html dita-help.xsl storage.dita 14. storage.dita:4: warning: failed to load external entity "-//IBM//DTD DITA CSHelp//EN" 15. "..\dtd\cshelp.dtd"> 16. ^ 17. xsltproc -o templates.html dita-help.xsl templates.dita 18. templates.dita:4: warning: failed to load external entity "-//IBM//DTD DITA CSHelp//EN" 19. "..\dtd\cshelp.dtd"> 20. ^ -- Thanks and best regards! Sheldon Feng(???)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

2 1

[PATCH] Changes to help
by Kersten Richter 18 Mar '14

18 Mar '14

Added information for software updates, adding storage device, and replacing contents of CDROM. Plus a couple of clean up things. Signed-off-by: Kersten Richter <kersten(a)us.ibm.com> --- ui/pages/help/guests.dita | 83 ++++++++++++++++++++++++++++++------------ ui/pages/help/host.dita | 44 +++++++++++++---------- ui/pages/help/templates.dita | 18 +++++----- 3 files changed, 93 insertions(+), 52 deletions(-) diff --git a/ui/pages/help/guests.dita b/ui/pages/help/guests.dita index bae98bb..0456bbb 100644 --- a/ui/pages/help/guests.dita +++ b/ui/pages/help/guests.dita @@ -23,26 +23,28 @@ KVM virtual machines.</shortdesc> <dd>Network input/output transmission rate in KB per seconds.</dd> </dlentry><dlentry> <dt>Disk I/O</dt> -<dd> Disk input/output transmission rate in KB per seconds.</dd> +<dd>Disk input/output transmission rate in KB per seconds.</dd> </dlentry><dlentry> <dt>Livetile</dt> -<dd rev="rev1">State of guest operating system console, or an icon -that represents the <tm tmtype="tm" trademark="Linux">Linux</tm> distribution -if the guest is not active.</dd> +<dd>State of guest operating system console, or an icon that represents +the <tm tmtype="tm" trademark="Linux">Linux</tm> distribution if the +guest is not active.</dd> </dlentry></dl></p> <p>The following actions icons are displayed for each guest:<dl> <dlentry> -<dt rev="rev1">Reset</dt> -<dd rev="rev1">Click to reset the guest. </dd> +<dt>Reset</dt> +<dd>Click to reset the guest. </dd> </dlentry><dlentry> -<dt><tm tmclass="IGNORE" tmtype="reg" trademark="Power">Power</tm> (Start -or Stop)</dt> +<dt>Power (Start or Stop)</dt> <dd>Click to power on or power off the guest. If the icon is red, the power is off; if the icon is green, the power is on.</dd> </dlentry></dl> </p> <p>The following actions can be selected for each guest:<ul> -<li>Select <uicontrol>VNC</uicontrol> to connect to the remote console -for the guest operating system.</li> +<li>Select <uicontrol>Connect</uicontrol> to connect to the remote +console for the guest operating system.</li> +<li>Select <uicontrol>Manage media</uicontrol> to change the path +to the installation media.</li> +<li>Select <uicontrol>Reset</uicontrol> to reset the guest.</li> <li>Select <uicontrol>Edit</uicontrol> to edit the properties of an existing guest. Guests can be edited only while stopped.</li> <li>Select <uicontrol>Delete</uicontrol> to delete the guest.</li> @@ -66,16 +68,12 @@ create a template.</li> </cshelp> <cshelp id="kimhvirtmedit" xml:lang="en-us"> <title>Edit guest</title> -<shortdesc rev="rev1">Edit the properties of an existing virtual machine. -Guests can be edited only while stopped.</shortdesc> -<csprolog><csmetadata> -<cswindowtitle>Title of window or panel associated with this help; -for review output only.</cswindowtitle> -<cswidgetlabel>Name of field or control associated with this help; -for review output only</cswidgetlabel> -</csmetadata></csprolog> +<shortdesc>Edit the properties of an existing virtual machine. Guests +can be edited only while stopped.</shortdesc> +<csprolog><csmetadata></csmetadata></csprolog> <csbody> -<p>For each guest, the following information is displayed:<dl><dlentry> +<p>For each guest, the following information is displayed on the <wintitle>General</wintitle> tab:<dl> +<dlentry> <dt>Name</dt> <dd>Name of the virtual machine.</dd> </dlentry><dlentry> @@ -86,14 +84,51 @@ for review output only</cswidgetlabel> <dd>Amount of memory in MB.</dd> </dlentry><dlentry> <dt>Icon</dt> -<dd rev="rev2"> Graphic image representing the Linux distribution -to be displayed in place of current status (Livetile) when the guest -is not active.</dd> +<dd>Graphic image representing the Linux distribution to be displayed +in place of current status (Livetile) when the guest is not active.</dd> </dlentry></dl></p> +<p>The following information is displayed on the <wintitle>Storage</wintitle> tab.</p> +<dl><dlentry> +<dt>Storage</dt> +<dd>Displays the location of the ISO file used for installation.</dd> +</dlentry></dl><?Pub Caret -2?> <p> Fields that are not disabled can be edited. After you edit a field, click <uicontrol>Save</uicontrol>. </p> </csbody> -</cshelp><?Pub Caret -1?> +</cshelp> +<cshelp id="kimstoragedevice" xml:lang="en-us"> +<title>Add, replace, or detach a storage device</title> +<shortdesc rev="rev1">You can add, replace, or detach a storage device +to your virtual machine. The only supported device is CDROM. To edit +your storage devices, follow these steps:</shortdesc> +<csbody> +<ol> +<li>On the <wintitle>Edit Guest</wintitle> window, select <wintitle>Storage</wintitle>.</li> +<li>To replace a storage device, click the first icon with the <uicontrol>orange +slash (/)</uicontrol>. Enter the ISO file path and click <uicontrol>Replace</uicontrol>.</li> +<li>To detach a storage device, click the second icon with the <uicontrol>red +dash (-)</uicontrol>. Confirm the deletion and click <uicontrol>OK</uicontrol>.</li> +<li>To add a storage device, click the third icon with the green <uicontrol>plus +sign (+)</uicontrol>. Enter a device name and ISO file path and click <uicontrol>Attach</uicontrol>.</li> +</ol> +</csbody> +</cshelp> +<cshelp id="kimreplacemedia" xml:lang="en-us"> +<title>Replace a CDROM of VM</title> +<shortdesc rev="rev1">You can replace the contents of the CDROM for +a virtual machine after the installation is complete.</shortdesc> +<csbody> +<ol> +<li>Ensure that the virtual machine is started.</li> +<li>From the Actions menu, select <uicontrol>Manage Media</uicontrol>.</li> +<li>To change what is currently loaded in the CDROM, click the <uicontrol>orange +slash (/)</uicontrol> icon next to the hdc field.</li> +<li>On the <wintitle>Replace a CDROM of VM</wintitle> page, enter +the ISO file path. The other two fields are read-only.</li> +<li>Click <uicontrol>Replace</uicontrol>.</li> +</ol> +</csbody> +</cshelp> <?tm 1391540919 3?> </cshelp> -<?Pub *0000003805?> +<?Pub *0000005541?> diff --git a/ui/pages/help/host.dita b/ui/pages/help/host.dita index d961edc..1b60b27 100644 --- a/ui/pages/help/host.dita +++ b/ui/pages/help/host.dita @@ -9,16 +9,16 @@ For support please see: https://w3.opensource.ibm.com/projects/dita-cshelp/--> <cshelp id="kimhhost" xml:lang="en-us"> <title>Host</title> -<shortdesc rev="rev1">The <wintitle>Host</wintitle> page shows information -about the host system, and allows you to shut down, restart, and connect +<shortdesc>The <wintitle>Host</wintitle> page shows information about +the host system, and allows you to shut down, restart, and connect to the host.</shortdesc> <csbody> <p>You can perform the following actions on the host:<ul> <li>Select <uicontrol>Shut down</uicontrol> to shut down the host system.</li> <li>Select <uicontrol>Restart</uicontrol> to restart the host system.</li> -<li rev="rev1">Select <uicontrol>Connect</uicontrol> to open a VNC -connection to the host system, if it is not already connected.</li> +<li>Select <uicontrol>Connect</uicontrol> to open a VNC connection +to the host system, if it is not already connected.</li> </ul></p> <p>Click the following sections to display information about the host:<dl> <dlentry> @@ -28,24 +28,30 @@ version, and code name, as well as the processor type and amount of memory in GB.</dd> </dlentry><dlentry> <dt>System statistics</dt> -<dd rev="rev1">This section displays graphs to show statistics for -CPU, memory, disk I/O, and network I/O for the host. Select <uicontrol>Collecting +<dd>This section displays graphs to show statistics for CPU, memory, +disk I/O, and network I/O for the host. Select <uicontrol>Collecting data after leaving this page</uicontrol> to continue collecting data when the host tab is out of view.</dd> </dlentry><dlentry> +<dt>Software Updates</dt> +<dd>This section displays information for all of the packages that +have updates available, including package name, version, architecture, +and repository. You can update all of the packages listed by selecting <uicontrol>Update +All</uicontrol>. You cannot select individual packages for updates.</dd> +</dlentry><dlentry> <dt>Debug reports</dt> -<dd rev="rev1">This section displays debug reports, including name -and file path. You can select from options to generate a new report, -or rename, remove, or download an existing report.<p>The debug report -is generated using the <cmdname>sosreport</cmdname> command. It is -available for Red Hat Enterprise <tm tmtype="tm" trademark="Linux">Linux</tm>, -Fedora, and Ubuntu distributions. The command generates a .tar file -that contains configuration and diagnostic information, such as the -running kernel version, loaded modules, and system and service configuration -files. The command also runs external programs to collect further -information and stores this output in the resulting archive.</p> </dd> -</dlentry></dl></p> -</csbody><?Pub Caret -2?> +<dd>This section displays debug reports, including name and file path. +You can select from options to generate a new report, or rename, remove, +or download an existing report.<p>The debug report is generated using +the <cmdname>sosreport</cmdname> command. It is available for Red +Hat Enterprise <tm tmtype="tm" trademark="Linux">Linux</tm>, Fedora, +and Ubuntu distributions. The command generates a .tar file that contains +configuration and diagnostic information, such as the running kernel +version, loaded modules, and system and service configuration files. +The command also runs external programs to collect further information +and stores this output in the resulting archive.</p> </dd> +</dlentry></dl><?Pub Caret 693?></p> +</csbody> <?tm 1392659967 1?> </cshelp> -<?Pub *0000002392?> +<?Pub *0000002695?> diff --git a/ui/pages/help/templates.dita b/ui/pages/help/templates.dita index d0122ec..8306681 100644 --- a/ui/pages/help/templates.dita +++ b/ui/pages/help/templates.dita @@ -56,7 +56,7 @@ is configured to use.</dd> <dd>Amount of memory in MB to be allocated to the virtual machine.</dd> </dlentry><dlentry> <dt>Disk</dt> -<dd rev="rev1">Disk size in GB.</dd> +<dd>Disk size in GB.</dd> </dlentry><dlentry> <dt>CDROM</dt> <dd>File path to the location of the ISO file used to install the @@ -66,10 +66,10 @@ KVM guest.</dd> <dd>Specific storage pool or the default storage pool.</dd> </dlentry><dlentry> <dt>Network</dt> -<dd rev="rev1">Default network interfaces available to the KVM guest. -You can select multiple networks.</dd> -</dlentry></dl><?Pub Caret 681?> Fields that are not disabled can -be edited. After you edit a field, click <uicontrol>Save</uicontrol>. </p> +<dd>Default network interfaces available to the KVM guest. You can +select multiple networks.</dd> +</dlentry></dl> Fields that are not disabled can be edited. After +you edit a field, click <uicontrol>Save</uicontrol>. </p> </csbody> </cshelp> <cshelp id="kimhaddtempl"> @@ -108,15 +108,15 @@ Templates from Selected ISO</uicontrol>.</li> <li>Select <uicontrol>All</uicontrol> to create a template from each listed ISO image, then click <uicontrol>Create Templates from Selected ISO</uicontrol>.</li> -<li rev="rev1">If the ISO image that you want to use does not appear -in the scan results, you can select from the following options:<ul> +<li>If the ISO image that you want to use does not appear in the scan +results, you can select from the following options:<ul> <li>Select <uicontrol>I want to use a specific ISO file</uicontrol> to specify a path to the ISO image.</li> <li>Click <uicontrol>Search more ISOs</uicontrol> to search for more ISO images.</li> -</ul></li> +</ul></li><?Pub Caret 0?> </ul></p> </csbody> </cshelp> </cshelp> -<?Pub *0000004468?> +<?Pub *0000004433?> -- 1.7.1

3 2

[PATCH] Remove bridge and vlan interface unconditionally on removing vlan network
by Mark Wu 18 Mar '14

18 Mar '14

It's observed that the low layer interfaces could be down for some reason, such as that the physical interface is in disconnected state. In this case, we still need destroy the interfaces to avoid that they're left on the system util reboot. Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- src/kimchi/model/networks.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/kimchi/model/networks.py b/src/kimchi/model/networks.py index 0242156..38e42e9 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -336,6 +336,5 @@ class NetworkModel(object): if bridge.startswith('kimchi-'): conn = self.conn.get() iface = conn.interfaceLookupByName(bridge) - if iface.isActive(): - iface.destroy(0) + iface.destroy(0) iface.undefine() -- 1.8.4.2

2 1