- Kimchi-devel - oVirt List Archives

[PATCHv3 0/2] nfs prevalidation
by lvroyce＠linux.vnet.ibm.com 15 Jan '14

15 Jan '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Add nfs prevalidation to prevent mount hang for long time for unreachable export path. Royce Lv (2): utils: Add nfs prevalication Integrate nfs path check before create nfs pool src/kimchi/model.py | 37 ++++++++++++++++++++++++++++++++++--- src/kimchi/utils.py | 8 ++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) -- 1.8.1.2

3 5

[PATCH V5 0/5] Add spice backend support for kimchi
by apporc 15 Jan '14

15 Jan '14

v5-v4: 1. Rebase to upstream 2. Change the code to coordinate with new websockify mechanism 3. Add test code for ipv6 (Thanks Aline) v4-v3: 1. Remove not used module "copy" in vmtemplate.py(Thanks Aline) 2. Fix alignment problem in model.py(Thanks Aline) 3. Use type property of jsonschema to validate both ipv4 and ipv6(Thanks Aline) REF: http://stackoverflow.com/questions/14550235/json-schema-away-to-specify-an-… 4. Use "$ref" to simply API.json, remove dumplicate content(Thanks Rodrigo) v3-v2: 1. Rebase to upstream 2. Improve/simplify some code according to reviewers' advice(Thanks Royce, Markwu and Aline). 3. Reimplement parameters validation using jsonschema. 4. Remove unnecessary test code in model.py. 5. Split patch to several smaller commits according to logic(Thanks Royce). v2-v1: Rebased to upstream and resend v1: Add spice backend support for kimchi apporc (5): Add spice backend support for kimchi Validate graphics parameters input by users Update mockmodel for spice support Update test case for graphics support Add graphics parameters description in API.md docs/API.md | 43 ++++++++++++++- src/kimchi/API.json | 30 +++++++++-- src/kimchi/control/templates.py | 6 ++- src/kimchi/control/utils.py | 4 +- src/kimchi/control/vms.py | 4 +- src/kimchi/mockmodel.py | 13 +++-- src/kimchi/model.py | 34 +++++++----- src/kimchi/osinfo.py | 7 +-- src/kimchi/vmtemplate.py | 31 ++++++++++- tests/test_mockmodel.py | 2 + tests/test_model.py | 27 +++++++++- tests/test_rest.py | 111 +++++++++++++++++++++++++++++++++++++-- tests/test_vmtemplate.py | 40 ++++++++++++-- 13 files changed, 313 insertions(+), 39 deletions(-) -- 1.7.9.5

6 22

[PATCH V1 0/2] Debugreport tool test enhancement
by Shu Ming 15 Jan '14

15 Jan '14

1)We need a way to tune the debugreport timeout value 2)Skip the test if there is not debugreport tool Shu Ming (2): Skip the debug report test if there is no tool avaible Add a timeout tunning environment variable for debug report test tests/test_model.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) -- 1.8.1.4

3 5

[PATCH] Add support to RHEL 7
by abotega＠linux.vnet.ibm.com 15 Jan '14

15 Jan '14

From: Adriano Botega <abotega(a)linux.vnet.ibm.com> RHEL 7 is the next Red Hat Enterprise distro version and because of a difference in the distro name in Volume Descriptor Table on it's ISO file, Kimchi is not recognizing as a RHEL distro. This patch adds the correct regex to add support to RHEL 7 Signed-off-by: Adriano Botega <abotega(a)linux.vnet.ibm.com> --- src/kimchi/isoinfo.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py index 7e6d733..06bc6d8 100644 --- a/src/kimchi/isoinfo.py +++ b/src/kimchi/isoinfo.py @@ -111,6 +111,7 @@ iso_dir = [ 'openSUSE-DVD-i586-Build0167|openSUSE-DVD-x86_640167'), ('rhel', '4.8', 'RHEL/4-U8'), ('rhel', lambda m: m.group(1), 'RHEL[_/](\d+\.\d+)'), + ('rhel', lambda m: m.group(1), 'RHEL[-](\d+\.\d+)'), ('debian', lambda m: m.group(1), 'Debian (\d+\.\d+)'), ('ubuntu', lambda m: m.group(2), '[Uu]buntu(-Server)? (\d+\.\d+)'), ('fedora', lambda m: m.group(1), 'Fedora[ -](\d+)'), -- 1.8.4.2

