- Kimchi-devel - oVirt List Archives

[PATCH] [Kimchi] Added support for CentOS 7 iso images
by rkoch＠rk-it.at 16 Mar '16

16 Mar '16

From: Rene Koch <rkoch(a)rk-it.at> CentOS 7 x86_64 minimal ISO is labled "CentOS 7 x86_64", so operating system is not recognized by Kimchi. This patch adds support for CentOS 7 minimal ISO. Rene Koch (1): Issue #861: CentOS 7 image not recognized isoinfo.py | 2 ++ 1 file changed, 2 insertions(+) -- 2.5.0

2 2

[PATCH][Kimchi] Remove useless function 'validate_repo_url' from Kimchi
by Rodrigo Trujillo 16 Mar '16

16 Mar '16

This function was moved to GingerBase. It is not used in any part of Kimchi. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- utils.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/utils.py b/utils.py index 87d7d9b..eae16d5 100644 --- a/utils.py +++ b/utils.py @@ -87,22 +87,6 @@ def check_url_path(path, redirected=0): return True -def validate_repo_url(url): - url_parts = url.split('://') # [0] = prefix, [1] = rest of URL - - if url_parts[0] == '': - raise InvalidParameter("KCHREPOS0002E") - - if url_parts[0] in ['http', 'https', 'ftp']: - if not check_url_path(url): - raise InvalidParameter("WOKUTILS0001E", {'url': url}) - elif url_parts[0] == 'file': - if not os.path.exists(url_parts[1]): - raise InvalidParameter("WOKUTILS0001E", {'url': url}) - else: - raise InvalidParameter("KCHREPOS0002E") - - def upgrade_objectstore_data(item, old_uri, new_uri): """ Upgrade the value of a given JSON's item of all Template and VM entries -- 2.1.0

3 2

[PATCH v2] [Kimchi] Fixed "Add a Storage Device to VM" modal behavior
by Socorro Stoppler 16 Mar '16

