February 2014 - Kimchi-devel - oVirt List Archives

[PATCH V2] bug fix: make install help/*.html files once
by shaohef＠linux.vnet.ibm.com 18 Feb '14

18 Feb '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Now Makefile install help/*.html twice. Fix it. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- ui/pages/help/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/pages/help/Makefile.am b/ui/pages/help/Makefile.am index 61ea209..6b08668 100644 --- a/ui/pages/help/Makefile.am +++ b/ui/pages/help/Makefile.am @@ -17,7 +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 -DITA_HTML_FILES = $(patsubst %.dita,%.html,$(wildcard *.dita)) $(wildcard *.html) +DITA_HTML_FILES = $(patsubst %.dita,%.html,$(wildcard *.dita)) DITA_XSL_FILE = dita-help.xsl helpdir = $(datadir)/kimchi/ui/pages/help -- 1.8.4.2

2 1

[PATCH] bug fix: make install both *.dita and *.html files
by shaohef＠linux.vnet.ibm.com 18 Feb '14

18 Feb '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Now Makefile install help/*.html twice. Fix it. And also install help/*.dita Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- ui/pages/help/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/pages/help/Makefile.am b/ui/pages/help/Makefile.am index 61ea209..f4eb7f5 100644 --- a/ui/pages/help/Makefile.am +++ b/ui/pages/help/Makefile.am @@ -17,7 +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 -DITA_HTML_FILES = $(patsubst %.dita,%.html,$(wildcard *.dita)) $(wildcard *.html) +DITA_HTML_FILES = $(patsubst %.dita,%.html,$(wildcard *.dita)) $(wildcard *.dita) DITA_XSL_FILE = dita-help.xsl helpdir = $(datadir)/kimchi/ui/pages/help -- 1.8.4.2

3 2

[PATCH 0/4] Add DITA help pages
by Crístian Viana 18 Feb '14

18 Feb '14

Hi! This is the first patchset which adds the DITA help pages do Kimchi. Please read each patch's comment to find out more details about them. To test the new patches, run Kimchi (locally, via RPM or DEB) and type the following URL: http://localhost:8000/help/kimhstor.html A simple HTML page should be displayed. Crístian Viana (4): doc: Add DITA help pages doc: Add help files to dist packages doc: Export the help pages to cherrypy doc: Ignore the generated files .gitignore | 1 + configure.ac | 1 + contrib/DEBIAN/control.in | 2 +- contrib/kimchi.spec.fedora.in | 5 ++++ contrib/kimchi.spec.suse.in | 5 ++++ docs/README.md | 7 ++--- src/kimchi/server.py | 5 ++++ ui/pages/Makefile.am | 2 +- ui/pages/help/Makefile.am | 34 +++++++++++++++++++++++++ ui/pages/help/dita-help.xsl | 24 ++++++++++++++++++ ui/pages/help/kimhstor.dita | 45 +++++++++++++++++++++++++++++++++ ui/pages/help/kimhtempl.dita | 59 +++++++++++++++++++++++++++++++++++++++++++ ui/pages/help/kimhvirtm.dita | 47 ++++++++++++++++++++++++++++++++++ 13 files changed, 232 insertions(+), 5 deletions(-) create mode 100644 ui/pages/help/Makefile.am create mode 100644 ui/pages/help/dita-help.xsl create mode 100644 ui/pages/help/kimhstor.dita create mode 100644 ui/pages/help/kimhtempl.dita create mode 100644 ui/pages/help/kimhvirtm.dita -- 1.8.5.3

6 13

[PATCH 0/4] Add volume reference count
by lvroyce＠linux.vnet.ibm.com 18 Feb '14

18 Feb '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Attach volume to vm need a volume list to choose, available volumes will be tracked by volume reference count. Add this field to storage volume. Royce Lv (4): Add volume ref_cnt: update api.md Add volume ref_cnt: Update controller and json schema Add volume ref_cnt: Add model and mockmodel implementation Add volume ref_cnt: Update test docs/API.md | 6 ++++++ src/kimchi/API.json | 24 ++++++++++++++++++++++++ src/kimchi/control/storagevolumes.py | 1 + src/kimchi/i18n.py | 3 +++ src/kimchi/mockmodel.py | 3 +++ src/kimchi/model/storagevolumes.py | 21 +++++++++++++++++++++ tests/test_model.py | 4 ++++ tests/test_rest.py | 2 ++ 8 files changed, 64 insertions(+) -- 1.8.1.2

3 11

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

18 Feb '14

Added UI support for software updating. The Host Tab will initially list available updates to user if there are any; or we will disable "Update All" Button if no updates available. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/host.css | 22 +++++++++++++++ ui/js/src/kimchi.api.js | 52 ++++++++++++++++++++++++++++++++++ ui/js/src/kimchi.host.js | 65 +++++++++++++++++++++++++++++++++++++++++++ ui/pages/i18n.html.tmpl | 9 ++++++ ui/pages/tabs/host.html.tmpl | 13 +++++++++ 5 files changed, 161 insertions(+) diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css index 67daeaf..1342ade 100644 --- a/ui/css/theme-default/host.css +++ b/ui/css/theme-default/host.css @@ -227,3 +227,25 @@ width: 300px; } /* End of Debug Report */ + +/* Software Updates */ +.host-panel #software-updates-grid { + border-color: #ddd; + height: 300px; + width: 850px; +} + +.software-update-id { + width: 30px; +} + +.software-update-name, +.software-update-repos { + width: 220px; +} + +.software-update-version, +.software-update-arch { + width: 190px; +} +/* End of Software Updates */ diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 6433fe0..c3a9516 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -731,5 +731,57 @@ var kimchi = { success : suc, error : err }); + }, + + listSoftwareUpdates : function(suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'host/packagesupdate', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend: true, + success : suc, + error : err + }); + }, + + updateSoftwares : function(suc, err) { + var taskID = -1; + var onResponse = function(data) { + taskID = data['id']; + trackTask(); + }; + + var trackTask = function() { + kimchi.getTask(taskID, onTaskResponse, err); + }; + + var onTaskResponse = function(result) { + var taskStatus = result['status']; + switch(taskStatus) { + case 'running': + setTimeout(function() { + trackTask(); + }, 200); + break; + case 'finished': + suc(result); + break; + case 'failed': + err(result); + break; + default: + break; + } + }; + + kimchi.requestJSON({ + url : kimchi.url + 'host/packagesupdate/update', + type : "POST", + contentType : "application/json", + dataType : "json", + success : onResponse, + error : err + }); } }; diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index a5c341b..882e2e9 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -131,6 +131,69 @@ kimchi.host_main = function() { }); }; + var softwareUpdatesGridID = 'software-updates-grid'; + var softwareUpdatesGrid = null; + var initSoftwareUpdatesGrid = function(softwareUpdates) { + softwareUpdatesGrid = new kimchi.widget.Grid({ + container: 'software-updates-grid-container', + id: softwareUpdatesGridID, + title: i18n['KCHUPD6001M'], + toolbarButtons: [{ + id: softwareUpdatesGridID + '-update-button', + label: i18n['KCHUPD6006M'], + disabled: true, + onClick: function(event) { + var updateButton = $(this); + $(updateButton).text(i18n['KCHUPD6007M']).prop('disabled', true); + kimchi.updateSoftwares(function(result) { + $(updateButton).text(i18n['KCHUPD6006M']).prop('disabled', false); + }); + } + }], + frozenFields: [{ + name: 'id', + label: ' ', + 'class': 'software-update-id' + }], + fields: [{ + name: 'package_name', + label: i18n['KCHUPD6002M'], + 'class': 'software-update-name' + }, { + name: 'version', + label: i18n['KCHUPD6003M'], + 'class': 'software-update-version' + }, { + name: 'arch', + label: i18n['KCHUPD6004M'], + 'class': 'software-update-arch' + }, { + name: 'repository', + label: i18n['KCHUPD6005M'], + 'class': 'software-update-repos' + }], + data: softwareUpdates + }); + }; + + var listSoftwareUpdates = function() { + kimchi.listSoftwareUpdates(function(softwareUpdates) { + $(softwareUpdatesGridID + '-update-button') + .prop('disabled', softwareUpdates.length === 0); + + $.each(softwareUpdates, function(i, item) { + softwareUpdates[i]['id'] = i + 1; + }); + + if(softwareUpdatesGrid) { + softwareUpdatesGrid.setData(softwareUpdates); + } + else { + initSoftwareUpdatesGrid(softwareUpdates); + } + }); + }; + var shutdownButtonID = '#host-button-shutdown'; var restartButtonID = '#host-button-restart'; var shutdownHost = function(params) { @@ -189,6 +252,8 @@ kimchi.host_main = function() { kimchi.keepMonitoringHost = this['checked']; }); + listSoftwareUpdates(); + kimchi.getCapabilities(function(capabilities) { if(!capabilities['system_report_tool']) { return; diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index 098a0a9..a9d86b3 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -94,6 +94,15 @@ var i18n = { 'KCHDR6010M': "$_("Download")", + 'KCHUPD6001M': "$_("Software Updates")", + 'KCHUPD6002M': "$_("Package Name")", + 'KCHUPD6003M': "$_("Version")", + 'KCHUPD6004M': "$_("Architecture")", + 'KCHUPD6005M': "$_("Repository")", + 'KCHUPD6006M': "$_("Update All")", + 'KCHUPD6007M': "$_("Updating...")", + + 'KCHVM6001M': "$_("This will delete the virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")", 'KCHNET6001E': "$_("The VLAN id must be between 1 and 4094.")", diff --git a/ui/pages/tabs/host.html.tmpl b/ui/pages/tabs/host.html.tmpl index d32773a..3ebb809 100644 --- a/ui/pages/tabs/host.html.tmpl +++ b/ui/pages/tabs/host.html.tmpl @@ -123,6 +123,19 @@ </div> </div> </div> + <div id="software-update-section" class="host-section"> + <h3 class="section-header" + aria-controls="content-software-update"> + $_("Software Updates") + </h3> + <div id="content-software-update" class="section-content"> + <div class="section-row"> + <div class="section-value"> + <div id="software-updates-grid-container"></div> + </div> + </div> + </div> + </div> <div id="debug-report-section" class="host-section hidden"> <h3 class="section-header" aria-controls="content-sys-reports"> -- 1.8.1.4

