- Kimchi-devel - oVirt List Archives

[PATCH] Fix minus in manpage
by Frédéric Bonnard 05 Aug '15

05 Aug '15

From: Frederic Bonnard <frediz(a)linux.vnet.ibm.com> Escape minus for options so they don't get interpreted as hyphens. --- docs/kimchid.8.in | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/kimchid.8.in b/docs/kimchid.8.in index 08e96e5..d715e87 100644 --- a/docs/kimchid.8.in +++ b/docs/kimchid.8.in @@ -17,35 +17,35 @@ supports HTML5. .SH OPTIONS The following options are supported: .TP -\fB-h\fP , \fB--help\fP +\fB\-h\fP , \fB\-\-help\fP Show this help message and exit. .TP -\fB--host\fP \fIhost\fP +\fB\-\-host\fP \fIhost\fP Specify the hostname or IP to listen on. .TP -\fB--port\fP \fIport\fP +\fB\-\-port\fP \fIport\fP Specify the HTTP port (default \fI8000\fP). .TP -\fB--ssl-port\fP \fIssl_port\fP +\fB\-\-ssl-port\fP \fIssl_port\fP Specify the HTTPS port (default \fI8001\fP). .TP -\fB--cherrypy_port\fP \fIcherrypy_port\fP +\fB\-\-cherrypy_port\fP \fIcherrypy_port\fP Specify the Cherrypy server port (default \fI8010\fP). .TP -\fB--log-level\fP [\fIdebug\fP | \fIinfo\fP | \fIwarning\fP | \fIerror\fP | \fIcritical\fP] +\fB\-\-log-level\fP [\fIdebug\fP | \fIinfo\fP | \fIwarning\fP | \fIerror\fP | \fIcritical\fP] Specify the log level (default \fIdebug\fP). .TP -\fB--access-log\fP \fIaccess_log\fP +\fB\-\-access-log\fP \fIaccess_log\fP Specify the access log location where kimchi should create the access log file. .TP -\fB--environment\fP [\fIdevelopment\fP | \fIproduction\fP] +\fB\-\-environment\fP [\fIdevelopment\fP | \fIproduction\fP] Specify the running environment of kimchi server. Check cherrypy documentation for more details (default \fIproduction\fP). .TP -\fB--federation\fP [\fIon\fP | \fIoff\fP] +\fB\-\-federation\fP [\fIon\fP | \fIoff\fP] Register and discover Kimchi peers in the same network using OpenSLP. Check below the \fBFEDERATION\fP section for more details (default \fIoff\fP). .TP -\fB--test\fP +\fB\-\-test\fP Run kimchi on a mock version that does not affect the system. For testing proposals. .SH FEDERATION Federation feature is a mechanism to discover Kimchi peers in the same network. @@ -63,23 +63,23 @@ To enable it, do the following: ports in your firewall configuration For system using firewalld, do: - sudo firewall-cmd --permanent --add-port=427/udp - sudo firewall-cmd --permanent --add-port=427/tcp - sudo firewall-cmd --reload + sudo firewall-cmd \-\-permanent \-\-add-port=427/udp + sudo firewall-cmd \-\-permanent \-\-add-port=427/tcp + sudo firewall-cmd \-\-reload For openSUSE systems, do: sudo /sbin/SuSEfirewall2 open EXT TCP 427 sudo /sbin/SuSEfirewall2 open EXT UDP 427 For system using iptables, do: - sudo iptables -A INPUT -p tcp --dport 427 -j ACCEPT - sudo iptables -A INPUT -p udp --dport 427 -j ACCEPT + sudo iptables \-A INPUT \-p tcp \-\-dport 427 \-j ACCEPT + sudo iptables \-A INPUT \-p udp \-\-dport 427 \-j ACCEPT 3. In addition to the OpenSLP ports, you also need to allow multicast in the firewall configuration For system using firewalld, do: - sudo firewall-cmd --direct --add-rule ipv4 filter INPUT 0 -s <subnet> -j ACCEPT + sudo firewall-cmd \-\-direct \-\-add-rule ipv4 filter INPUT 0 \-s <subnet> \-j ACCEPT For openSUSE systems, do: Add the subnet to the trusted networks listed on FW_TRUSTED_NETS in @@ -87,7 +87,7 @@ To enable it, do the following: Make sure to restart /sbin/SuSEfirewall2 after modifying /etc/sysconfig/SuSEfirewall2 For system using iptables, do: - sudo iptables -A INPUT -s <subnet> -j ACCEPT + sudo iptables \-A INPUT \-s <subnet> \-j ACCEPT 4. Start slpd service and make sure it is up while running Kimchi sudo service slpd start -- 2.1.4

