- Kimchi-devel - oVirt List Archives

[PATCH] [Ginger-Base 0/1] Issue 728 - Processor Info in s390 architecture
by sureshab＠linux.vnet.ibm.com 24 Nov '15

24 Nov '15

From: Suresh Babu Angadi <sureshab(a)in.ibm.com> As per RFC mail thread - [Kimchi-devel] RFC - #728 - Processor Info in s390 architecture this patch set adds functionality in back-end to add architecture, and host name(for all architecture), split CPUs to online and offline(x86, s390x), additional virtualization details(for s390x) Note: Subsequent patch set for UI changes will follow to accommodate these changes Test Cases Executed: ==================== 1) On x86 machine: curl -k -u suresh -H "Content-Type: application/json" -H "Accept: application/json" -X GET 'https://127.0.0.1:8001/plugins/gingerbase/host' { "os_distro":"Fedora", "cpus":{ "offline":0, "online":4 }, "cpu_model":"Intel(R) Core(TM) i5-3320M CPU @ 2.60GHz", "os_version":"21", "host":"localhost.localdomain", "os_codename":"Twenty One", "architecture":"x86_64", "memory":7933902848 } 2) On s390x machine: curl -k -u root -H "Content-Type: application/json" -H "Accept: application/json" -X GET 'https://127.0.0.1:8001/plugins/gingerbase/host' { "os_distro":"KVM for IBM z Systems", "cpus":{ "shared":2, "offline":2, "dedicated":0, "online":2 }, "cpu_model":"IBM/2827/743 H43", "os_version":"1.1.1", "host":"zfwcec103", "os_codename":"Z", "architecture":"s390x", "memory":{ "offline":2147483648, "online":2147483648 }, "virtualization":{ "lpar_name":"CSTLIN1", "hypervisor":"PR/SM", "lpar_number":55, "hypervisor_vendor":"IBM" } } 3) For Power(Expected Output): { "os_distro":<os distro>, "cpus":<cpu count>, "cpu_model":<cpu model>, "os_version":<os version>, "host":<host name>, "os_codename":<os codename>, "architecture":"ppc", "memory":<memory> } Suresh Babu Angadi (1): Fix for issue 728: processor info displays blank for system z this patch set also adds additional capability: retrieving architecture and host name (for all architecture) split CPUs to show online and offline cpus(for x86 and s390x) split memory to show online and offline memory(for s390x) additional virtualization details(for s390x): virtualization will have hypervisor details and lpar details src/wok/plugins/gingerbase/docs/API.md | 22 ++- src/wok/plugins/gingerbase/i18n.py | 1 + src/wok/plugins/gingerbase/lscpu.py | 59 ++++++ src/wok/plugins/gingerbase/model/host.py | 256 +++++++++++++++++++++++--- src/wok/plugins/gingerbase/tests/test_host.py | 12 +- 5 files changed, 320 insertions(+), 30 deletions(-) -- 2.1.0

4 9

[PATCH v2] Add support for serial console
by Ramon Medeiros 24 Nov '15

24 Nov '15