2 2

[PATCH] Setup VM's input and output template for Power systems.
by Paulo Vital 17 Feb '14

17 Feb '14

Setup the bus for keyboard and mouse to 'usb' by default and prevent the sound configuration to be added for new Power guests. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- src/kimchi/osinfo.py | 13 ++++++++----- src/kimchi/vmtemplate.py | 23 ++++++++++++++++++++++- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index f92db3d..eff8070 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -32,21 +32,24 @@ SUPPORTED_ARCHS = {'x86': ('i386', 'x86_64'), 'power': ('ppc', 'ppc64')} common_spec = {'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1, 'memory': 1024, 'disks': [{'index': 0, 'size': 10}], 'cdrom_bus': 'ide', - 'cdrom_index': 2} + 'cdrom_index': 2, 'mouse_bus': 'ps2'} modern_spec = dict(common_spec, disk_bus='virtio', nic_model='virtio') template_specs = {'x86': {'old': dict(common_spec, disk_bus='ide', - nic_model='e1000'), + nic_model='e1000', sound_model= 'ich6'), 'modern': dict(common_spec, disk_bus='virtio', - nic_model='virtio')}, + nic_model='virtio', + sound_model= 'ich6')}, 'power': {'old': dict(common_spec, disk_bus='scsi', - nic_model='rtl8139', cdrom_bus='scsi'), + nic_model='rtl8139', cdrom_bus='scsi', + kbd_bus='usb', mouse_bus='usb'), 'modern': dict(common_spec, disk_bus='virtio', nic_model='virtio', - cdrom_bus='scsi')}} + cdrom_bus='scsi', kbd_bus='usb', + mouse_bus='usb')}} modern_version_bases = {'debian': '6.0', 'ubuntu': '7.10', 'opensuse': '10.3', diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 999473c..de52f40 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -241,11 +241,32 @@ class VMTemplate(object): networks += network % net_info return networks + def _get_input_output_xml(self): + sound = """ + <sound model='%(sound_model)s' /> + """ + mouse = """ + <input type='mouse' bus='%(mouse_bus)s'/> + """ + keyboard = """ + <input type='kbd' bus='%(kbd_bus)s'> </input> + """ + + input_output = "" + if 'mouse_bus' in self.info.keys(): + input_output += mouse % self.info + if 'kbd_bus' in self.info.keys(): + input_output += keyboard % self.info + if 'sound_model' in self.info.keys(): + input_output += sound % self.info + return input_output + def to_vm_xml(self, vm_name, vm_uuid, **kwargs): params = dict(self.info) params['name'] = vm_name params['uuid'] = vm_uuid params['networks'] = self._get_networks_xml() + params['input_output'] = self._get_input_output_xml() params['qemu-namespace'] = '' params['cdroms'] = '' params['qemu-stream-cmdline'] = '' @@ -294,7 +315,7 @@ class VMTemplate(object): %(cdroms)s %(networks)s %(graphics)s - <sound model='ich6' /> + %(input_output)s <memballoon model='virtio' /> </devices> </domain> -- 1.8.3.1

3 4

[PATCH] Fix exception for model test
by lvroyce＠linux.vnet.ibm.com 17 Feb '14

17 Feb '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> We don't start server in model test so cherrypy.request.app is None and exception translation cannot be used. Just do translation when server started. Signed-off-by: ShaoHe Feng<shaohef(a)linux.vnet.ibm.com> Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/exception.py | 18 ++++++++++++++---- src/kimchi/i18n.py | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/kimchi/exception.py b/src/kimchi/exception.py index 952e243..2d974a8 100644 --- a/src/kimchi/exception.py +++ b/src/kimchi/exception.py @@ -24,16 +24,28 @@ import cherrypy import gettext +from kimchi.i18n import messages as _messages from kimchi.template import get_lang, validate_language class KimchiException(Exception): def __init__(self, code='', args={}): + self.code = code + + if cherrypy.request.app: + msg = self._get_translation(args) + else: + msg = _messages.get(code, code) % args + + pattern = "%s: %s" % (code, msg) + Exception.__init__(self, pattern) + + def _get_translation(self, args): lang = validate_language(get_lang()) paths = cherrypy.request.app.root.paths domain = cherrypy.request.app.root.domain messages = cherrypy.request.app.root.messages - text = messages.get(code, code) + text = messages.get(self.code, self.code) try: translation = gettext.translation(domain, paths.mo_dir, [lang]) @@ -44,9 +56,7 @@ class KimchiException(Exception): if not isinstance(value, unicode): args[key] = unicode(value, 'utf-8') - msg = unicode(translation.gettext(text), 'utf-8') % args - pattern = "%s: %s" % (code, msg) - Exception.__init__(self, pattern) + return unicode(translation.gettext(text), 'utf-8') % args class NotFoundError(KimchiException): diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index fd61d4e..e9c003e 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -57,7 +57,7 @@ messages = { "KCHISO0006E": _("Unexpected volume type for primary volume in ISO %(filename)s"), "KCHISO0007E": _("Bad format while reading volume descriptor in ISO %(filename)s"), - "KCHVM0001E": _("Virtual machine $(name)s already exists"), + "KCHVM0001E": _("Virtual machine %(name)s already exists"), "KCHVM0002E": _("Virtual machine %(name)s does not exist"), "KCHVM0003E": _("Unable to rename virtual machine %(name)s. The name %(new_name)s already exists or it is not powered off."), "KCHVM0004E": _("Unable to retrieve screenshot for stopped virtual machine %(name)s"), -- 1.8.1.2

3 2

[PATCH V2] Implement integrity verification: don't disable network used by guest
by shaohef＠linux.vnet.ibm.com 17 Feb '14

17 Feb '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> do not allow to delete a network when the network is used by more than one guest. do not allow to deactivate a network when the network is used by more than one guest with running state. add a filter for _get_vms_attach_to_a_network Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 2 ++ src/kimchi/model/networks.py | 13 +++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index fd61d4e..03b232d 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -163,6 +163,8 @@ messages = { "KCHNET0014E": _("Network interface must be a string"), "KCHNET0015E": _("Network VLAN ID must be an integer between 1 and 4094"), "KCHNET0016E": _("Specify name and type to create a Network"), + "KCHNET0017E": _("Unable to delete network %(name)s. There are still some VMs linked to this network."), + "KCHNET0018E": _("Unable to deactivate network %(name)s. There are some VMs running linked to this network."), "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 05105df..9a88fe9 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -188,12 +188,17 @@ class NetworkModel(object): 'autostart': network.autostart() == 1, 'state': network.isActive() and "active" or "inactive"} - def _get_vms_attach_to_a_network(self, network): + def _get_vms_attach_to_a_network(self, network, filter="all"): + DOM_STATE_MAP = {'nostate': 0, 'running': 1, 'blocked': 2, + 'paused':3, 'shutdown': 4, 'shutoff': 5, + 'crashed': 6} + state = DOM_STATE_MAP.get(filter) vms = [] conn = self.conn.get() for dom in conn.listAllDomains(0): networks = self._vm_get_networks(dom) - if network in networks: + if network in networks and (state == None or + state == dom.state()[0]): vms.append(dom.name()) return vms @@ -208,12 +213,16 @@ class NetworkModel(object): def deactivate(self, name): network = self._get_network(name) + if self._get_vms_attach_to_a_network(name, "running"): + raise InvalidOperation("KCHNET0018E", {'name': name}) network.destroy() def delete(self, name): network = self._get_network(name) if network.isActive(): raise InvalidOperation("KCHNET0005E", {'name': name}) + if self._get_vms_attach_to_a_network(name): + raise InvalidOperation("KCHNET0017E", {'name': name}) self._remove_vlan_tagged_bridge(network) network.undefine() -- 1.8.4.2

3 2

[WIP 0/4] Authorization utililty modules
by Shu Ming 17 Feb '14

17 Feb '14

The following patches provide modules to manage groups for the users Also pam modules are provided to check if a user is in one specific group Shu Ming (4): A module to manage the groups of the users A module to do pam account managment An example to demo how pam_members.so is used Configuration files for pam services src/kimchi/pam_members.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++ src/kimchi/pamauth_acc.py | 51 +++++++++++++++++++++++ src/kimchi/rolegroups.py | 36 ++++++++++++++++ src/kimchi/superadmin | 5 +++ src/kimchi/vmadmin | 5 +++ src/kimchi/vmuser | 5 +++ 6 files changed, 205 insertions(+) create mode 100644 src/kimchi/pam_members.c create mode 100644 src/kimchi/pamauth_acc.py create mode 100644 src/kimchi/rolegroups.py create mode 100644 src/kimchi/superadmin create mode 100644 src/kimchi/vmadmin create mode 100644 src/kimchi/vmuser -- 1.8.1.4

3 9

[V1 0/2] Fibre Channel SCSI Storage Pool UI
by huoyuxin＠linux.vnet.ibm.com 17 Feb '14

17 Feb '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> 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/js/src/kimchi.api.js | 14 +++++++++++++ ui/js/src/kimchi.storagepool_add_main.js | 31 ++++++++++++++++++++++++++++- ui/pages/i18n.html.tmpl | 1 + ui/pages/storagepool-add.html.tmpl | 12 +++++++++++ 8 files changed, 80 insertions(+), 2 deletions(-)

5 9

[PATCH V2] Fix Software Update rebase issue.
by Paulo Vital 17 Feb '14

17 Feb '14

V1 -> V2: SoftwareUpdate() executes an exception if there's no pkg manager in the host, so I changed previous patch to use try/except while instantiating PackagesUpdateModel() V1: During the last merge/rebase to apply Software Update feature to the code, an important line was removed. This fix is adding it again and enabling the code to list all host's package updates. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/model/host.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/kimchi/model/host.py b/src/kimchi/model/host.py index 68028b2..ef40879 100644 --- a/src/kimchi/model/host.py +++ b/src/kimchi/model/host.py @@ -262,21 +262,25 @@ class DeviceModel(object): class PackagesUpdateModel(object): def __init__(self, **kargs): - + try: + self.host_swupdate = SoftwareUpdate() + except: + self.host_swupdate = None self.objstore = kargs['objstore'] self.task = TaskModel(**kargs) def get_list(self): + if self.host_swupdate is None: + raise OperationFailed('KCHPKGUPD0004E') + return self.host_swupdate.getUpdates() def update(self, **kargs): - try: - swupdate = SoftwareUpdate() - except Exception: + if self.host_swupdate is None: raise OperationFailed('KCHPKGUPD0004E') try: - pkgs = swupdate.getNumOfUpdates() + pkgs = self.host_swupdate.getNumOfUpdates() except OperationFailed, e: raise e @@ -284,7 +288,7 @@ class PackagesUpdateModel(object): raise OperationFailed('KCHPKGUPD0001E') kimchi_log.debug('Host is going to be updated.') - taskid = add_task('', swupdate.doUpdate, self.objstore, None) + taskid = add_task('', self.host_swupdate.doUpdate, self.objstore, None) return self.task.lookup(taskid) -- 1.8.3.1

2 1

[PATCH V3 0/5] template cloning
by shaohef＠linux.vnet.ibm.com 17 Feb '14

17 Feb '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V2 -> V3 raise HTTPredirect in controller. V1 -> V2 clone will just "duplicate the template" with all default in new template. The user may clone a template from an existing template with different name. Later he can customize some parts of the template to save the effort to create a full new template. For example, he can update the network of the template cloned to have a new different template. ShaoHe Feng (5): clone template: update API.md Enhance generate_action_handler to redirect a new resource clone template: update controller clone template: update model and mockmodel clone template: update test case docs/API.md | 4 +++- src/kimchi/control/base.py | 14 +++++++++----- src/kimchi/control/templates.py | 1 + src/kimchi/mockmodel.py | 16 ++++++++++++++++ src/kimchi/model/templates.py | 16 ++++++++++++++++ tests/test_model.py | 16 ++++++++++++++++ tests/test_rest.py | 15 +++++++++++++++ 7 files changed, 76 insertions(+), 6 deletions(-) -- 1.8.4.2

2 6

[PATCH 0/6 V3] Host's repositories management support
by Paulo Vital 17 Feb '14

17 Feb '14

V2 -> V3: * PEP8 compatibility * Improved mockmodel.py and model/host.py * Updated API.json and backend files to use new exception error system code V1 -> V2: * Removed the enable/disable from docs/API.md and src/kimchi/API.json * fixed wrong URI on test_rest.py * PEP8 compatibility * Updated repositories.py to make consistent with docs/API.md * Raised correct exceptions * Changed model/host.py and mockmodel.py to generate repo_id if not provided * Changed mockmodel.py to declare MockRepositories class V1: This patch set provides support to host's repositories management operations. At this point, an agnostic class is providing support to backend and REST API operations. In addition, YUM (for RHEL, Fedora, SLES and OpenSuse) and APT (for Debian and Ubuntu) specific classes are provided to support the operation os each software update system. To test the backend execute the following commands: $ cd tests $ sudo ./run_tests.sh test_model.ModelTests.test_repository_create $ sudo ./run_tests.sh test_model.ModelTests.test_repository_update $ sudo ./run_tests.sh test_model.ModelTests.test_repository_disable_enable To test the REST API, execute the following commands (all them are agnostic of the host's distro): 1) Get list of all repositories enabled in the host: $ curl -u <USER> -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/repositories/ -X GET 2) Create a new repository: $ curl -u <USER> -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/repositories/ -X POST -d' { "repo_id": "fedora-fake", "baseurl": "http://www.fedora.org", "gpgkey": "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-fake-19" } ' 3) Get information from a specific repository: $ curl -u <USER> -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/repositories/fedora-fake 4) Update a specific repository: $ curl -u <USER> -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/repositories/fedora-fake -X PUT -d' { "repo_id":"fedora-fake", "repo_name":"Fedora 19 FAKEs", "baseurl": "http://www.fedora.org/downloads" } ' 5) Disable a specific repository: $ curl -u <USER> -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/repositories/fedora-fake/disable -X POST -d '' 6) Enable a specific repository: $ curl -u <USER> -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/repositories/fedora-fake/enable -X POST -d '' 7) Delete a specific repository: $ curl -u <USER> -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/repositories/fedora-fake -X DELETE Paulo Vital (6): Host's repositories management: Update API.md Host's repositories management: Update REST API Host's repositories management: Update backend. Host's repositories management: Update Makefile Host's repositories management: Update test-cases. Host's repositories management: Update error exception messages. Makefile.am | 1 + docs/API.md | 77 ++++++ src/kimchi/API.json | 76 ++++++ src/kimchi/Makefile.am | 1 + src/kimchi/control/host.py | 21 ++ src/kimchi/i18n.py | 19 ++ src/kimchi/mockmodel.py | 133 +++++++++++ src/kimchi/model/host.py | 54 ++++- src/kimchi/repositories.py | 585 +++++++++++++++++++++++++++++++++++++++++++++ tests/test_model.py | 100 ++++++++ tests/test_rest.py | 33 +++ 11 files changed, 1099 insertions(+), 1 deletion(-) create mode 100644 src/kimchi/repositories.py -- 1.8.3.1

