- Kimchi-devel - oVirt List Archives

[PATCH] [Wok] Upgrade objectstore schema.
by pvital＠linux.vnet.ibm.com 15 Dec '15

15 Dec '15

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> With the new structure of the objectstore changed in Wok 2.0.0, the schema of the objectstore file (when used by any plugin) needs to be checked and, if necessary, updated to reflect the new structure. This patch adds to utils.py file some common methods to support the operations in the plugin's objectstore files. These methods were moved from Kimchi plugin since they will be used by other plugins to do the same. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- src/wok/utils.py | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/src/wok/utils.py b/src/wok/utils.py index 8c8973a..997adf3 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -26,6 +26,7 @@ import os import psutil import pwd import re +import sqlite3 import subprocess import traceback import xml.etree.ElementTree as ET @@ -504,3 +505,47 @@ def convert_data_size(value, from_unit, to_unit='B'): break return ret + + +def get_objectstore_fields(objstore=None): + """ + Return a list with all fields from the objectstore. + """ + if objstore is None: + wok_log.error("No objectstore set up.") + return None + conn = sqlite3.connect(objstore, timeout=10) + cursor = conn.cursor() + schema_fields = [] + sql = "PRAGMA table_info('objects')" + cursor.execute(sql) + for row in cursor.fetchall(): + schema_fields.append(row[1]) + return schema_fields + + +def upgrade_objectstore_schema(objstore=None, field=None): + """ + Add a new column (of type TEXT) in the objectstore schema. + """ + if (field or objstore) is None: + wok_log.error("Cannot upgrade objectstore schema.") + return False + + if field in get_objectstore_fields(objstore): + # field already exists in objectstore schema. Nothing to do. + return False + try: + conn = sqlite3.connect(objstore, timeout=10) + cursor = conn.cursor() + sql = "ALTER TABLE objects ADD COLUMN %s TEXT" % field + cursor.execute(sql) + wok_log.info("Objectstore schema sucessfully upgraded: %s" % objstore) + conn.close() + except sqlite3.Error, e: + if conn: + conn.rollback() + conn.close() + wok_log.error("Cannot upgrade objectstore schema: %s" % e.args[0]) + return False + return True -- 2.5.0

4 3

[PATCH] [Kimchi] Use correct gettext package for building
by Lucio Correia 15 Dec '15

15 Dec '15

The correct gettext package needs to be installed in each distro in order autogen does not show the following error messages: warning: macro 'AM_GNU_GETTEXT' not found in library warning: macro 'AM_GNU_GETTEXT_VERSION' not found in library Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- docs/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/README.md b/docs/README.md index bdfbd81..dc58556 100644 --- a/docs/README.md +++ b/docs/README.md @@ -48,7 +48,7 @@ Install Dependencies **For fedora and RHEL:** - $ sudo yum install wok libvirt-python libvirt \ + $ sudo yum install wok libvirt-python libvirt gettext-devel \ libvirt-daemon-config-network python-imaging \ qemu-kvm python-ethtool sos python-ipaddr \ nfs-utils iscsi-initiator-utils pyparted \ @@ -81,14 +81,14 @@ channel at RHN Classic or Red Hat Satellite. qemu-kvm python-parted python-ethtool sosreport \ xsltproc python-ipaddr python-lxml open-iscsi \ python-guestfs libguestfs-tools spice-html5 \ - python-magic python-paramiko \ + python-magic python-paramiko gettext \ # These dependencies are only required if you want to run the tests: $ sudo apt-get install pep8 pyflakes python-requests python-mock **For openSUSE:** - $ sudo zypper install wok libvirt-python libvirt \ + $ sudo zypper install wok libvirt-python libvirt gettext-tools \ libvirt-daemon-config-network python-imaging \ kvm python-ethtool python-ipaddr nfs-client \ open-iscsi python-parted python-libguestfs \ -- 1.9.1

1 0

[PATCH] [Kimchi 0/9] Kimchi bugfixes
by sguimaraes943＠gmail.com 15 Dec '15

15 Dec '15