3 3

[PATCH v2 0/4] Add usb xhci controller for hotplug on Power
by Jose Ricardo Ziviani 05 Aug '15

05 Aug '15

v2: - Added a new test case; Power system requires an USB XHCI controller in order to allow PCI hotplug. This patch adds such controller by default when creating a new VM and inform the users if a VM currently doesn't have the controller. Jose Ricardo Ziviani (4): Add a new error code for pci hotplug Check for usb xhci controller in Power platform Define the USB xhci controller in the template for Power Systems Add a new test case for pci hotplug on Power src/kimchi/i18n.py | 1 + src/kimchi/model/vmhostdevs.py | 28 +++++++++++++++++++++- src/kimchi/vmtemplate.py | 17 +++++++++++++ tests/test_model.py | 54 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+), 1 deletion(-) -- 1.9.1

2 5

[PATCH 1/1] Fix :704 -page refreshing issue for wok branch
by Atreyee 05 Aug '15

05 Aug '15

'undefined' value displayed in url and page was getting refreshed after logged into wok page Signed-off-by: Atreyee <atreyee(a)linux.vnet.ibm.com> --- ui/css/theme-default/message.css | 10 ++++++++++ ui/js/src/wok.main.js | 15 +++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ui/css/theme-default/message.css b/ui/css/theme-default/message.css index 28c392b..7cce15b 100644 --- a/ui/css/theme-default/message.css +++ b/ui/css/theme-default/message.css @@ -133,3 +133,13 @@ border: 2px solid #444; color: #444; } + +.noPluginMessage{ + font-size: 18px; + height: 48px; + line-height: 48px; + text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; + padding-left: 10px; + padding-top:10px; + +} diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js index f4c9940..0d9baec 100644 --- a/ui/js/src/wok.main.js +++ b/ui/js/src/wok.main.js @@ -102,10 +102,15 @@ wok.main = function() { var defaultTab = tabs[0] var defaultTabPath = defaultTab && defaultTab['path'] + + //redirect to empty page when no plugin installed + if(tabs.length===0){ + DEFAULT_HASH = 'wok-empty'; + }else{ // Remove file extension from 'defaultTabPath' DEFAULT_HASH = defaultTabPath && defaultTabPath.substring(0, defaultTabPath.lastIndexOf('.')) - + } $('#nav-menu').append(genTabs(tabs)); callback && callback(); @@ -136,11 +141,16 @@ wok.main = function() { * and clear location.hash to jump to home page. */ var tab = $('#nav-menu a[href="' + url + '"]'); - if (tab.length === 0) { + if (tab.length === 0 && url!='wok-empty.html') { location.hash = ''; return; } + //Remove the tab arrow indicator for no plugin + if(url=='wok-empty.html'){ + $('.menu-arrow').hide(); + $('#main').html('No plugins installed currently.You can download the available plugins <a href="https://github.com/kimchi-project/kimchi">Kimchi</a> and <a href="https://github.com/kimchi-project/ginger">Ginger</a> from Github').addClass('noPluginMessage'); + }else{ // Animate arrow indicator. var left = $(tab).parent().position().left; var width = $(tab).parent().width(); @@ -163,6 +173,7 @@ wok.main = function() { } // Load page content. loadPage(url); + } }; /** -- 2.1.0

1 0

[PATCH] Patched kimchi for psutils 3.0.1
by stephan.conrad＠gmail.com 04 Aug '15

04 Aug '15

From: Stephan Conrad <stephan.conrad(a)gmail.com> Hi, I have change the patch, so that it should work with older psutils versions. Regards Stephan Stephan Conrad (1): Patched kimchi for psutils 3.0.1 src/kimchi/model/host.py | 17 ++++++++++++++--- src/kimchi/osinfo.py | 6 ++++-- 2 files changed, 18 insertions(+), 5 deletions(-) -- 2.2.1

3 3

[PATCH 0/3] New backend API: get available devices from host
by dhbarboza82＠gmail.com 04 Aug '15