2 8

[PATCH] Implement integrity verification: don't disable network used by guest
by shaohef＠linux.vnet.ibm.com 17 Feb '14

17 Feb '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> do not allow to delete a network when the network is used by more than one guest. do not allow to deactivate a network when the network is used by more than one guest with running state. add a filter for _get_vms_attach_to_a_network Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 2 ++ src/kimchi/model/networks.py | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index fd61d4e..ee864f6 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -163,6 +163,8 @@ messages = { "KCHNET0014E": _("Network interface must be a string"), "KCHNET0015E": _("Network VLAN ID must be an integer between 1 and 4094"), "KCHNET0016E": _("Specify name and type to create a Network"), + "KCHNET0017E": _("Unable to delete network %(name)s. There are still some VMs join this network."), + "KCHNET0018E": _("Unable to deactivate network %(name)s. There are some VMs join this network."), "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 05105df..96ed43c 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -188,12 +188,13 @@ class NetworkModel(object): 'autostart': network.autostart() == 1, 'state': network.isActive() and "active" or "inactive"} - def _get_vms_attach_to_a_network(self, network): + def _get_vms_attach_to_a_network(self, network, state=None): vms = [] conn = self.conn.get() for dom in conn.listAllDomains(0): networks = self._vm_get_networks(dom) - if network in networks: + if network in networks and (state == None or + state == dom.state()[0]): vms.append(dom.name()) return vms @@ -208,12 +209,16 @@ class NetworkModel(object): def deactivate(self, name): network = self._get_network(name) + if self._get_vms_attach_to_a_network(name, 1): + raise InvalidOperation("KCHNET0018E", {'name': name}) network.destroy() def delete(self, name): network = self._get_network(name) if network.isActive(): raise InvalidOperation("KCHNET0005E", {'name': name}) + if self._get_vms_attach_to_a_network(name): + raise InvalidOperation("KCHNET0017E", {'name': name}) self._remove_vlan_tagged_bridge(network) network.undefine() -- 1.8.4.2

