- Kimchi-devel - oVirt List Archives

[PATCH v2 1/3] Generate libvirt's interface XML definition for vlan tagged bridge
by Mark Wu 07 Jan '14

07 Jan '14

To support vlan tagged virtual network, kimchi needs create the underlying vlan and bridge interface. Libvirt's interface driver can do it with a given XML definition. This patch targets to generate the XML according to the interface and vlan id. Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- src/kimchi/networkxml.py | 17 +++++++++++++++++ tests/test_networkxml.py | 21 ++++++++++++++++++++- tests/utils.py | 6 ++++++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/src/kimchi/networkxml.py b/src/kimchi/networkxml.py index 786cb69..61a9ba0 100644 --- a/src/kimchi/networkxml.py +++ b/src/kimchi/networkxml.py @@ -21,6 +21,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import ipaddr +import lxml.etree as ET +from lxml.builder import E # FIXME, do not support ipv6 @@ -109,3 +111,18 @@ def to_network_xml(**kwargs): </network> """ % params return xml + + +def create_vlan_tagged_bridge_xml(bridge, interface, vlan_id): + vlan = E.vlan(E.interface(name=interface)) + vlan.set('tag', vlan_id) + m = E.interface( + E.start(mode='onboot'), + E.bridge( + E.interface( + vlan, + type='vlan', + name='.'.join([interface, vlan_id]))), + type='bridge', + name=bridge) + return ET.tostring(m) diff --git a/tests/test_networkxml.py b/tests/test_networkxml.py index 3073bce..ecc15b0 100644 --- a/tests/test_networkxml.py +++ b/tests/test_networkxml.py @@ -23,8 +23,8 @@ import ipaddr import unittest - import kimchi.networkxml as nxml +import utils from kimchi.xmlutils import xpath_get_text @@ -151,3 +151,22 @@ class NetworkXmlTests(unittest.TestCase): netmask = xpath_get_text(xml, "/network/ip/@netmask")[0] self.assertEquals(netmask, str(ipaddr.IPNetwork(params["net"]).netmask)) + + +class InterfaceXmlTests(unittest.TestCase): + + def test_vlan_tagged_bridge_no_ip(self): + expected_xml = """ + <interface type='bridge' name='br10'> + <start mode='onboot'/> + <bridge> + <interface type='vlan' name='em1.10'> + <vlan tag='10'> + <interface name='em1'/> + </vlan> + </interface> + </bridge> + </interface> + """ + actual_xml = nxml.create_vlan_tagged_bridge_xml('br10', 'em1', '10') + self.assertEquals(actual_xml, utils.normalize_xml(expected_xml)) diff --git a/tests/utils.py b/tests/utils.py index 008f668..79fc2e2 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -32,6 +32,7 @@ import unittest from contextlib import closing +from lxml import etree import kimchi.server @@ -159,3 +160,8 @@ def patch_auth(): import kimchi.auth kimchi.auth.authenticate = _authenticate + + +def normalize_xml(xml_str): + return etree.tostring(etree.fromstring(xml_str, + etree.XMLParser(remove_blank_text=True))) -- 1.8.4.2

3 9

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

06 Jan '14