04 Aug '15

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> This patch set adds a new API to retrieve only the available devices from the host. 'available' means only the devices that weren't attached to any other VM. The backend is generic and can work with all devices, but the API provided here is made for 'PCI' devices only as we do not provide official support for USB and SCSI passthrough yet. Usage: get all available devices: $ curl -u danielhb -H "Content-Type: application/json" -H "Accept: application/json" -X GET "http://localhost:8010/host/devices?_passthrough=true&_available_only=true" get all available PCI devices: $ curl -u danielhb -H "Content-Type: application/json" -H "Accept: application/json" -X GET "http://localhost:8010/host/devices?_passthrough=true&_available_only=true&_…" Daniel Henrique Barboza (3): Get available host passthrough devices: model changes Adding new API in the UI APIs and docs Mockmodel and test changes for the new API docs/API.md | 2 + src/kimchi/API.json | 6 +++ src/kimchi/i18n.py | 1 + src/kimchi/mockmodel.py | 3 +- src/kimchi/model/host.py | 105 ++++++++++++++++++++++++++++++++++++++++- src/kimchi/model/vmhostdevs.py | 75 ++--------------------------- tests/test_host.py | 11 +++++ ui/js/src/kimchi.api.js | 14 ++++++ 8 files changed, 144 insertions(+), 73 deletions(-) -- 2.4.3

5 7

[PATCH 0/2] Template disk format fixes
by dhbarboza82＠gmail.com 04 Aug '15

04 Aug '15

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> Kimchi does not obey the value set by the template, always creating a disk of format 'qcow2' even if the user set another format. This patchset fixes this issue by: - always set the disk format with the value the user set, unless there is a storagepool restrition - getting the default disk format type in template.conf. This value is optional and will be used in the case the user does not provide any other value. - if there is no user choice and no default set in template.conf, the default disk format will be 'qcow2'. See the code and unit tests for more info. Daniel Henrique Barboza (2): Getting default disk format from template.conf New unit tests to check disk creation behavior src/kimchi/vmtemplate.py | 19 +++++++-- tests/test_model.py | 106 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 120 insertions(+), 5 deletions(-) -- 2.4.3

4 5

[PATCH] Detach group of PCI Devices from host before attaching to guest
by Jose Ricardo Ziviani 04 Aug '15

04 Aug '15

- A PCI device can have more than one function. In this case each function must be detached from host before attaching to the vm. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- src/kimchi/model/vmhostdevs.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/kimchi/model/vmhostdevs.py b/src/kimchi/model/vmhostdevs.py index ea75fce..76033f0 100644 --- a/src/kimchi/model/vmhostdevs.py +++ b/src/kimchi/model/vmhostdevs.py @@ -196,6 +196,22 @@ class VMHostDevsModel(object): pci_infos = [dev_model.lookup(dev_name) for dev_name in group_names] pci_infos.append(dev_info) + # all devices in the group that is going to be attached to the vm + # must be detached from the host first + with RollbackContext() as rollback: + for pci_info in pci_infos: + try: + dev = self.conn.get().nodeDeviceLookupByName( + pci_info['name']) + dev.dettach() + except Exception: + raise OperationFailed('KCHVMHDEV0005E', + {'name': pci_info['name']}) + else: + rollback.prependDefer(dev.reAttach) + + rollback.commitAll() + device_flags = get_vm_config_flag(dom, mode='all') with RollbackContext() as rollback: -- 1.9.1

4 3

[PATCH] Update Fedora 20 ISO path to mirrors.kernel.org
by Ramon Medeiros 04 Aug '15

04 Aug '15