2 1

[RFC] About the way Kimchi deals with services (libvirt, nfs, etc)
by Daniel H Barboza 17 Feb '14

17 Feb '14

Hello all, I am working in a nfs related bug where kimchi hungs up if the nfs service stops for some reason while creating a NFS pool. I have a very similar situation Power-only with another service. My idea at first was to verify the service status every time we request a specific service. This could work for actions that requires specific services, such as NFS. However, for this approach make sense, we should verify the status of libvirt for all the operations that depend of it. We would flood the code with "if (libvirt.service is active) " conditionals do to pretty much anything. Thus, I am creating this RFC to ask you: how can we handle Kimchi dependencies on external services in a neat, clean way? Mark suggested to use systemd, for example. Thanks!

2 1

[PATCH] Bug fix #309 - network: Unable to create vlan tagged on Ubuntu v4
by Ramon Medeiros 17 Feb '14

17 Feb '14

Changes: v4: Use flag 0 in some libvirt functions v3: rebase with new model. v2: Put the rollback function above the raise, unless, the line will never run. Ramon Medeiros (1): Bug fix #309 - network: Unable to create vlan tagged on Ubuntu src/kimchi/model/networks.py | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) -- 1.8.3.1

2 2

[PATCH] Fix Software Update rebase issue.
by Paulo Vital 17 Feb '14