2 1

[PATCH] Add a control.vm module
by shaohef＠linux.vnet.ibm.com 15 Jan '14

15 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> All vm devices should be in this module Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- Makefile.am | 1 + configure.ac | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + src/kimchi/control/Makefile.am | 2 ++ src/kimchi/control/vm/Makefile.am | 32 ++++++++++++++++++++++++++++++++ src/kimchi/control/vm/__init__.py | 22 ++++++++++++++++++++++ 7 files changed, 60 insertions(+) create mode 100644 src/kimchi/control/vm/Makefile.am create mode 100644 src/kimchi/control/vm/__init__.py diff --git a/Makefile.am b/Makefile.am index 04ad696..c9a880c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,6 +46,7 @@ PEP8_WHITELIST = \ src/kimchi/cachebust.py \ src/kimchi/config.py.in \ src/kimchi/control/*.py \ + src/kimchi/control/vm/*.py \ src/kimchi/disks.py \ src/kimchi/distroloader.py \ src/kimchi/exception.py \ diff --git a/configure.ac b/configure.ac index e4ccb83..5148f12 100644 --- a/configure.ac +++ b/configure.ac @@ -54,6 +54,7 @@ AC_CONFIG_FILES([ src/distros.d/Makefile src/kimchi/Makefile src/kimchi/control/Makefile + src/kimchi/control/vm/Makefile plugins/Makefile plugins/sample/Makefile plugins/sample/ui/Makefile diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index cc8c298..4fa94d4 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -113,6 +113,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/kimchid %{python_sitelib}/kimchi/*.py* %{python_sitelib}/kimchi/control/*.py* +%{python_sitelib}/kimchi/control/vm/*.py* %{python_sitelib}/kimchi/API.json %{_datadir}/kimchi/doc/API.md %{_datadir}/kimchi/doc/README.md diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index d1aec7b..9f16dfb 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -60,6 +60,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/kimchid %{python_sitelib}/kimchi/*.py* %{python_sitelib}/kimchi/control/*.py* +%{python_sitelib}/kimchi/control/vm/*.py* %{python_sitelib}/kimchi/API.json %{_datadir}/kimchi/doc/API.md %{_datadir}/kimchi/doc/README.md diff --git a/src/kimchi/control/Makefile.am b/src/kimchi/control/Makefile.am index 925c593..42f62c3 100644 --- a/src/kimchi/control/Makefile.am +++ b/src/kimchi/control/Makefile.am @@ -20,6 +20,8 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +SUBDIRS = vm + control_PYTHON = *.py controldir = $(pythondir)/kimchi/control diff --git a/src/kimchi/control/vm/Makefile.am b/src/kimchi/control/vm/Makefile.am new file mode 100644 index 0000000..17340af --- /dev/null +++ b/src/kimchi/control/vm/Makefile.am @@ -0,0 +1,32 @@ +# +# Kimchi +# +# Copyright IBM Corp, 2013 +# +# Authors: +# ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> +# Royce Lv <lvroyce(a)linux.vnet.ibm.com> +# +# 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 + + +vm_PYTHON = \ + __init__.py + + +vmdir = $(pythondir)/kimchi/control/vm + +install-data-local: + $(MKDIR_P) $(DESTDIR)$(vmdir) diff --git a/src/kimchi/control/vm/__init__.py b/src/kimchi/control/vm/__init__.py new file mode 100644 index 0000000..f22e568 --- /dev/null +++ b/src/kimchi/control/vm/__init__.py @@ -0,0 +1,22 @@ +# +# Project Kimchi +# +# Copyright IBM, Corp. 2013 +# +# Authors: +# ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> +# Royce Lv <lvroyce(a)linux.vnet.ibm.com> +# +# 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 -- 1.8.4.2

1 0

[PATCH V2] UI: template supports networks
by Xin Ding 15 Jan '14

15 Jan '14

V1 ->V2 use combo box Add network to edit Template. Signed-off-by: Xin Ding <xinding(a)linux.vnet.ibm.com> --- ui/css/theme-default/template-edit.css | 34 +++++++++++++++++++++++++++++++++- ui/js/src/kimchi.template_edit_main.js | 29 +++++++++++++++++++++++++++++ ui/pages/template-edit.html.tmpl | 21 +++++++++++++++++++-- 3 files changed, 81 insertions(+), 3 deletions(-) diff --git a/ui/css/theme-default/template-edit.css b/ui/css/theme-default/template-edit.css index e61b2fb..ecc9106 100644 --- a/ui/css/theme-default/template-edit.css +++ b/ui/css/theme-default/template-edit.css @@ -20,7 +20,7 @@ */ #template-edit-window { font-size: 13px; - height: 400px; + height: 420px; width: 1000px; } @@ -73,3 +73,35 @@ .hidden-area { display: none; } + +.template-edit-wrapper-controls .select-list-box { + width: 272px; + max-height: 168px; + overflow: auto; + margin-top: 5px; + border: 1px solid #ccc; +} + +.template-edit-wrapper-controls .select-list-box>li>label { + display: block; +} + +.template-edit-wrapper-controls .select-list-box>li>label>input[type="checkbox"] { + display: none; +} + +.template-edit-wrapper-controls .select-list-box>li>label>.item { + display: block; + height: 41px; + line-height: 41px; + padding: 0 20px 0 40px; + border-bottom: 1px solid #ccc; + box-shadow: 0px 1px 1px #fff; + text-shadow: -1px -1px 1px #ddd, 1px 1px 1px #fff; + color: #222; + font-size: 12px; +} + +.template-edit-wrapper-controls .select-list-box>li>label>input[type="checkbox"]:CHECKED+.item { + background: #f8f8f8 url(../images/theme-default/check-green.png) no-repeat 10px center; +} diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index efe4a6f..ad535ee 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -43,6 +43,26 @@ kimchi.template_edit_main = function() { } kimchi.select('template-edit-storagePool-list', options); }); + kimchi.listNetworks(function(result) { + if(result && result.length > 0) { + var html = ''; + var tmpl = $('#tmpl-network').html(); + $.each(result, function(index, network) { + html += kimchi.template(tmpl, network); + }); + $('#template-edit-network-list').html(html).show(); + if(template.networks && template.networks.length > 0) { + $('input[name="networks"]', templateEditForm).each(function(index, element) { + var value = $(element).val(); + if(template.networks.indexOf(value) >= 0) { + $(element).prop('checked', true); + } + }); + } + } else { + $('#template-edit-network-list').hide(); + } + }); }); $('#tmpl-edit-button-cancel').on('click', function() { @@ -64,6 +84,15 @@ kimchi.template_edit_main = function() { }); data['memory'] = Number(data['memory']); data['cpus'] = Number(data['cpus']); + var networks = templateEditForm.serializeObject().networks; + if (networks instanceof Array) { + data.networks = networks; + } else if (networks != null) { + data.networks = [networks]; + } else { + data.networks = []; + } + kimchi.updateTemplate($('#template-name').val(), data, function() { kimchi.doListTemplates(); kimchi.window.close(); diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index fe7314d..f7921d6 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -75,8 +75,6 @@ <input id="template-edit-memory-textbox" name="memory" type="text" /> </div> </div> - </fieldset> - <fieldset class="template-edit-fieldset"> <div> <div class="template-edit-wrapper-label"> <label>$_("Disk (GB)")</label> @@ -85,6 +83,8 @@ <input id="template-edit-version-textbox" name="disks" type="text" /> </div> </div> + </fieldset> + <fieldset class="template-edit-fieldset"> <div> <div class="template-edit-wrapper-label"> <label>$_("CDROM")</label> @@ -108,6 +108,23 @@ </div> </div> </div> + <div> + <div class="template-edit-wrapper-label"> + <label>$_("Network")</label> + </div> + <div class="template-edit-wrapper-controls"> + <ul class="select-list-box" id="template-edit-network-list"> + </ul> + <script id="tmpl-network" type="text/html"> + <li> + <label> + <input name="networks" type="checkbox" value="{name}" /> + <span class="item">{name}</span> + </label> + </li> + </script> + </div> + </div> </fieldset> </form> </div> -- 1.8.3.2