The last path was removed in the server. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/distros.d/fedora.json | 2 +- tests/test_rest.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/distros.d/fedora.json b/src/distros.d/fedora.json index bce72d6..164415d 100644 --- a/src/distros.d/fedora.json +++ b/src/distros.d/fedora.json @@ -4,7 +4,7 @@ "os_distro": "fedora", "os_arch": "x86_64", "os_version": "20", - "path": "http://fedora.mirrors.tds.net/pub/fedora/releases/20/Live/x86_64/Fedora-Liv…" + "path": "http://mirrors.kernel.org/fedora/releases/21/Live/x86_64/Fedora-Live-KDE-x8…" }, { "name": "Fedora 18 (PPC64)", diff --git a/tests/test_rest.py b/tests/test_rest.py index c2d142f..a969942 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -645,8 +645,8 @@ class RestTests(unittest.TestCase): os.remove('/tmp/existent.iso') # Change path of storage cdrom - cdrom = u'http://fedora.mirrors.tds.net/pub/fedora/releases/20/'\ - 'Live/x86_64/Fedora-Live-Desktop-x86_64-20-1.iso' + cdrom = u'http://mirrors.kernel.org/fedora/releases/21/Live/x86_64/'\ + 'Fedora-Live-KDE-x86_64-21-5.iso' req = json.dumps({'path': cdrom}) resp = self.request('/vms/test-vm/storages/' + cd_dev, req, 'PUT') self.assertEquals(200, resp.status) -- 2.1.0

3 3

[PATCH] Remove unecessary call to node_dev.parent()
by Ramon Medeiros 04 Aug '15

04 Aug '15

On hostdev.py, device parent was being search 2 times. First, a xml was parsed, where the parent device can be found. When device parent not present, calling the function .parent() (which is not necessary) will raise an error on libvirt. To avoid this, the call for .parent() was removed, and parent device is set as None if not present. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/kimchi/model/hostdev.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/kimchi/model/hostdev.py b/src/kimchi/model/hostdev.py index 2a4a311..e898d77 100644 --- a/src/kimchi/model/hostdev.py +++ b/src/kimchi/model/hostdev.py @@ -169,14 +169,15 @@ def get_dev_info(node_dev): scsi_target is not documented in libvirt official website. Try to parse scsi_target according to the libvirt commit db19834a0a. ''' - xmlstr = node_dev.XMLDesc(0) info = dictize(xmlstr)['device'] dev_type = info['capability'].pop('type') info['device_type'] = dev_type cap_dict = info.pop('capability') info.update(cap_dict) - info['parent'] = node_dev.parent() + + # parent device not found: set as None + info["parent"] = info.get("parent") if dev_type in ('scsi', 'scsi_generic', 'scsi_target', 'system', 'usb'): return info -- 2.1.0

3 3

[PATCH] Template disk format test fixes
by dhbarboza82＠gmail.com 04 Aug '15

04 Aug '15

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> Unit tests must consider the scenario where the user set a default disk format other than 'qcow2'. Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- src/kimchi/vmtemplate.py | 7 ++++--- tests/test_model.py | 5 ++++- tests/test_template.py | 4 +++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 28c6448..2646573 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -159,7 +159,8 @@ class VMTemplate(object): dev, xml = get_disk_xml(params) return xml - def _get_default_disk0_format(self): + @staticmethod + def get_default_disk0_format(): config_file = os.path.join(paths.conf_dir, 'template.conf') config = ConfigObj(config_file) @@ -174,7 +175,7 @@ class VMTemplate(object): base_disk_params = {'type': 'disk', 'disk': 'file', 'bus': self.info['disk_bus'], - 'format': self._get_default_disk0_format()} + 'format': self.get_default_disk0_format()} logical_disk_params = {'format': 'raw'} iscsi_disk_params = {'disk': 'block', 'format': 'raw'} @@ -202,7 +203,7 @@ class VMTemplate(object): return unicode(disks_xml, 'utf-8') def to_volume_list(self, vm_uuid): - default_vol_format = self._get_default_disk0_format() + default_vol_format = self.get_default_disk0_format() storage_path = self._get_storage_path() ret = [] for i, d in enumerate(self.info['disks']): diff --git a/tests/test_model.py b/tests/test_model.py index bc71c50..717b9bc 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -738,8 +738,11 @@ class ModelTests(unittest.TestCase): inst = model.Model(None, objstore_loc=self.tmp_store) + # template disk format must be qcow2 because vmsnapshot + # only supports this format orig_params = {'name': 'test', 'memory': 1024, 'cpus': 1, - 'cdrom': UBUNTU_ISO} + 'cdrom': UBUNTU_ISO, + 'disks': [{'size': 1, 'format': 'qcow2'}]} inst.templates_create(orig_params) with RollbackContext() as rollback: diff --git a/tests/test_template.py b/tests/test_template.py index acdb7c6..83561c1 100644 --- a/tests/test_template.py +++ b/tests/test_template.py @@ -24,6 +24,7 @@ import unittest from functools import partial +from kimchi.vmtemplate import VMTemplate from kimchi.config import READONLY_POOL_TYPE from kimchi.mockmodel import MockModel from utils import get_free_port, patch_auth, request, run_server @@ -87,7 +88,8 @@ class TemplateTests(unittest.TestCase): self.assertEquals(sorted(tmpl.keys()), sorted(keys)) # Verify if default disk format was configured - self.assertEquals(tmpl['disks'][0]['format'], 'qcow2') + default_disk_format = VMTemplate.get_default_disk0_format() + self.assertEquals(tmpl['disks'][0]['format'], default_disk_format) # Clone a template resp = self.request('/templates/test/clone', '{}', 'POST') -- 2.4.3

3 2