17 Feb '14

During the last merge/rebase to apply Software Update feature to the code, an important line was removed. This fix is adding it again and enabling the code to list all host's package updates. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- src/kimchi/model/host.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/model/host.py b/src/kimchi/model/host.py index 68028b2..ea10370 100644 --- a/src/kimchi/model/host.py +++ b/src/kimchi/model/host.py @@ -262,7 +262,7 @@ class DeviceModel(object): class PackagesUpdateModel(object): def __init__(self, **kargs): - + self.host_swupdate = SoftwareUpdate() self.objstore = kargs['objstore'] self.task = TaskModel(**kargs) -- 1.8.3.1

2 1

[PATCH 0/7 V4] Host's software update support
by Aline Manera 17 Feb '14

17 Feb '14

From: Aline Manera <alinefm(a)br.ibm.com> Hi all, I helped Paulo to apply the suggestions made on reviews and I am resending his patches. Following are the modifications I made. V3 -> V4 - Update API.md - fix type and add the task resource will be returned when doing an update operation - Use cherrypy.expose to expose the update() handler for PackagesUpdate(Collection) - Return a task resource while performing an update operation That way UI can provide good progress messages to the user - Use apt-get command to update Ubuntu system instead of apt binding python to be able to get the output in live time. - Adjust errors messages according refactor exception patches - Expose update tool in Capabilities that way UI can disable update button when no supported tool is found. - Add tests for test_rest.py ------------------------------------------------------------------------------ This patch set provides support to host's software update operations. To test the backend (ONLY mockmodel) execute the following commands: $ cd tests $ sudo ./run_tests.sh test_mockmodel.MockModelTests.test_packages_update To test the REST API, execute the following commands (all them are agnostic of the host's distro): 1) Get list of all packages to be updated in the host: $ curl -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/packagesupdate/ -X GET 2) Update the host system: $ curl -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/packagesupdate/update -X POST -d '' V2 -> V3: * Fixed indent and wrong bullets on docs/API.md * Changed to use Collection and Resource * Removed unnecessary 'exposed' * PEP8 compatibility on mockmodel.py * Removed debug prints from swupdate.py * Fixed indent in swupdate.py * Usage of utils.run_command() to execute Zypper update * Updated swupdate.py and mockmodel.py to make consistent with docs/API.md * Usage of Task element in mockmodel.py * Created test case in test_mockmodel.py V1 -> V2: * rebased to use new model framework * added SLES as Zypper supported distro * PEP8 compatibility * changed import sentences * use of run_command() from utils.py to execute shell commands * usage of Task element to return update status V1: At this point, an agnostic class is providing support to backend and REST API operations. In addition, YUM (for RHEL and Fedora), APT (for Debian and Ubuntu) and ZYPPER (for OpenSuse) specific classes are provided to support the operation os each software update system. Aline Manera (2): host update: Update po files host update: Expose update tool Paulo Vital (5): Host's software update: Update API.md Host's software update: Update REST API Host's software update: Update backend. Host's software update: Update Makefile Host's software update: Update test cases. Makefile.am | 1 + docs/API.md | 35 +++++++ po/en_US.po | 29 +++++- po/kimchi.pot | 29 +++++- po/pt_BR.po | 29 +++++- po/zh_CN.po | 29 +++++- src/kimchi/Makefile.am | 1 + src/kimchi/control/host.py | 29 ++++++ src/kimchi/i18n.py | 5 + src/kimchi/mockmodel.py | 51 +++++++++ src/kimchi/model/config.py | 10 +- src/kimchi/model/host.py | 45 +++++++- src/kimchi/swupdate.py | 247 ++++++++++++++++++++++++++++++++++++++++++++ tests/test_mockmodel.py | 15 +++ tests/test_rest.py | 28 +++++ 15 files changed, 577 insertions(+), 6 deletions(-) create mode 100644 src/kimchi/swupdate.py -- 1.7.10.4