From: samhenri <samuel.guimaraes(a)eldorado.org.br> This patch-set fixes some issues that were reported on Github and adds some enhancements. Before applying this patch, make sure you have "Media Query v2 and Bug Fixes" for Wok applied in your branch. samhenri (9): Removed theme-default.min.css reference Issue 770: New template is not shown right after creation Issue 772: Template tab and Template edit window - Some problems Issue 773: Snapshot error message showed behind edit window Issue 783: Error message hidden by the modal window Issue 776: Adding filter on Templates screen New i18n strings in PT-BR Issue 777: Network tab not being updated after exclude a network Issue 784: Display a 'loading gif' when waiting for data po/pt_BR.po | 60 ++++- ui/js/src/kimchi.api.js | 38 +-- ui/js/src/kimchi.guest_edit_main.js | 75 +++--- ui/js/src/kimchi.guest_storage_add.main.js | 38 +-- ui/js/src/kimchi.network.js | 7 +- ui/js/src/kimchi.storage_main.js | 34 +-- ui/js/src/kimchi.storagepool_add_main.js | 43 ++-- ui/js/src/kimchi.storagepool_add_volume_main.js | 27 ++- ui/js/src/kimchi.template_add_main.js | 305 +++++++++++++----------- ui/js/src/kimchi.template_edit_main.js | 17 +- ui/js/src/kimchi.template_main.js | 50 ++-- ui/pages/guest-storage-add.html.tmpl | 1 + ui/pages/i18n.json.tmpl | 6 + ui/pages/storagepool-add-volume.html.tmpl | 1 + ui/pages/storagepool-add.html.tmpl | 3 +- ui/pages/tabs/network.html.tmpl | 19 +- ui/pages/tabs/storage.html.tmpl | 14 +- ui/pages/tabs/templates.html.tmpl | 89 ++++--- ui/pages/template-add.html.tmpl | 68 ++---- 19 files changed, 497 insertions(+), 398 deletions(-) -- 1.9.3

2 10

[PATCH 0/2] [Wok] Media Queries and wok.message
by sguimaraes943＠gmail.com 15 Dec '15

15 Dec '15

From: samhenri <samuel.guimaraes(a)eldorado.org.br> This patch corrects some screen width problems with small screens in desktos / laptops. Please note that these changes were made without any mockup for different sets of screen resolutions other than the design spec. This doesn't include mobile support yet. The second patch fixes the wok.message.js delay and fade-out. It was too fast for long messages. Delay was changed to 10s and fade-out to 4s. Regards, Samuel samhenri (2): [Wok] Adding Media Queries for different screen sizes [Wok] Fixed wok.message.js fade-out timing ui/css/src/bootstrap.custom.scss | 1 - ui/css/src/modules/_guests.scss | 52 ++++++++-- ui/css/src/modules/_menu-flat.scss | 3 +- ui/css/src/modules/_navbar-flat.scss | 106 ++++++++------------- ui/css/src/modules/_network.scss | 6 +- ui/css/src/modules/_toolbar.scss | 25 ++++- ui/css/src/modules/_wok-variables.scss | 15 +-- .../vendor/bootstrap-sass/bootstrap/_alerts.scss | 17 +++- .../src/vendor/bootstrap-sass/bootstrap/_grid.scss | 2 + ui/css/src/wok.scss | 83 ++++++++-------- ui/js/src/wok.message.js | 4 +- 11 files changed, 180 insertions(+), 134 deletions(-) -- 1.9.3

2 4

[PATCH] [Wok 00/10] Media Queries v2 and Bug fixes
by sguimaraes943＠gmail.com 15 Dec '15

15 Dec '15