3 5

[PATCH] Deep scan: listing 'unknown' bootable isos after deep scan
by Daniel Barboza 15 Jan '14

15 Jan '14

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> When the iso distro and version can't be recognized, but the iso is bootable, we shoud add it to the iso list after the deep scan. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- src/kimchi/isoinfo.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py index 7e6d733..64c1bb2 100644 --- a/src/kimchi/isoinfo.py +++ b/src/kimchi/isoinfo.py @@ -285,9 +285,11 @@ def probe_iso(status_helper, params): ignore_list = params.get('ignore_list', []) def update_result(iso, ret): + path = os.path.abspath(iso) if os.path.isfile(iso) else iso if ret != ('unknown', 'unknown'): - path = os.path.abspath(iso) if os.path.isfile(iso) else iso updater({'path': path, 'distro': ret[0], 'version': ret[1]}) + else: + updater({'path': path, 'distro': 'unknown', 'version': 'unknown'}) if os.path.isdir(loc): for root, dirs, files in os.walk(loc): -- 1.8.3.1

6 6

[PATCH v2] Fix break of deep scanning
by Daniel Barboza 15 Jan '14

15 Jan '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Commit 265de8d7 forgot to add type 'kimchi-iso' to storage pool type, which prevents deep scannning to execute. Add it to API.json to fix this break. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- src/kimchi/API.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 19b1c51..3281d2e 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -16,7 +16,7 @@ "type": { "description": "The type of the defined Storage Pool", "type": "string", - "pattern": "^dir|netfs|logical$", + "pattern": "^dir|netfs|logical|kimchi-iso$", "required": true }, "path": { -- 1.8.3.1