5 15

[PATCH RFC] doc: Add DITA help pages
by Crístian Viana 17 Feb '14

17 Feb '14

Hi! I am starting to create this patch to add documentation pages to Kimchi. The idea is to have the help content in XML files in a help-specific format (DITA) which will be processed, using XSTL, to generate the HTML pages. I am sending three sample DITA files (Storage, Templates and Virtual Machines), the XSL file and also the generated HTML files for that documentation. Please note that the HTML files will not be added to the final versions, they will be generated dynamically (e.g. via Makefile) when building the distribution package. The command "xsltproc <XSL file> <DITA file>" generates the HTML output corresponding to the DITA file processed by the XSL file. The current version of the XSL file generates a simple HTML output, but we will enhance it over time. And, obviously, we can apply a CSS file to make it look pretty. Instead of preprocessing the DITA files to generate the HTML files statically, there is also the option to process them in the client side using the client's browser. A single line in the DITA file can tell the browser to do so. Most modern browsers are able to process XML files linked to an XSL file dynamically. However, for security reasons, Google Chrome does not allow a local file to load another local file (i.e. the DITA file cannot load the XSL file), so this client-side process does not work on Chrome locally. When we improve this patch and integrate it to Kimchi, when the files will be served using a web server, I believe Chrome will transform them correctly. But that is only another way of displaying the HTML files; we can always process them statically to generate the HTML files. We can decide later which approach we will use. Keep in mind that this patch is not finished yet. Any feedback is welcome. Crístian Viana (1): doc: Add DITA help pages dita/dita.xsl | 23 +++++++++++++++++++++ dita/kimhstor.dita | 45 ++++++++++++++++++++++++++++++++++++++++ dita/kimhstor.html | 31 ++++++++++++++++++++++++++++ dita/kimhtempl.dita | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++ dita/kimhtempl.html | 38 ++++++++++++++++++++++++++++++++++ dita/kimhvirtm.dita | 47 ++++++++++++++++++++++++++++++++++++++++++ dita/kimhvirtm.html | 30 +++++++++++++++++++++++++++ 7 files changed, 273 insertions(+) create mode 100644 dita/dita.xsl create mode 100644 dita/kimhstor.dita create mode 100644 dita/kimhstor.html create mode 100644 dita/kimhtempl.dita create mode 100644 dita/kimhtempl.html create mode 100644 dita/kimhvirtm.dita create mode 100644 dita/kimhvirtm.html -- 1.8.5.3