Add network to edit Template. Signed-off-by: Xin Ding <xinding(a)linux.vnet.ibm.com> --- ui/css/theme-default/template-edit.css | 37 ++++++++++++++++++++++--- ui/js/src/kimchi.template_edit_main.js | 50 ++++++++++++++++++++++++++++++++++ ui/pages/template-edit.html.tmpl | 38 ++++++++++++++++++++++++-- 3 files changed, 119 insertions(+), 6 deletions(-) diff --git a/ui/css/theme-default/template-edit.css b/ui/css/theme-default/template-edit.css index e61b2fb..360395d 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: 460px; width: 1000px; } @@ -59,9 +59,9 @@ width: 250px; } -.template-edit-wrapper-controls > .dropdown { - margin: 5px 0 0 1px; - width: 250px; +.template-edit-wrapper-controls .dropdown { + margin: 5px 0 0 0; + width: 245px; } .template-edit-wrapper-controls input[type="text"][disabled] { @@ -73,3 +73,32 @@ .hidden-area { display: none; } + +.template-edit-wrapper-controls .delete { + display: inline-block; + width: 22px; + height: 22px; + line-height: 20px; + background: #ff0000; + -webkit-border-radius: 15px; + border-radius: 15px; + text-align: center; + color: #fff; + font-weight: bold; + font-size: 24px; + margin-top: 15px; + cursor: pointer; +} + +.template-edit-wrapper-controls .link { + display: inline-block; + font-size: 14px; + height: 40px; + line-height: 40px; + color: #06C; + margin: 0 5px; + font-weight: bold; + text-shadow: -1px -1px 1px #eaeaea, 1px 1px 1px #fff; + cursor: pointer; + text-decoration: underline; +} diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index efe4a6f..94a8154 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -21,6 +21,7 @@ kimchi.template_edit_main = function() { var templateEditForm = $('#form-template-edit'); var origDisks; + var networkIndex = 0; $('#template-name', templateEditForm).val(kimchi.selectedTemplate); kimchi.retrieveTemplate(kimchi.selectedTemplate, function(template) { origDisks = template.disks; @@ -43,6 +44,45 @@ kimchi.template_edit_main = function() { } kimchi.select('template-edit-storagePool-list', options); }); + kimchi.listNetworks(function(result) { + var options = []; + if (result && result.length) { + $.each(result, function(index, network) { + options.push({ + label: network.name, + value: network.name + }); + }); + } + $('#template-edit-network').val(template.networks[0]); + kimchi.select('template-edit-network-list', options); + + var addNetwork = function(value) { + networkIndex++; + var template = $('#tmpl-network').html(); + var html = kimchi.template(template, {index: networkIndex}); + $('#more-network-field').append(html); + if(value) { + $('#template-edit-network' + networkIndex).val(value); + } + kimchi.select('template-edit-network-list' + networkIndex, options); + $('#network-field' + networkIndex + ' .delete').on('click', function() { + $(this).parent().remove(); + }); + }; + var l = template.networks.length; + if(l > 1) { + var i; + for(i=1; i<l; i++) { + addNetwork(template.networks[i]); + } + } + + $('#template-edit-network-add').on('click', function() { + addNetwork('default'); + }); + + }); }); $('#tmpl-edit-button-cancel').on('click', function() { @@ -64,6 +104,16 @@ kimchi.template_edit_main = function() { }); data['memory'] = Number(data['memory']); data['cpus'] = Number(data['cpus']); + + var networks = []; + $('input[name="networks"]', templateEditForm).each(function(index, element) { + var value = $(element).val(); + if(value && networks.indexOf(value) < 0) { + networks.push(value); + } + }); + data.networks = 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..4c6e17e 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,40 @@ </div> </div> </div> + <div> + <div class="template-edit-wrapper-label"> + <label>$_("Network")</label> + </div> + <div class="template-edit-wrapper-controls"> + <div> + <div class="btn dropdown popable"> + <input id="template-edit-network" name="networks" type="hidden" /> + <span class="text" id="template-edit-network-label"></span><span class="arrow"></span> + <div class="popover" style="width: 100%"> + <ul class="select-list" id="template-edit-network-list" data-target="template-edit-network" data-label="template-edit-network-label"> + </ul> + </div> + </div> + </div> + <div id="more-network-field"></div> + <script id="tmpl-network" type="text/html"> + <div class="network-field" id="network-field{index}"> + <div class="btn dropdown popable"> + <input id="template-edit-network{index}" name="networks" type="hidden" /> + <span class="text" id="template-edit-network-label{index}"></span><span class="arrow"></span> + <div class="popover" style="width: 100%"> + <ul class="select-list" id="template-edit-network-list{index}" data-target="template-edit-network{index}" data-label="template-edit-network-label{index}"> + </ul> + </div> + </div> + <a class="delete">-</a> + </div> + </script> + <div> + <a id="template-edit-network-add" class="link">Add one more network</a> + </div> + </div> + </div> </fieldset> </form> </div> -- 1.8.3.2

2 1

[PATCH 0/6 V3] Refactore isoinfo.py
by Aline Manera 06 Jan '14

06 Jan '14

From: Aline Manera <alinefm(a)br.ibm.com> V2 -> V3: - Move check_url_path() to utils.py as suggested by Royce V1 -> V2: - Apply comments made by Ramon and Royce Aline Manera (6): isoinfo: Add default value for ignore_list paramter isoinfo: Use absolute path only for local ISO files Move IsoFormatError() from isoinfo.py to exception.py Move ISO path validation to IsoImage() isoinfo: Move _probe_iso() to IsoImage() pep8 cleanup for isoinfo.py Makefile.am | 1 + src/kimchi/exception.py | 4 ++ src/kimchi/isoinfo.py | 127 +++++++++++++++++++++------------------------- src/kimchi/model.py | 11 ++-- src/kimchi/scan.py | 5 +- src/kimchi/utils.py | 12 +++++ src/kimchi/vmtemplate.py | 8 +-- 7 files changed, 88 insertions(+), 80 deletions(-) -- 1.7.10.4

3 20

[PATCH V3 0/3] network improvment: add vms field
by shaohef＠linux.vnet.ibm.com 06 Jan '14

06 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V2 -> V3 update mockmodel and test case V1 -> V2 set the flags argument of listAllDomains as 0 explicitly. For in some distros: $ pydoc libvirt.virConnect.listAllDomains libvirt.virConnect.listAllDomains = listAllDomains(self, flags) \ unbound libvirt.virConnect method And in other distros: $ pydoc libvirt.virConnect.listAllDomains libvirt.virConnect.listAllDomains = listAllDomains(self, flags=0) \ unbound libvirt.virConnect method ShaoHe Feng (3): network improvment: add vms field network improvment: update mockmodel to support vms field for Network Resource network improvment: update mockmodel to support vms field for Network Resource docs/API.md | 1 + src/kimchi/control/networks.py | 1 + src/kimchi/mockmodel.py | 9 +++++++++ src/kimchi/model.py | 15 +++++++++++++++ tests/test_model.py | 1 + tests/test_rest.py | 3 +++ 6 files changed, 30 insertions(+) -- 1.8.4.2

1 3

[PATCH V2] network improvment: add vms field
by shaohef＠linux.vnet.ibm.com 06 Jan '14

06 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V1 -> V2 set the flags argument of listAllDomains as 0 explicitly. For in some distros: $ pydoc libvirt.virConnect.listAllDomains libvirt.virConnect.listAllDomains = listAllDomains(self, flags) \ unbound libvirt.virConnect method And in other distros: $ pydoc libvirt.virConnect.listAllDomains libvirt.virConnect.listAllDomains = listAllDomains(self, flags=0) \ unbound libvirt.virConnect method ShaoHe Feng (1): network improvment: add vms field docs/API.md | 1 + src/kimchi/control/networks.py | 1 + src/kimchi/model.py | 15 +++++++++++++++ 3 files changed, 17 insertions(+) -- 1.8.4.2

3 3

Fwd: Your message to Kimchi-devel awaits moderator approval
by Shu Ming 06 Jan '14

06 Jan '14

Moderator, Please help on it. -------- ???? -------- Return-Path: <kimchi-devel-bounces(a)ovirt.org> Received: from imap.linux.ibm.com ([unix socket]) by imap.linux.ibm.com (Cyrus v2.3.16-Fedora-RPM-2.3.16-6.el6_2.5) with LMTPA; Mon, 06 Jan 2014 02:05:53 -0500 X-Sieve: CMU Sieve 2.3 Received: from localhost (localhost [127.0.0.1]) by imap.linux.ibm.com (Postfix) with ESMTP id 773A01600003 for <shuming(a)imap.linux.ibm.com>; Mon, 6 Jan 2014 02:05:53 -0500 (EST) X-Virus-Scanned: amavisd-new at linux.ibm.com X-Spam-Flag: NO X-Spam-Score: -1.452 X-Spam-Level: X-Spam-Status: No, score=-1.452 tagged_above=-9999 required=5 tests=[RP_MATCHES_RCVD=-1.452] autolearn=disabled Received: from imap.linux.ibm.com ([127.0.0.1]) by localhost (maier.raleigh.ibm.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id gBohcTbZyrP4 for <shuming(a)imap.linux.ibm.com>; Mon, 6 Jan 2014 02:05:52 -0500 (EST) Received: from smtp.linux.ibm.com (smtp.linux.ibm.com [9.26.4.197]) by imap.linux.ibm.com (Postfix) with ESMTP id 6A4C21600002 for <shuming(a)imap.linux.ibm.com>; Mon, 6 Jan 2014 02:05:52 -0500 (EST) Received: from VMSDVM6.POK.IBM.COM (vmsdvm6.pok.ibm.com [9.57.5.25]) by smtp.linux.ibm.com (Postfix) with SMTP id B43B2C79FE for <shuming(a)linux.ibm.com>; Mon, 6 Jan 2014 02:05:51 -0500 (EST) Received: by VMSDVM6.POK.IBM.COM (IBM VM SMTP Level 620) via spool with SMTP id 1140 ; Mon, 06 Jan 2014 02:05:22 EST Received: by vmsdvm6.vnet.ibm.com (xagsmtp 2.0.1) via smtp4 with spool id 1005; Mon, 6 Jan 2014 02:05:22 -0500 Received: from b01cxnp23033.gho.pok.ibm.com [9.57.198.28] by VMSDVM6.POK.IBM.COM (IBM VM SMTP Level 620) via TCP with ESMTP ; Mon, 06 Jan 2014 02:05:22 EST Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by b01cxnp23033.gho.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s0675oYp9896202 for <shuming(a)linux.vnet.ibm.com>; Mon, 6 Jan 2014 07:05:50 GMT Received: from d01av02.pok.ibm.com (localhost [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s0675o8h000967 for <shuming(a)linux.vnet.ibm.com>; Mon, 6 Jan 2014 02:05:50 -0500 Received: from e8.ny.us.ibm.com (e8.pok.ibm.com [9.56.232.138]) by d01av02.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s0675o65000962 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for <shuming(a)linux.vnet.ibm.com>; Mon, 6 Jan 2014 02:05:50 -0500 Received: from /spool/local by e8.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for <shuming(a)linux.vnet.ibm.com> from <kimchi-devel-bounces(a)ovirt.org>; Mon, 6 Jan 2014 02:05:50 -0500 Received: from lists.ovirt.org (173.255.252.138) by e8.ny.us.ibm.com (192.168.2.108) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 6 Jan 2014 02:05:48 -0500 Received: from linode01.ovirt.org (localhost [IPv6:::1]) by lists.ovirt.org (Postfix) with ESMTP id D5F99C13D for <shuming(a)linux.vnet.ibm.com>; Mon, 6 Jan 2014 02:05:47 -0500 (EST) MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Subject: Your message to Kimchi-devel awaits moderator approval From: kimchi-devel-bounces(a)ovirt.org To: shuming(a)linux.vnet.ibm.com Message-ID: <mailman.2583.1388991946.4126.kimchi-devel(a)ovirt.org> Date: Mon, 06 Jan 2014 02:05:46 -0500 Precedence: bulk X-BeenThere: kimchi-devel(a)ovirt.org X-Mailman-Version: 2.1.12 List-Id: <kimchi-devel.ovirt.org> X-List-Administrivia: yes Sender: kimchi-devel-bounces(a)ovirt.org Errors-To: kimchi-devel-bounces(a)ovirt.org x-cbid: 14010607-0320-0000-0000-0000021BDED2 X-IBM-ISS-SpamDetectors: Score=0; FL=0; FP=0; FZ=0; HX=0; KW=0; PH=0; SC=0; ST=0; TS=0; UL=0; ISC= X-IBM-ISS-DetailInfo: BY=3.00001628; HX=3.00000223; KW=3.00000007; PH=3.00000001; SC=3.00000023; SDB=6.00312429; UDB=6.00088507; UTC=2014-01-06 07:05:49 X-TM-AS-MML: No X-Xagent-Gateway: vmsdvm6.vnet.ibm.com (XAGSMTP4 at VMSDVM6) Your mail to 'Kimchi-devel' with the subject [PATCH V2 2/3] Remove the legacy files Is being held until the list moderator can review it for approval. The reason it is being held: Message body is too big: 202740 bytes with a limit of 40 KB Either the message will get posted to the list, or you will receive notification of the moderator's decision. If you would like to cancel this posting, please visit the following URL: http://lists.ovirt.org/mailman/confirm/kimchi-devel/45b68343d6c1c282064d944…

1 0

[PATCH V2 0/2] Add UI support of iscsi
by zhoumeina 06 Jan '14

06 Jan '14

v1-v2 modify some of translation messages Include create storage pool UI and translation files. zhoumeina (2): Add UI support of iscsi Add the ISCSI translation po files po/en_US.po | 31 +++++++++++++---- po/kimchi.pot | 30 ++++++++++++---- po/pt_BR.po | 31 +++++++++++++---- po/zh_CN.po | 31 +++++++++++++---- ui/js/src/kimchi.storagepool_add_main.js | 54 ++++++++++++++++++++++++----- ui/pages/i18n.html.tmpl | 7 ++-- ui/pages/storagepool-add.html.tmpl | 22 +++++++++++- 7 files changed, 159 insertions(+), 47 deletions(-) mode change 100644 => 100755 po/kimchi.pot

4 9

[PATCH V4] probe the username of qemu process
by shaohef＠linux.vnet.ibm.com 06 Jan '14

06 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V3 -> V4 add src/kimchi/kvmusertests.py to PEP8 list. rebase for RollbackContext is moved to kimchi.rollbackcontext ShaoHe Feng (1): qemu user tests: probe the username of qemu process started by libvirt Makefile.am | 3 ++- src/kimchi/kvmusertests.py | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 src/kimchi/kvmusertests.py -- 1.8.4.2

5 9

[PATCH V7 0/7] template supports networks
by shaohef＠linux.vnet.ibm.com 03 Jan '14

03 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V6 -> V7 fix typo V5 -> V6 address ming's commnet. raise InvalidParameter instead of NotFoundError when netowrk specified by template does not exist V4 -> V5: rebase to the latest commit. for "move RollbackContext..." merged. V3 -> V4: after template supports networks, we should change the test case accordingly aline refactor controller, rebase to the latest commit. V2 -> V3: fix typo. support creating a vm without network. V1 -> V2: update mockmodel and test case add 'networks' option for template get/create/update ShaoHe Feng (7): template supports networks: let template xml support more networks template supports networks: fix test case template supports networks: update API template supports networks: update controller and json schema template supports networks: update model template supports networks: update mockmodel template supports networks: update test case docs/API.md | 4 ++ src/kimchi/API.json | 12 ++++++ src/kimchi/control/templates.py | 3 +- src/kimchi/mockmodel.py | 16 +++++++- src/kimchi/model.py | 33 ++++++++++++----- src/kimchi/osinfo.py | 5 ++- src/kimchi/vmtemplate.py | 20 ++++++++-- tests/test_model.py | 82 ++++++++++++++++++++++++++++++++--------- tests/test_osinfo.py | 2 +- tests/test_rest.py | 58 +++++++++++++++++++++++++++++ tests/test_vmtemplate.py | 6 +-- 11 files changed, 201 insertions(+), 40 deletions(-) -- 1.8.4.2

2 15

[PATCH] pep8 cleanup for distroloader.py
by Aline Manera 03 Jan '14

03 Jan '14

From: Aline Manera <alinefm(a)br.ibm.com> This patch cleans up pep8 style issue in distroloader.py Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- Makefile.am | 1 + src/kimchi/distroloader.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0fd92c8..5460240 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,6 +43,7 @@ PEP8_WHITELIST = \ src/kimchi/cachebust.py \ src/kimchi/config.py.in \ src/kimchi/disks.py \ + src/kimchi/distroloader.py \ src/kimchi/root.py \ src/kimchi/server.py \ plugins/__init__.py \ diff --git a/src/kimchi/distroloader.py b/src/kimchi/distroloader.py index 6310644..98fd764 100644 --- a/src/kimchi/distroloader.py +++ b/src/kimchi/distroloader.py @@ -18,7 +18,7 @@ # # 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 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # import glob @@ -46,7 +46,7 @@ class DistroLoader(object): data = json.load(f) return data except ValueError: - msg = "DistroLoader: failed to parse json from distro file: %s" % fname + msg = "DistroLoader: failed to parse distro file: %s" % fname kimchi_log.error(msg) raise OperationFailed(msg) -- 1.7.10.4

2 2