7 6

[PATCH v2] Deep scan: listing 'unknown' bootable isos after deep scan
by Daniel Barboza 15 Jan '14

15 Jan '14

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> When the iso distro and version can't be recognized, but the iso is bootable, we shoud add it to the iso list after the deep scan. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- src/kimchi/isoinfo.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py index 7e6d733..417aae0 100644 --- a/src/kimchi/isoinfo.py +++ b/src/kimchi/isoinfo.py @@ -285,9 +285,8 @@ def probe_iso(status_helper, params): ignore_list = params.get('ignore_list', []) def update_result(iso, ret): - if ret != ('unknown', 'unknown'): - path = os.path.abspath(iso) if os.path.isfile(iso) else iso - updater({'path': path, 'distro': ret[0], 'version': ret[1]}) + path = os.path.abspath(iso) if os.path.isfile(iso) else iso + updater({'path': path, 'distro': ret[0], 'version': ret[1]}) if os.path.isdir(loc): for root, dirs, files in os.walk(loc): -- 1.8.3.1

1 0

[PATCH] UI bug fix: Set vlan_id value only if 'Enable VLAN' is checked
by Aline Manera 15 Jan '14

15 Jan '14

From: Aline Manera <alinefm(a)br.ibm.com> Commit 2f54aaba added a checkbox to provide choice of enabling vlan tagging while creating a bridged network, but it doesn't check the checkbox before setting the vlan_id to send server request. Because that when the user tries to create a bridged network without enabling VLAN the following error is raised: Invalid parameter: 'None is not of type u'integer'' Fix it by setting vlan_id only if the vlan checkbox is checked. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- ui/js/src/kimchi.network.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 65479b2..9bd0cb5 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -136,12 +136,14 @@ kimchi.initNetworkCreation = function() { var data = { name : network.name, connection: network.type, - vlan_id: network.vlan_id, }; if (network.type === kimchi.NETWORK_TYPE_BRIDGE) { data.connection = "bridge"; data.interface = network.interface; - data.vlan_id = network.vlan_id; + if ($("#enableVlan").prop("checked")) { + alert('está checked') + data.vlan_id = network.vlan_id; + } } kimchi.createNetwork(data, function(result) { network.state = result.state === "active" ? "up" : "down"; -- 1.7.10.4

4 4