16 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> v2: Change default to qcow2 format Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> Signed-off-by: Samuel Guimarães <sguimaraes943(a)gmail.com> --- ui/js/src/kimchi.guest_storage_add.main.js | 41 ++++++++++++++++-------------- ui/pages/guest-storage-add.html.tmpl | 2 +- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/ui/js/src/kimchi.guest_storage_add.main.js index 3f416e7..fb7fed3 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -83,12 +83,13 @@ kimchi.guest_storage_add_main = function() { } formatTextbox.empty(); formatTextbox.append(selectFormatHTML); - $(formatTextbox).change(); + formatTextbox.val("qcow2"); + $(formatTextbox).trigger('change'); formatTextbox.selectpicker(); $('.selectpicker').selectpicker('refresh'); }; - typeTextbox.change(function() { + typeTextbox.on('change',function() { var pathObject = {'cdrom': ".path-section", 'disk': '.volume-section'}; selectType = $(this).val(); $.each(pathObject, function(type, value) { @@ -105,13 +106,13 @@ kimchi.guest_storage_add_main = function() { if ($('#new-disk').checked) { $('#existing-disk-box').addClass('hidden'); $(newPoolTextbox).val('default'); - $(newPoolTextbox).change(); + $(newPoolTextbox).trigger('change'); $(formatTextbox).val('qcow2'); - $(formatTextbox).change(); + $(formatTextbox).trigger('change'); } else if ($('#existing-disk').checked) { $('#new-disk-box').addClass('hidden'); $(poolTextbox).val('default'); - $(poolTextbox).change(); + $(poolTextbox).trigger('change'); } else { //Goes here the first time since radiobuttons are undefined if (rbExisting === 'true') { @@ -119,7 +120,7 @@ kimchi.guest_storage_add_main = function() { } else { $('#existing-disk-box').addClass('hidden'); $(formatTextbox).val('qcow2'); - $(formatTextbox).change(); + $(formatTextbox).trigger('change'); } } } else { @@ -159,13 +160,13 @@ kimchi.guest_storage_add_main = function() { if (radioButton === 'existing') { poolTextbox.empty(); poolTextbox.append(selectStoragePoolHTML); - $(poolTextbox).change(); + $(poolTextbox).trigger('change'); poolTextbox.selectpicker(); $('.selectpicker').selectpicker('refresh'); } else if (radioButton === 'new') { //new disk newPoolTextbox.empty(); newPoolTextbox.append(selectStoragePoolHTML); - $(newPoolTextbox).val("qcow2"); + $(newPoolTextbox).val("ISO"); newPoolTextbox.selectpicker(); getFormatList(); } @@ -176,7 +177,7 @@ kimchi.guest_storage_add_main = function() { //First time retrieving list of Storage Pools - defaulting to new disk getStoragePools('new'); - poolTextbox.change(function() { + poolTextbox.on('change',function() { var options = []; selectStorageVolHTML = ''; volTextbox.empty(); @@ -198,7 +199,7 @@ kimchi.guest_storage_add_main = function() { } volTextbox.append(selectStorageVolHTML); $(volTextbox).val(options[0].value); - $(volTextbox).change(); + $(volTextbox).trigger('change'); $(volTextbox).prop('disabled',false); }else { $(volTextbox).prop('disabled',true); @@ -213,7 +214,7 @@ kimchi.guest_storage_add_main = function() { }, null, false); }); - typeTextbox.change(function() { + typeTextbox.on('change',function() { var pathObject = {'cdrom': ".path-section", 'disk': '.volume-section'}; var selectType = $(this).val(); $.each(pathObject, function(type, value) { @@ -226,7 +227,7 @@ kimchi.guest_storage_add_main = function() { }); var currentPage = 'new-disk-box'; - $('#existing-disk').change(function() { + $('#existing-disk').on('change',function() { if (this.checked) { rbExisting = 'true'; if (currentPage === 'new-disk-box') { @@ -246,10 +247,10 @@ kimchi.guest_storage_add_main = function() { } }); - $('#new-disk').change(function() { + $('#new-disk').on('change',function() { if (this.checked) { $(formatTextbox).val("qcow2"); - $(formatTextbox).change(); + $(formatTextbox).trigger('change'); rbExisting = 'false'; if (currentPage === 'existing-disk-box') { kimchi.switchPage(currentPage, 'new-disk-box', 'right'); @@ -268,19 +269,21 @@ kimchi.guest_storage_add_main = function() { } }); + var selectType = $(typeTextbox).val(); if (kimchi.thisVMState === 'running') { - types =typesRunning; - $(typeTextbox).val('disk'); - typeTextbox.change(); - poolTextbox.change(); + types = typesRunning; } - var selectType = $(typeTextbox).val(); for (var i = 0; i < types.length; i++) { selectStorageTypeHTML += '<option value="'+ types[i].value + '">' + types[i].label + '</option>'; } typeTextbox.append(selectStorageTypeHTML); typeTextbox.find('option:first').attr('selected','selected'); typeTextbox.selectpicker(); + if (kimchi.thisVMState === 'running') { + $(typeTextbox).val('disk'); + typeTextbox.trigger('change'); + poolTextbox.trigger('change'); + } var validateCDROM = function(settings) { if (/^((https|http|ftp|ftps|tftp|\/).*)+$/.test(settings['path'])){ diff --git a/ui/pages/guest-storage-add.html.tmpl b/ui/pages/guest-storage-add.html.tmpl index 18da825..afc72c8 100644 --- a/ui/pages/guest-storage-add.html.tmpl +++ b/ui/pages/guest-storage-add.html.tmpl @@ -39,7 +39,7 @@ <label>$_("Device Type")</label> <select id="guest-storage-type" class="selectpicker col-md-12 col-lg-12"> </select> - <p class="help-block"><i class="fa fa-info-circle"></i> $_("The device type. Currently, \"cdrom\" and \"disk\" are supported.")</p> + <p class="help-block"><i class="fa fa-info-circle"></i> $_("The device type. Currently, \"cdrom\" and \"disk\" are supported. If the guest is running, only \"disk\" is supported.")</p> </div> <div class="volume-section hidden form-group"> <div class="template-modal-container"> -- 1.9.1

3 2

[PATCH v2] [Kimchi] Fixed Memory and Max Memory values when adding a new Guest
by Socorro Stoppler 16 Mar '16

16 Mar '16

v2: Socorro Stoppler (1): Fixed Memory and Max Memory values when adding a new Guest Removed showing of max memory in guest and made guest and templates display the same way for cpu/memory for consistency ui/pages/guest-add.html.tmpl | 10 +++++----- ui/pages/tabs/templates.html.tmpl | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) -- 1.9.1 v1: Samuel Guimarães (1): Fixed Memory and Max Memory values when adding a new Guest ui/pages/guest-add.html.tmpl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 1.9.3

4 4

[PATCH v3] [Wok] Fixed wok logos in small screen resolutions
by sguimaraes943＠gmail.com 16 Mar '16

16 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> v3 - Removed wrong selector change in bootstrap-select files Samuel Guimarães (1): Fixed wok logos in small screen resolutions ui/css/src/modules/_login.scss | 9 ++++----- ui/css/wok.css | 11 +++++------ 2 files changed, 9 insertions(+), 11 deletions(-) -- 1.9.3

2 2

[PATCH][Wok] Move function 'get_next_clone_name' from Wok
by Rodrigo Trujillo 16 Mar '16

16 Mar '16

This function is not related to any Wok feature or resource. So moving it to Kimchi. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok/utils.py | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/src/wok/utils.py b/src/wok/utils.py index 7e9a928..175cf25 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -391,47 +391,6 @@ def remove_old_files(globexpr, hours): wok_log.error(str(e)) -def get_next_clone_name(all_names, basename, name_suffix=''): - """Find the next available name for a cloned resource. - - If any resource named "<basename>-clone-<number><name_suffix>" is found - in "all_names", use the maximum "number" + 1; else, use 1. - - Arguments: - all_names -- All existing names for the resource type. This list will - be used to make sure the new name won't conflict with - existing names. - basename -- The name of the original resource. - name_suffix -- The resource name suffix (optional). This parameter - exist so that a resource named "foo.img" gets the name - "foo-clone-1.img" instead of "foo.img-clone-1". If this parameter - is used, the suffix should not be present in "basename". - - Return: - A UTF-8 string in the format "<basename>-clone-<number><name_suffix>". - """ - re_group_num = 'num' - - re_expr = u'%s-clone-(?P<%s>\d+)' % (basename, re_group_num) - if name_suffix != '': - re_expr = u'%s%s' % (re_expr, name_suffix) - - max_num = 0 - re_compiled = re.compile(re_expr) - - for n in all_names: - match = re_compiled.match(n) - if match is not None: - max_num = max(max_num, int(match.group(re_group_num))) - - # increments the maximum "clone number" found - new_name = u'%s-clone-%d' % (basename, max_num + 1) - if name_suffix != '': - new_name = new_name + name_suffix - - return new_name - - def get_unique_file_name(all_names, name): """Find the next available, unique name for a file. -- 2.1.0

3 2

[PATCH v3][Kimchi 0/3] Add new function to Kimchi and fix multiple clones
by Rodrigo Trujillo 16 Mar '16

16 Mar '16

v3: - Add default value "1" (requested in review) v2: This is the v2 of patchset to fix/provide support to clone a guest multiple times. This patch: - Creates a new function, moved from Wok to name clones; - Use timestamp parameter of the function to avoid clone problems; - Fixes backend imports; - Adds UI. Rodrigo Trujillo (3): Add function 'get_next_clone_name' Fix issue when clone a vm multiple times Add UI support to clone a guest multiple times mockmodel.py | 4 +-- model/storagevolumes.py | 4 +-- model/vms.py | 5 ++-- ui/js/src/kimchi.guest_main.js | 59 ++++++++++++++++++++++++++++++++---------- ui/pages/guest-clone.html.tmpl | 47 +++++++++++++++++++++++++++++++++ ui/pages/i18n.json.tmpl | 3 ++- utils.py | 50 +++++++++++++++++++++++++++++++++++ 7 files changed, 152 insertions(+), 20 deletions(-) create mode 100644 ui/pages/guest-clone.html.tmpl -- 2.1.0

2 4

[PATCH][Kimchi] Fix issue:#838 - Set qemu version to 2.1
by Rodrigo Trujillo 15 Mar '16

15 Mar '16

Qemu only supports memory hotplug after 2.1 version, see: http://wiki.qemu.org/ChangeLog/2.1#x86 In order to avoid errors starting guests, it is better to set the minimal version required (2.1) in packages specs. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- contrib/DEBIAN/control.in | 2 +- contrib/kimchi.spec.fedora.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index b6acdaf..c46b5b3 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -14,7 +14,7 @@ Depends: wok, gettext, libvirt-bin, nfs-common, - qemu-kvm, + qemu-kvm (>= 2.1), python-parted, python-psutil (>= 0.6.0), python-ethtool, diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index c2111f9..1bdf38c 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -9,7 +9,7 @@ License: LGPL/ASL2 Source0: %{name}-%{version}.tar.gz Requires: wok Requires: ginger-base -Requires: qemu-kvm +Requires: qemu-kvm >= 2.1 Requires: gettext Requires: libvirt Requires: libvirt-python -- 2.1.0

3 4

[PATCH v2][Kimchi 0/3] Add new function to Kimchi and fix multiple clones
by Rodrigo Trujillo 15 Mar '16

15 Mar '16

This is the v2 of patchset to fix/provide support to clone a guest multiple times. This patch: - Creates a new function, moved from Wok to name clones; - Use timestamp parameter of the function to avoid clone problems; - Fixes backend imports; - Adds UI. Rodrigo Trujillo (3): Add function 'get_next_clone_name' Fix issue when clone a vm multiple times Add UI support to clone a guest multiple times mockmodel.py | 4 +-- model/storagevolumes.py | 4 +-- model/vms.py | 5 ++-- ui/js/src/kimchi.guest_main.js | 58 ++++++++++++++++++++++++++++++++---------- ui/pages/guest-clone.html.tmpl | 47 ++++++++++++++++++++++++++++++++++ ui/pages/i18n.json.tmpl | 3 ++- utils.py | 50 ++++++++++++++++++++++++++++++++++++ 7 files changed, 151 insertions(+), 20 deletions(-) create mode 100644 ui/pages/guest-clone.html.tmpl -- 2.1.0

3 6

[PATCH v2] [Wok] Fixed wok logos in small screen resolutions
by sguimaraes943＠gmail.com 15 Mar '16

15 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Fixed image alignment Samuel Guimarães (1): Fixed wok logos in small screen resolutions ui/css/bootstrap.custom.css | 6 +++--- ui/css/src/modules/_login.scss | 5 ++--- ui/css/wok.css | 7 +++---- 3 files changed, 8 insertions(+), 10 deletions(-) -- 1.9.3

2 2