2 3

[PATCH 0/4] Add DITA help pages
by Crístian Viana 17 Feb '14

17 Feb '14

This is the difference between this and the previous patchset (v1): - The *.dita files have more meaningful names. - The Makefile reads all *.dita/*.html files dynamically (no need to list each file). Crístian Viana (4): doc: Add DITA help pages doc: Add help files to dist packages doc: Export the help pages to cherrypy doc: Ignore the generated files .gitignore | 1 + configure.ac | 1 + contrib/DEBIAN/control.in | 2 +- contrib/kimchi.spec.fedora.in | 5 ++++ contrib/kimchi.spec.suse.in | 5 ++++ docs/README.md | 7 ++--- src/kimchi/server.py | 5 ++++ ui/pages/Makefile.am | 2 +- ui/pages/help/Makefile.am | 30 ++++++++++++++++++++++ ui/pages/help/dita-help.xsl | 24 ++++++++++++++++++ ui/pages/help/guests.dita | 47 ++++++++++++++++++++++++++++++++++ ui/pages/help/storage.dita | 45 +++++++++++++++++++++++++++++++++ ui/pages/help/templates.dita | 59 +++++++++++++++++++++++++++++++++++++++++++ 13 files changed, 228 insertions(+), 5 deletions(-) create mode 100644 ui/pages/help/Makefile.am create mode 100644 ui/pages/help/dita-help.xsl create mode 100644 ui/pages/help/guests.dita create mode 100644 ui/pages/help/storage.dita create mode 100644 ui/pages/help/templates.dita -- 1.8.5.3

2 5

[PATCH] Bug fix #309 - network: Unable to create vlan tagged on Ubuntu
by Ramon Medeiros 17 Feb '14

17 Feb '14

Changes: v3: rebase with new model. v2: Put the rollback function above the raise, unless, the line will never run. Ramon Medeiros (1): Bug fix #309 - network: Unable to create vlan tagged on Ubuntu src/kimchi/model/networks.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) -- 1.8.3.1

2 5

[PATCH V2 0/4] template cloning
by shaohef＠linux.vnet.ibm.com 17 Feb '14

17 Feb '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V1 -> V2 clone will just "duplicate the template" with all default in new template. The user may clone a template from an existing template with different name. Later he can customize some parts of the template to save the effort to create a full new template. For example, he can update the network of the template cloned to have a new different template. ShaoHe Feng (4): clone template: update API.md clone template: update controller clone template: update model and mockmodel clone template: update test case docs/API.md | 4 +++- src/kimchi/control/templates.py | 1 + src/kimchi/mockmodel.py | 17 +++++++++++++++++ src/kimchi/model/templates.py | 17 +++++++++++++++++ tests/test_model.py | 18 ++++++++++++++++++ tests/test_rest.py | 15 +++++++++++++++ 6 files changed, 71 insertions(+), 1 deletion(-) -- 1.8.4.2

3 9

[PATCH v2 0/4] Initial authorization support
by Leonardo Garcia 16 Feb '14

16 Feb '14

From: Leonardo Garcia <lagarcia(a)br.ibm.com> Current, in Kimchi, no real authorization support is implemented. We do have authentication support, and, apart from that, no other kind of control is provided in order to authorize or not a Kimchi user to access its features. IOW, today, a user can access everything or nothing Kimchi provides. This patch series tries to implement an initial support for user authorization in Kimchi back-end. Some has already been discussed in the community about this feature [1, 2, 3]. The RFC proposed in [2] and the WIP sent in [3] seems to be diverging from the simple proposal first put in [1] and sustained in replies to [2]. So, the purpose of this patch series is to try to be, as much as possible, compliant to [1] and keep things as simple as possible. In summary, that means we will identify users as having sudo rights or not. This information will be passed to the UI by the /login REST API during logging in. With this information the UI will be able to decide which components (tabs, buttons, etc.) it will show to the user. Additionally, an infrastructure was also built in order to identify a REST API as one that needs sudo rights or not to be accessed. So, if the UI, for some reason, tries to access a REST API in a session whose user does not have sudo rights, the REST API call will return HTTP error 401. [1] https://github.com/kimchi-project/kimchi/wiki/authorization [2] http://lists.ovirt.org/pipermail/kimchi-devel/2014-January/001218.html [3] http://lists.ovirt.org/pipermail/kimchi-devel/2014-January/001898.html Leonardo Garcia (4): Code cleanup. Find out user groups and sudo status during login. Enhance UrlSubNode decorator and kimchiauth tool to check for sudo rights. Limit user access to REST API /host. src/kimchi/auth.py | 85 ++++++++++++++++++++++++++++++++++++--------- src/kimchi/control/host.py | 2 +- src/kimchi/control/utils.py | 9 ++++- src/kimchi/root.py | 4 +-- src/kimchi/server.py | 7 +++- 5 files changed, 86 insertions(+), 21 deletions(-) -- 1.8.5.3

2 6

[PATCH 0/5 V6] CDROM Management
by Aline Manera 14 Feb '14

14 Feb '14

From: Aline Manera <alinefm(a)br.ibm.com> Hi all, I helped Daniel to apply the suggestions made on reviews and I am resending his patches. v6: - Addressed Royce's comments made on v5 ------------------------------------------------------------------------------ This patch set implements host storage devices management. It implements full CDROM device add, remove and update functionality. It implements basic Disk functionalities. Changelog: v5: - Addressed Aline's comments from her review in v4 v4: - Imports fix, author fix, pep8 fixes - Cut off HDD support - lxml changes in model/vms.py - test_model.py changes - add, update and remove cdroms - existing device name verification in model/vms.py - changed the code to use the new exception model V3: - Using lxml to parse the XML information in model/vms.py - Addressed comments/suggestions from the ML in other files V2: - Add devices to mockmodel and add test cases to rest API - Assign name automatically to new devices, if not passed by user - Fix minor errors To test this contribution: - get info of all storages (cdrom and disks) of a VM curl -u <user> -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8000/vms/<vm_name>/storages -X GET - add a new cdrom to a VM curl -u <user> -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8000/vms/<vm_name>/storages -X POST -d'{"type": "cdrom", "path": "<path_to_iso>"}' - get specific info from cdrom device curl -u <user> -H "Content-Type: application/json" -H "Accet: application/json" http://localhost:8000/vms/<vm_name>/storages/<dev_name> -X GET - delete a cdrom device from a VM curl -u <user> -H "Content-Type: application/json" -H "Accet: application/json" http://localhost:8000/vms/<vm_name>/storages/<dev_name> -X DELETE - update a cdrom device from a VM curl -u <user> -H "Content-Type: application/json" -H "Accet: application/json" http://localhost:8000/vms/<vm_name>/storages/<dev_name> -X PUT -d '{"path":<path_to_iso>}' Daniel Henrique Barboza (2): CDROM Management: API.md and externalized error messages CDROM Management: changes in tests/test_model.py Rodrigo Trujillo (3): CDROM Management: Update controller and API.json for guest storages CDROM Management: Devices management model implementation CDROM Management: Guest vm storage devices mockmodel and rest api test cases docs/API.md | 21 ++++ po/en_US.po | 70 +++++++++++- po/kimchi.pot | 70 +++++++++++- po/pt_BR.po | 70 +++++++++++- po/zh_CN.po | 70 +++++++++++- src/kimchi/API.json | 37 +++++++ src/kimchi/control/vm/storages.py | 49 ++++++++ src/kimchi/i18n.py | 12 ++ src/kimchi/mockmodel.py | 70 +++++++++++- src/kimchi/model/vmstorages.py | 221 +++++++++++++++++++++++++++++++++++++ tests/test_model.py | 61 ++++++++++ tests/test_rest.py | 75 +++++++++++++ 12 files changed, 817 insertions(+), 9 deletions(-) create mode 100644 src/kimchi/control/vm/storages.py create mode 100644 src/kimchi/model/vmstorages.py -- 1.7.10.4

3 17

[PATCH] bug fix: display kimchi icon instead of cherrypy icon
by shaohef＠linux.vnet.ibm.com 14 Feb '14

14 Feb '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> When we start a VNC window, the favicon.ico is always cherrypy icon. Actually we open any page: such as: http://192.168.1.117:8000/error the favicon.ico is also a cherrypy icon. This patch fix this bug. Ref: http://docs.cherrypy.org/en/latest/progguide/files/favicon.html Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/server.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/kimchi/server.py b/src/kimchi/server.py index 1e131b4..0396660 100644 --- a/src/kimchi/server.py +++ b/src/kimchi/server.py @@ -118,6 +118,10 @@ class Server(object): 'tools.staticfile.on': True, 'tools.staticfile.filename': 'config/ui/tabs.xml', 'tools.nocache.on': True + }, + '/favicon.ico': { + 'tools.staticfile.on': True, + 'tools.staticfile.filename': '%s/images/logo.ico' % paths.ui_dir } } -- 1.8.4.2

5 6