Changes: v2: Add ppc rules to serial.py Correct date on "Copyright" Automatically create serial console device. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/vmtemplate.py | 13 ++------ src/wok/plugins/kimchi/xmlutils/serial.py | 55 +++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 10 deletions(-) create mode 100644 src/wok/plugins/kimchi/xmlutils/serial.py diff --git a/src/wok/plugins/kimchi/vmtemplate.py b/src/wok/plugins/kimchi/vmtemplate.py index d653665..34bf38b 100644 --- a/src/wok/plugins/kimchi/vmtemplate.py +++ b/src/wok/plugins/kimchi/vmtemplate.py @@ -38,7 +38,7 @@ from wok.plugins.kimchi.xmlutils.disk import get_disk_xml from wok.plugins.kimchi.xmlutils.graphics import get_graphics_xml from wok.plugins.kimchi.xmlutils.interface import get_iface_xml from wok.plugins.kimchi.xmlutils.qemucmdline import get_qemucmdline_xml - +from wok.plugins.kimchi.xmlutils.serial import get_serial_xml class VMTemplate(object): def __init__(self, args, scan=False): @@ -312,6 +312,7 @@ class VMTemplate(object): params['qemu-stream-cmdline'] = '' params['cpu_info'] = self._get_cpu_xml() params['disks'] = self._get_disks_xml(vm_uuid) + params['serial'] = get_serial_xml(params) graphics = dict(self.info['graphics']) graphics.update(kwargs.get('graphics', {})) @@ -371,20 +372,12 @@ class VMTemplate(object): %(networks)s %(graphics)s %(input_output)s + %(serial)s <memballoon model='virtio' /> </devices> </domain> """ % params - # Adding PPC console configuration - if params['arch'] in ['ppc', 'ppc64']: - ppc_console = """<memballoon model='virtio' /> - <console type='pty'> - <target type='serial' port='1'/> - <address type='spapr-vio' reg='0x30001000'/> - </console>""" - xml = xml.replace("<memballoon model='virtio' />", ppc_console) - return xml def validate(self): diff --git a/src/wok/plugins/kimchi/xmlutils/serial.py b/src/wok/plugins/kimchi/xmlutils/serial.py new file mode 100644 index 0000000..869a971 --- /dev/null +++ b/src/wok/plugins/kimchi/xmlutils/serial.py @@ -0,0 +1,55 @@ +# +# Project Kimchi +# +# Copyright IBM, Corp. 2015 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# 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 + +import lxml.etree as ET +from lxml.builder import E + +def get_serial_xml(params): + """ + For X + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + + For ppc + <console type='pty'> + <target type='serial' port='1'/> + <address type='spapr-vio' reg='0x30001000'/> + </console> + """ + # pcc serial console + if params["arch"] in ["ppc", "ppc64"]: + console = E.console(type="pty") + console.append(E.target(type="serial", port='1')) + console.append(E.address(type="spapr-vio", reg="0x30001000")) + return ET.tostring(console, encoding='utf-8', pretty_print=True) + + # for x + else: + serial = E.serial(type="pty") + serial.append(E.target(port='0')) + console = E.console(type="pty") + console.append(E.target(type="serial", port='0')) + return ET.tostring(serial, encoding='utf-8', pretty_print=True) + \ + ET.tostring(console, encoding='utf-8', pretty_print=True) + + return '' -- 2.1.0

2 1

[PATCH] Add python-mock to README.md
by Rodrigo Trujillo 24 Nov '15

24 Nov '15

Supported distributions provide python-mock. This patch updates README.md with this information. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/docs/README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/wok/plugins/kimchi/docs/README.md b/src/wok/plugins/kimchi/docs/README.md index 16fd1e5..23db018 100644 --- a/src/wok/plugins/kimchi/docs/README.md +++ b/src/wok/plugins/kimchi/docs/README.md @@ -63,8 +63,7 @@ Install Dependencies $ sudo service libvirtd restart # These dependencies are only required if you want to run the tests: - $ sudo yum install pyflakes python-pep8 python-requests - $ sudo pip install mock + $ sudo yum install pyflakes python-pep8 python-requests python-mock *Note for RHEL users*: Some of the above packages are located in the Red Hat @@ -85,7 +84,7 @@ channel at RHN Classic or Red Hat Satellite. python-magic python-paramiko \ # These dependencies are only required if you want to run the tests: - $ sudo apt-get install pep8 pyflakes python-requests + $ sudo apt-get install pep8 pyflakes python-requests python-mock **For openSUSE:** @@ -97,7 +96,7 @@ channel at RHN Classic or Red Hat Satellite. novnc python-magic # These dependencies are only required if you want to run the tests: - $ sudo zypper install python-pyflakes python-pep8 python-requests + $ sudo zypper install python-pyflakes python-pep8 python-requests python-mock *Note for openSUSE users*: Some of the above packages are located in different openSUSE repositories. See -- 2.1.0

3 2

[PATCH] Fix memory add aligment to 256 in PowerPC
by Rodrigo Trujillo 24 Nov '15

24 Nov '15

This patch fixes an error in the 'if' that checks the system architecture. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/model/vms.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wok/plugins/kimchi/model/vms.py b/src/wok/plugins/kimchi/model/vms.py index 5623879..7e12b91 100644 --- a/src/wok/plugins/kimchi/model/vms.py +++ b/src/wok/plugins/kimchi/model/vms.py @@ -238,9 +238,9 @@ class VMModel(object): vm_locks[name] = lock with lock: - # make sure memory is alingned in 256MiB + # make sure memory is alingned in 256MiB in PowerPC distro, _, _ = platform.linux_distribution() - if 'memory' in params and distro != "IBM_PowerKVM": + if 'memory' in params and distro == "IBM_PowerKVM": if params['memory'] % PPC_MEM_ALIGN != 0: raise InvalidParameter('KCHVM0071E', {'mem': str(params['memory']), -- 2.1.0

2 1

[PATCH v2] New Navigation bar
by atreyee＠linux.vnet.ibm.com 24 Nov '15

24 Nov '15

From: Atreyee Mukhopadhyay <atreyee(a)linux.vnet.ibm.com> This patch is to implement new feature mentioned in issue #746. First level navigation bar with Host and Virtualization tabs. Second level tab navigation based on first level navigation. V2 Fixes: Review comments from Aline taken care 1. alignement of second level navigation with first level navigation 2. second level tab color to fit the window Atreyee Mukhopadhyay (1): Issue #746 : New navigation bar. src/wok/plugins/gingerbase/ui/config/tab-ext.xml | 2 +- src/wok/plugins/kimchi/ui/config/tab-ext.xml | 1 + ui/css/src/modules/_navbar-flat.scss | 5 +- ui/css/src/modules/_toolbar.scss | 9 ++- ui/css/src/modules/_wok-variables.scss | 9 ++- ui/css/src/wok.scss | 4 ++ ui/js/src/wok.main.js | 87 +++++++++++++++++++++--- ui/pages/wok-ui.html.tmpl | 8 ++- 8 files changed, 105 insertions(+), 20 deletions(-) -- 2.1.0

2 3

[PATCH V4] Create logical pool from existing VG
by Aline Manera 24 Nov '15

24 Nov '15

V3 - V4: - Use run_command instead of subprocess.Popen (by Daniel) Aline Manera (1): Create logical pool from existing VG src/wok/plugins/kimchi/API.json | 5 + src/wok/plugins/kimchi/control/host.py | 22 ++++ src/wok/plugins/kimchi/disks.py | 127 ++++++++++++++++++--- src/wok/plugins/kimchi/docs/API.md | 25 +++- src/wok/plugins/kimchi/i18n.py | 5 + src/wok/plugins/kimchi/mockmodel.py | 27 +++++ src/wok/plugins/kimchi/model/host.py | 27 +++++ src/wok/plugins/kimchi/model/libvirtstoragepool.py | 9 +- src/wok/plugins/kimchi/model/storagepools.py | 30 +++-- .../plugins/kimchi/tests/test_mock_storagepool.py | 8 +- 10 files changed, 255 insertions(+), 30 deletions(-) -- 2.5.0

2 3

[PATCH v3] New Navigation bar
by atreyee＠linux.vnet.ibm.com 24 Nov '15

24 Nov '15

From: Atreyee Mukhopadhyay <atreyee(a)linux.vnet.ibm.com> This patch is to implement new feature mentioned in issue #746. First level navigation bar with Host and Virtualization tabs. Second level tab navigation based on first level navigation. V3 Fixes: Review comments from Aline taken care Implementing same color for all tabs in kimchi Atreyee Mukhopadhyay (1): Issue #746 : New navigation bar. src/wok/plugins/gingerbase/ui/config/tab-ext.xml | 2 +- src/wok/plugins/kimchi/ui/config/tab-ext.xml | 1 + ui/css/src/modules/_navbar-flat.scss | 5 +- ui/css/src/modules/_toolbar.scss | 9 ++- ui/css/src/modules/_wok-variables.scss | 9 ++- ui/css/src/wok.scss | 4 ++ ui/js/src/wok.main.js | 87 +++++++++++++++++++++--- ui/pages/wok-ui.html.tmpl | 8 ++- 8 files changed, 105 insertions(+), 20 deletions(-) -- 2.1.0

2 2

[PATCH] Moved disks.py file from kimchi plugin to gingerbase plugin
by pkulkark＠linux.vnet.ibm.com 24 Nov '15

24 Nov '15

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> This patch moves the file disks.py from kimchi plugin to gingerbase plugin so that it may be used by both kimchi and ginger without code duplication. Import statement in plugins/kimchi/model/host.py has been modified for the same. Pooja Kulkarni (1): Moved disks.py file from kimchi plugin to gingerbase plugin src/wok/plugins/gingerbase/disks.py | 196 +++++++++++++++++++++++++++++++++++ src/wok/plugins/kimchi/model/host.py | 2 +- 2 files changed, 197 insertions(+), 1 deletion(-) create mode 100644 src/wok/plugins/gingerbase/disks.py -- 2.1.0

7 11

[PATCH v2] Moved disks.py file from kimchi plugin to Gingerbase plugin
by pkulkark＠linux.vnet.ibm.com 24 Nov '15

24 Nov '15

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> v2 changes: Updated license header to project Ginger Base v1: This patch moves the file disks.py from kimchi plugin to gingerbase plugin so that it may be used by both kimchi and ginger without code duplication. Import statement in plugins/kimchi/model/host.py has been modified for the same. Pooja Kulkarni (1): Updated license header to include Project Gingerbase src/wok/plugins/gingerbase/disks.py | 198 +++++++++++++++++++++++++++++++++++ src/wok/plugins/kimchi/model/host.py | 2 +- 2 files changed, 199 insertions(+), 1 deletion(-) create mode 100644 src/wok/plugins/gingerbase/disks.py -- 2.1.0

3 3

[PATCH V3] Issue #737: Wok base framework calls resource model's lookup twice
by archus＠linux.vnet.ibm.com 23 Nov '15

23 Nov '15

From: Archana Singh <archus(a)linux.vnet.ibm.com> In case of GET lookup was called twice. Once before is_authorized() and then in self.get(). This added overhead to system when lookup() is called for each value in list from get_list() of Collection. So to avoid this, removed lookup() call from get(). Also updated code to call self.lookup() before self.get() in resource's update() and collection's create(). Archana Singh (1): Issue #737: Wok base framework calls resource model's lookup twice src/wok/control/base.py | 5 ++--- src/wok/plugins/kimchi/control/storagepools.py | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.1.4

2 2