From: samhenri <samuel.guimaraes(a)eldorado.org.br> The following patchesfixes some minor issues with CSS and JS, including CSS Media Queries support on desktops for Wok and Kimchi (supported screen width: 1024, 1280, 1366, 1440, 1680 and 1920). Bugfixes: *wok.message.js - Increased fade-out timing *Moved Loader classes to a new SCSS module and created classes to support loading screen (Kimchi Issue: #784) *Edit Guests - Snapshots grid when generating a new Snapshot *Moved wok-checkbox and wok-radio to a new SCSS module *Added List.JS library to enable Filtering and Sorting in Templates and Guests *Updated Templates styles to support Filters *Removed unused SCSS files *Prevented all Bootstrap modal windows from closing when clicking on the backdrop (Ginger Issue: #59) *About Window (Wok Issue: #5 / Kimchi Issue: #706) samhenri (10): Adding Media Queries for different screen sizes Fixed wok.message.js fade-out timing 'Loading' mask and backdrop SCSS Fix Snapshots grid in Edit Guests modal Moved .wok-radio and .wok-checkbox to a new SCSS module Adding List.js lib for Filters in Templates and Guests Updated Templates styles to support filter Removed unused files Prevented modals from closing when clicking on the backdrop About Window configure.ac | 1 + ui/css/src/bootstrap.custom.scss | 1 - ui/css/src/modules/_about.scss | 32 +++++ ui/css/src/modules/_datagrid.scss | 9 +- ui/css/src/modules/_edit-guests.scss | 5 + ui/css/src/modules/_guests.scss | 67 ++++++++--- ui/css/src/modules/_jqueryui.scss | 0 ui/css/src/modules/_loaders.scss | 55 +++++++++ ui/css/src/modules/_menu-flat.scss | 3 +- ui/css/src/modules/_navbar-flat.scss | 132 ++++++++++----------- ui/css/src/modules/_network.scss | 6 +- ui/css/src/modules/_templates.scss | 39 +++--- ui/css/src/modules/_toolbar.scss | 25 +++- ui/css/src/modules/_wok-forms.scss | 55 +++++++++ ui/css/src/modules/_wok-grid.scss | 31 ----- ui/css/src/modules/_wok-variables.scss | 17 +-- .../vendor/bootstrap-sass/bootstrap/_alerts.scss | 17 ++- .../src/vendor/bootstrap-sass/bootstrap/_grid.scss | 2 + ui/css/src/wok.scss | 101 +++------------- ui/js/src/wok.main.js | 5 +- ui/js/src/wok.message.js | 6 +- ui/js/src/wok.window.js | 5 + ui/libs/Makefile.am | 2 +- ui/libs/list-js/LICENSE | 21 ++++ ui/libs/list-js/Makefile.am | 22 ++++ ui/libs/list-js/list.min.js | 1 + ui/pages/wok-ui.html.tmpl | 41 ++++--- 27 files changed, 433 insertions(+), 268 deletions(-) create mode 100644 ui/css/src/modules/_about.scss delete mode 100644 ui/css/src/modules/_jqueryui.scss create mode 100644 ui/css/src/modules/_loaders.scss create mode 100644 ui/css/src/modules/_wok-forms.scss create mode 100644 ui/libs/list-js/LICENSE create mode 100644 ui/libs/list-js/Makefile.am create mode 100644 ui/libs/list-js/list.min.js -- 1.9.3

2 11

[PATCH] [Wok 0/3] Multiple fixes
by Aline Manera 15 Dec '15

15 Dec '15

Aline Manera (3): Bug fix: Make /tabs URI generic to be used by any plugin Bug fix: Respect user request while building the UI Fix bug #6: Proper load help page src/wok/root.py | 15 ++-- ui/js/src/wok.main.js | 177 +++++++++++++++++++++++----------------------- ui/pages/wok-ui.html.tmpl | 6 +- 3 files changed, 101 insertions(+), 97 deletions(-) -- 2.5.0

4 9

[PATCH] [Wok V2] Update README to use --remote to update submodules
by Aline Manera 15 Dec '15

15 Dec '15

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- docs/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/README.md b/docs/README.md index aa982f5..1965960 100644 --- a/docs/README.md +++ b/docs/README.md @@ -168,19 +168,19 @@ new plugins. Also, by default, Wok is linked to Kimchi (Virtualization To clone Kimchi source code, execute: $ cd src/wok/plugins/kimchi - $ git submodule init - $ git submodule update + $ git submodule update --init --remote To clone Ginger source code, execute: $ cd src/wok/plugins/ginger - $ git submodule init - $ git submodule update + $ git submodule update --init --remote To automatically clone all plugins linked with Wok, use the following git command when cloning Wok project: $ git clone --recursive https://github.com/kimchi-project/wok.git + $ cd wok + $ git submodule update --remote Participating -- 2.5.0

2 2

[PATCH] [Kimchi 0/2] Docs update
by Aline Manera 15 Dec '15

15 Dec '15

Aline Manera (2): Remove wok dependency from README Update openSUSE version in the README file docs/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.5.0

2 7

[PATCH][Kimchi] Fix disk creation when pool is netfs
by Ramon Medeiros 15 Dec '15

15 Dec '15

Instead of add io=native for all disks, add only if disk is in a netfs pool. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- vmtemplate.py | 2 +- xmlutils/disk.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/vmtemplate.py b/vmtemplate.py index b90f221..1162cf2 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -213,7 +213,7 @@ class VMTemplate(object): img = "%s-%s.img" % (vm_uuid, params['index']) storage_path = self._get_storage_path(disk['pool']['name']) params['path'] = os.path.join(storage_path, img) - + params['pool'] = disk['pool'] disks_xml += get_disk_xml(params)[1] return unicode(disks_xml, 'utf-8') diff --git a/xmlutils/disk.py b/xmlutils/disk.py index 2ed2ef4..7fed9cf 100644 --- a/xmlutils/disk.py +++ b/xmlutils/disk.py @@ -53,7 +53,9 @@ def get_disk_xml(params): driver = E.driver(name='qemu', type=params['format']) if params['type'] != 'cdrom': driver.set('cache', 'none') - driver.set("io", "native") + + if params['pool']['type'] == "netfs": + driver.set("io", "native") disk.append(driver) -- 2.1.0

4 4

[PATCH] [Kimchi] Add ginger-base as Kimchi dependency
by Aline Manera 15 Dec '15

15 Dec '15

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- contrib/DEBIAN/control.in | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + 3 files changed, 3 insertions(+) diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index ba528a1..40e7727 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -4,6 +4,7 @@ Section: base Priority: optional Architecture: all Depends: wok, + ginger-base, python-imaging, python-configobj, websockify, diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index d1e0046..ebf102c 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -8,6 +8,7 @@ Group: System Environment/Base License: LGPL/ASL2 Source0: %{name}-%{version}.tar.gz Requires: wok +Requires: ginger-base Requires: qemu-kvm Requires: gettext Requires: libvirt diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index 640ade9..3cec7f4 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -8,6 +8,7 @@ Group: System Environment/Base License: LGPL/ASL2 Source0: %{name}-%{version}.tar.gz Requires: wok +Requires: ginger-base Requires: kvm Requires: gettext-tools Requires: libvirt -- 2.5.0

2 2