- Kimchi-devel - oVirt List Archives

Kimchi UI design proposals
by Don S. Spangler 02 Oct '14

02 Oct '14

I recently created a page on the Kimchi wiki (UI Design Proposals <https://github.com/kimchi-project/kimchi/wiki/UI-Design-Proposals>) around developing a set of UI design proposals with the following goals: * Provide a complete user interface and visual style for all major tabs and tasks * Maintain clean design and interactions in keeping with Kimchi directions * Design flexible framework to allow for consistency when adding new capabilities * Enable design to support responsiveness and touch / mobile (tablet / phone) interactions We plan on making iterative updates to the screens and would like to open it up to feedback. The initial focus has been the major content areas (host, guest, template, storage, and networks) and will be working on details of the interactions, including page level blueprints. The layouts to support responsiveness are particularly important and would be part of the next updates. We look forward to your feedback, including areas that may need more clarification and issues around implementation. Thanks! Don Spangler

3 2

[PATCH] Addition of custom mac address field for interfaces v3
by bbaude＠redhat.com 01 Oct '14

01 Oct '14

From: Brent Baude <bbaude(a)redhat.com> Fixed json issue and included comments from pvital --- docs/API.md | 1 + src/kimchi/API.json | 6 ++++++ src/kimchi/control/vms.py | 2 +- src/kimchi/exception.py | 1 - src/kimchi/i18n.py | 4 ++++ src/kimchi/model/vmifaces.py | 38 +++++++++++++++++++++++++++++-------- tests/test_model.py | 12 ++++++++++++ ui/css/theme-default/guest-edit.css | 4 ++-- ui/js/src/kimchi.guest_edit_main.js | 18 ++++++++++++------ ui/pages/guest-edit.html.tmpl | 11 ++++++++--- 10 files changed, 76 insertions(+), 21 deletions(-) diff --git a/docs/API.md b/docs/API.md index b679ce7..4f92eaa 100644 --- a/docs/API.md +++ b/docs/API.md @@ -221,6 +221,7 @@ Represents all network interfaces attached to a Virtual Machine. interface type is network. * type: The type of VM network interface that libvirt supports. Now kimchi just supports 'network' type. + * custommac: A custom MAC address for the interface ### Sub-Resource: Virtual Machine Network Interface diff --git a/src/kimchi/API.json b/src/kimchi/API.json index b8604d2..e46aedc 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -334,6 +334,12 @@ "type": "string", "pattern": "^ne2k_pci|i82551|i82557b|i82559er|rtl8139|e1000|pcnet|virtio$", "error": "KCHVMIF0006E" + }, + "custommac": { + "description": "optional custom mac address for the network interface", + "type": "string", + "pattern": "^(?i)([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$", + "error": "KCHVMIF0009E" } } }, diff --git a/src/kimchi/control/vms.py b/src/kimchi/control/vms.py index 88d8a81..627f1cc 100644 --- a/src/kimchi/control/vms.py +++ b/src/kimchi/control/vms.py @@ -36,7 +36,7 @@ class VM(Resource): super(VM, self).__init__(model, ident) self.role_key = 'guests' self.update_params = ["name", "users", "groups", "cpus", "memory", - "graphics"] + "graphics", "custommac"] self.screenshot = VMScreenShot(model, ident) self.uri_fmt = '/vms/%s' for ident, node in sub_nodes.items(): diff --git a/src/kimchi/exception.py b/src/kimchi/exception.py index 039152a..7ab1878 100644 --- a/src/kimchi/exception.py +++ b/src/kimchi/exception.py @@ -46,7 +46,6 @@ class KimchiException(Exception): msg = self._get_translation() else: msg = _messages.get(code, code) - msg = unicode(msg, 'utf-8') % args pattern = "%s: %s" % (code, msg) Exception.__init__(self, pattern) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 9e66c68..8690657 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -105,6 +105,10 @@ messages = { "KCHVMIF0006E": _("Invalid network model card specified for virtual machine interface"), "KCHVMIF0007E": _("Specify type and network to add a new virtual machine interface"), "KCHVMIF0008E": _("Specify type and network to update a virtual machine interface"), + "KCHVMIF0009E": _("Invalid MAC address format. Expected a 12 character hexadecimal value separated by colons(:)"), + "KCHVMIF0010E": _("The custom MAC address %(value) is already in use on this guest"), + "KCHVMIF0011E": _("Libvirt requires a unicast MAC address which %(value) is not."), + "KCHTMPL0001E": _("Template %(name)s already exists"), "KCHTMPL0002E": _("Template %(name)s does not exist"), diff --git a/src/kimchi/model/vmifaces.py b/src/kimchi/model/vmifaces.py index 66b3827..ef67d34 100644 --- a/src/kimchi/model/vmifaces.py +++ b/src/kimchi/model/vmifaces.py @@ -18,6 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import random +import re import libvirt from lxml import etree, objectify @@ -45,6 +46,20 @@ class VMIfacesModel(object): random.randint(0x00, 0xff)] return ':'.join(map(lambda x: "%02x" % x, mac)) + def checkduplicatemacs(vm, custommac): + macs = self.get_list(vm) + if custommac in macs: + raise InvalidParameter("KCHVMIF0010E", {'custommac': mac}) + + def validMac(mymac): + pattern = r'^(?i)([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$' + if bool(re.match(pattern, mac)) is not True: + raise InvalidParameter("KCHVMIF0009E", {'custommac': mac}) + else: + # Checking for multicast + if (int(mymac.split(":")[0], 16) & 0x1) == 1: + raise InvalidParameter("KCHVMIF0011E", {'custommac': mac}) + conn = self.conn.get() networks = conn.listNetworks() + conn.listDefinedNetworks() @@ -56,14 +71,22 @@ class VMIfacesModel(object): if DOM_STATE_MAP[dom.info()[0]] != "shutoff": raise InvalidOperation("KCHVMIF0003E") - macs = (iface.mac.get('address') - for iface in self.get_vmifaces(vm, self.conn)) - - mac = randomMAC() - while True: - if mac not in macs: - break + if 'custommac' not in params: + macs = (iface.mac.get('address') + for iface in self.get_vmifaces(vm, self.conn)) mac = randomMAC() + while True: + if mac not in macs: + break + mac = randomMAC() + + else: + if len(params['custommac']) == 0: + mac = randomMAC() + else: + mac = params["custommac"] + validMac(mac) + checkduplicatemacs(vm, mac) children = [E.mac(address=mac)] ("network" in params.keys() and @@ -75,7 +98,6 @@ class VMIfacesModel(object): xml = etree.tostring(E.interface(*children, **attrib)) dom.attachDeviceFlags(xml, libvirt.VIR_DOMAIN_AFFECT_CURRENT) - return mac @staticmethod diff --git a/tests/test_model.py b/tests/test_model.py index ceedc6f..59c3e50 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -219,6 +219,18 @@ class ModelTests(unittest.TestCase): self.assertEquals("default", iface['network']) self.assertEquals("e1000", iface["model"]) + # custom MAC address test + iface_args = {"type": "network", + "network": "test-network", + "model": "virtio", + "custommac": "52:54:00:17:cd:e7"} + mac = inst.vmifaces_create('kimchi-ifaces', iface_args) + iface = inst.vmiface_lookup('kimchi-ifaces', mac) + self.assertEquals("52:54:00:17:cd:e7", iface['mac']) + self.assertRaises(InvalidParameter, inst.vmifaces_create, + 'kimchi-ifaces', iface_args) + rollback.prependDefer(inst.vmiface_delete, 'kimchi-ifaces', mac) + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_vm_disk(self): disk_path = '/tmp/existent2.iso' diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index 74c2237..f0e1bb0 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -112,7 +112,7 @@ #form-guest-edit-storage .cell, .guest-edit-interface .cell { display: inline-block; - width: 250px; + width: 150px; } #form-guest-edit-storage .cell.dev { @@ -130,7 +130,7 @@ } .guest-edit-interface .body select { - width: 180px; + width: 150px; padding: 0px; } diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index c281289..7baf296 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -176,7 +176,10 @@ kimchi.guest_edit_main = function() { var toggleEdit = function(item, on){ $("label", item).toggleClass("hide", on); $("select", item).toggleClass("hide", !on); - $(".action-area", item).toggleClass("hide"); + $("input", item).toggleClass("hide", !on); + $(".action-area#editmode", item).toggleClass("hide", !on); + $(".action-area#viewmode", item).toggleClass("hide", on); + }; var addItem = function(data) { var itemNode = $.parseHTML(kimchi.substitute($('#interface-tmpl').html(),data)); @@ -215,20 +218,23 @@ kimchi.guest_edit_main = function() { var item = $(this).parent().parent(); var interface = { network: $("select", item).val(), - type: "network" + type: "network", + custommac: $("input",item).val().toLowerCase() }; - var postUpdate = function(){ + var postUpdate = function(mymac){ $("label", item).text(interface.network); - toggleEdit(item, false); + $("label#custommac", item).text(mymac); + toggleEdit(item.prop, false); }; if(item.prop("id")==""){ kimchi.createGuestInterface(kimchi.selectedGuest, interface, function(data){ item.prop("id", data.mac); - postUpdate(); + $("label#custommac", item).text(data.mac) + postUpdate(data.mac); }); }else{ kimchi.updateGuestInterface(kimchi.selectedGuest, item.prop("id"), interface, function(){ - postUpdate(); + postUpdate(data.mac); }); } }); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 0b7dad3..0aa9f3b 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -108,7 +108,8 @@ <div class="header"> <span class="cell">$_("Network")</span> <span class="cell">$_("Type")</span> - <button class="add action-area"></button> + <span class="cell">$_("MAC")</span> + <button id="interfaceadd" class="add action-area"></button> </div> <div class="body"></div> </form> @@ -192,10 +193,14 @@ <span class="cell"> <span>{type}</span> </span> - <span class="action-area {editMode}"> + <span class="cell"> + <label class="{viewMode}" id="custommac">{mac}</label> + <input type="text" id="insertmac" class="{editMode}"/> + </span> + <span class="action-area {editMode}" id="editmode"> <button class="save"></button><button class="cancel"></button> </span> - <span class="action-area {viewMode}"> + <span class="action-area {viewMode}" id="viewmode"> <button class="edit"></button><button class="delete"></button> </span> <div> -- 1.9.3

3 3

[PATCH] Addition of custom mac address field for interfaces v3
by bbaude＠redhat.com 01 Oct '14

01 Oct '14

From: Brent Baude <bbaude(a)redhat.com> Add tests and regex to json per peer review. Also changed the error type to InvalidParameter --- docs/API.md | 1 + src/kimchi/API.json | 6 ++++++ src/kimchi/control/vms.py | 2 +- src/kimchi/exception.py | 3 ++- src/kimchi/i18n.py | 4 ++++ src/kimchi/model/vmifaces.py | 38 +++++++++++++++++++++++++++++-------- tests/test_model.py | 12 ++++++++++++ ui/css/theme-default/guest-edit.css | 4 ++-- ui/js/src/kimchi.guest_edit_main.js | 18 ++++++++++++------ ui/pages/guest-edit.html.tmpl | 11 ++++++++--- 10 files changed, 78 insertions(+), 21 deletions(-) diff --git a/docs/API.md b/docs/API.md index b679ce7..4f92eaa 100644 --- a/docs/API.md +++ b/docs/API.md @@ -221,6 +221,7 @@ Represents all network interfaces attached to a Virtual Machine. interface type is network. * type: The type of VM network interface that libvirt supports. Now kimchi just supports 'network' type. + * custommac: A custom MAC address for the interface ### Sub-Resource: Virtual Machine Network Interface diff --git a/src/kimchi/API.json b/src/kimchi/API.json index b8604d2..e46aedc 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -334,6 +334,12 @@ "type": "string", "pattern": "^ne2k_pci|i82551|i82557b|i82559er|rtl8139|e1000|pcnet|virtio$", "error": "KCHVMIF0006E" + }, + "custommac": { + "description": "optional custom mac address for the network interface", + "type": "string", + "pattern": "^(?i)([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$", + "error": "KCHVMIF0009E" } } }, diff --git a/src/kimchi/control/vms.py b/src/kimchi/control/vms.py index 88d8a81..627f1cc 100644 --- a/src/kimchi/control/vms.py +++ b/src/kimchi/control/vms.py @@ -36,7 +36,7 @@ class VM(Resource): super(VM, self).__init__(model, ident) self.role_key = 'guests' self.update_params = ["name", "users", "groups", "cpus", "memory", - "graphics"] + "graphics", "custommac"] self.screenshot = VMScreenShot(model, ident) self.uri_fmt = '/vms/%s' for ident, node in sub_nodes.items(): diff --git a/src/kimchi/exception.py b/src/kimchi/exception.py index 039152a..ebe03ae 100644 --- a/src/kimchi/exception.py +++ b/src/kimchi/exception.py @@ -46,7 +46,8 @@ class KimchiException(Exception): msg = self._get_translation() else: msg = _messages.get(code, code) - + print msg + print args msg = unicode(msg, 'utf-8') % args pattern = "%s: %s" % (code, msg) Exception.__init__(self, pattern) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 9e66c68..86f4e50 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -105,6 +105,10 @@ messages = { "KCHVMIF0006E": _("Invalid network model card specified for virtual machine interface"), "KCHVMIF0007E": _("Specify type and network to add a new virtual machine interface"), "KCHVMIF0008E": _("Specify type and network to update a virtual machine interface"), + "KCHVMIF0009E": _("The custom MAC address is not properly formatted as 12 character hexadecimal value separated by colons(:)"), + "KCHVMIF0010E": _("The custom MAC address is already in use on this guest"), + "KCHVMIF0011E": _("Libvirt requires you use a unicast MAC address."), + "KCHTMPL0001E": _("Template %(name)s already exists"), "KCHTMPL0002E": _("Template %(name)s does not exist"), diff --git a/src/kimchi/model/vmifaces.py b/src/kimchi/model/vmifaces.py index 66b3827..ef67d34 100644 --- a/src/kimchi/model/vmifaces.py +++ b/src/kimchi/model/vmifaces.py @@ -18,6 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import random +import re import libvirt from lxml import etree, objectify @@ -45,6 +46,20 @@ class VMIfacesModel(object): random.randint(0x00, 0xff)] return ':'.join(map(lambda x: "%02x" % x, mac)) + def checkduplicatemacs(vm, custommac): + macs = self.get_list(vm) + if custommac in macs: + raise InvalidParameter("KCHVMIF0010E", {'custommac': mac}) + + def validMac(mymac): + pattern = r'^(?i)([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$' + if bool(re.match(pattern, mac)) is not True: + raise InvalidParameter("KCHVMIF0009E", {'custommac': mac}) + else: + # Checking for multicast + if (int(mymac.split(":")[0], 16) & 0x1) == 1: + raise InvalidParameter("KCHVMIF0011E", {'custommac': mac}) + conn = self.conn.get() networks = conn.listNetworks() + conn.listDefinedNetworks() @@ -56,14 +71,22 @@ class VMIfacesModel(object): if DOM_STATE_MAP[dom.info()[0]] != "shutoff": raise InvalidOperation("KCHVMIF0003E") - macs = (iface.mac.get('address') - for iface in self.get_vmifaces(vm, self.conn)) - - mac = randomMAC() - while True: - if mac not in macs: - break + if 'custommac' not in params: + macs = (iface.mac.get('address') + for iface in self.get_vmifaces(vm, self.conn)) mac = randomMAC() + while True: + if mac not in macs: + break + mac = randomMAC() + + else: + if len(params['custommac']) == 0: + mac = randomMAC() + else: + mac = params["custommac"] + validMac(mac) + checkduplicatemacs(vm, mac) children = [E.mac(address=mac)] ("network" in params.keys() and @@ -75,7 +98,6 @@ class VMIfacesModel(object): xml = etree.tostring(E.interface(*children, **attrib)) dom.attachDeviceFlags(xml, libvirt.VIR_DOMAIN_AFFECT_CURRENT) - return mac @staticmethod diff --git a/tests/test_model.py b/tests/test_model.py index ceedc6f..59c3e50 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -219,6 +219,18 @@ class ModelTests(unittest.TestCase): self.assertEquals("default", iface['network']) self.assertEquals("e1000", iface["model"]) + # custom MAC address test + iface_args = {"type": "network", + "network": "test-network", + "model": "virtio", + "custommac": "52:54:00:17:cd:e7"} + mac = inst.vmifaces_create('kimchi-ifaces', iface_args) + iface = inst.vmiface_lookup('kimchi-ifaces', mac) + self.assertEquals("52:54:00:17:cd:e7", iface['mac']) + self.assertRaises(InvalidParameter, inst.vmifaces_create, + 'kimchi-ifaces', iface_args) + rollback.prependDefer(inst.vmiface_delete, 'kimchi-ifaces', mac) + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_vm_disk(self): disk_path = '/tmp/existent2.iso' diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index 74c2237..f0e1bb0 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -112,7 +112,7 @@ #form-guest-edit-storage .cell, .guest-edit-interface .cell { display: inline-block; - width: 250px; + width: 150px; } #form-guest-edit-storage .cell.dev { @@ -130,7 +130,7 @@ } .guest-edit-interface .body select { - width: 180px; + width: 150px; padding: 0px; } diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index c281289..7baf296 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -176,7 +176,10 @@ kimchi.guest_edit_main = function() { var toggleEdit = function(item, on){ $("label", item).toggleClass("hide", on); $("select", item).toggleClass("hide", !on); - $(".action-area", item).toggleClass("hide"); + $("input", item).toggleClass("hide", !on); + $(".action-area#editmode", item).toggleClass("hide", !on); + $(".action-area#viewmode", item).toggleClass("hide", on); + }; var addItem = function(data) { var itemNode = $.parseHTML(kimchi.substitute($('#interface-tmpl').html(),data)); @@ -215,20 +218,23 @@ kimchi.guest_edit_main = function() { var item = $(this).parent().parent(); var interface = { network: $("select", item).val(), - type: "network" + type: "network", + custommac: $("input",item).val().toLowerCase() }; - var postUpdate = function(){ + var postUpdate = function(mymac){ $("label", item).text(interface.network); - toggleEdit(item, false); + $("label#custommac", item).text(mymac); + toggleEdit(item.prop, false); }; if(item.prop("id")==""){ kimchi.createGuestInterface(kimchi.selectedGuest, interface, function(data){ item.prop("id", data.mac); - postUpdate(); + $("label#custommac", item).text(data.mac) + postUpdate(data.mac); }); }else{ kimchi.updateGuestInterface(kimchi.selectedGuest, item.prop("id"), interface, function(){ - postUpdate(); + postUpdate(data.mac); }); } }); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 0b7dad3..0aa9f3b 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -108,7 +108,8 @@ <div class="header"> <span class="cell">$_("Network")</span> <span class="cell">$_("Type")</span> - <button class="add action-area"></button> + <span class="cell">$_("MAC")</span> + <button id="interfaceadd" class="add action-area"></button> </div> <div class="body"></div> </form> @@ -192,10 +193,14 @@ <span class="cell"> <span>{type}</span> </span> - <span class="action-area {editMode}"> + <span class="cell"> + <label class="{viewMode}" id="custommac">{mac}</label> + <input type="text" id="insertmac" class="{editMode}"/> + </span> + <span class="action-area {editMode}" id="editmode"> <button class="save"></button><button class="cancel"></button> </span> - <span class="action-area {viewMode}"> + <span class="action-area {viewMode}" id="viewmode"> <button class="edit"></button><button class="delete"></button> </span> <div> -- 1.9.3

2 1

Proposals for next release
by Aline Manera 30 Sep '14

30 Sep '14

Hi all, I'd like to share with you what I have in mind for the next release. Most of the items listed below have already come up on ML before. *A) Upload file to storage pool* In the current code, the upload function is disabled as it does not work well with files larger than 500MB. When trying to upload a file with 500MB the browser stops responding and after some time it crashes. From a quick investigation, I identified it happens prior to send the data to server: var uploadFile = function() { var blobFile = $(localFileBox)[0].files[0]; var fileName = blobFile.name; var fd = new FormData(); fd.append('name', fileName); *fd.append('file', blobFile)* .... } We need check if there is a way to solve it on UI by changing the data structure or how it is loaded or think about a solution involving backend. *B) Reduce imported code* Kimchi imports some code: python-websockets, novnc, spice and jquery libs Some of them (to don't say most of them) are already packaged in some Linux distributions (Fedora, Ubuntu, etc) We should check the availability of those packages in the all supported distros and when possible remove the imported code from git repository and add it as a dependency. *It is a requirement**to have Kimchi on Fedora.* *C) MockModel refactor* The mockmodel was designed to provide a way to user tests Kimchi without affecting the system (by "kimchid --test") and also to make the tests easier to do. But in fact, we have a bunch of code that completely differs from the real model, so the developer needs to do 2 kinds of implementations while developing a new feature. My proposal is simplify that by using Model() with "test:///default" URI. This configuration does not affect the system in real and also can provide us a way to test the new feature in a closer scenario to the real one: by connecting to libvirt and doing the operations. As you may know "test:///default" driver has some limitations that prevents some operations, for example, screenshots. To solve it we could only override what is not supported by this driver and create a simpler mockmodel. Example: class MockModel(Model): super(Model, self).__init__("test:///default") def vmscreenshot_lookup(): # do some mock code I think in this way we will have a significant reduction in our mockmodel code. *D) VM Template refactor* More and more the user will be able to change the VM configuration and it implies in generating a XML code related to the new item to be attached to the VM. But it is also done in the Template level. Because that we have a lot of duplicated code related to the XML generation on VM and Template. Some of them using etree.builder and others using pure strings. My idea is to create a xml python module to hold all the XML manipulation about to element type. Example: src/kimchi/xml/iface.py src/kimchi/xml/disk.py src/kimchi/xml/graphics.py src/kimchi/xml/domain.py Each of these files will be responsible to handle the XML generation and manipulation using *etree*. Then when needed, while changing VM configuration or Template, we use the same code from our xml module. *E) Allow user adds volumes from different pools to a Template* *(depends on D)* Today the user can only use one disk in a Template. We should provide a way to user select multiple volumes from different storage pools in a Template. The user should be able to specific a pool and a disk size to Kimchi automatically creates a volume according to those inputs. So user can specify a pool and a volume OR a pool and a disk size. From UI perspective, we will need a bigger refactor on it. Maybe displaying the Template information in tabs (the same way we did when editing a VM) *F) Guest disk hot plug* *(depends on D)* Allow attaching a disk to a running guest. *G) PCI passthrough* *H) SMT support* Kimchi should enable SMT on guests when it improves performance according to host architecture and choose the best configuration to user (SMT8, 4 or 2) This kind of information must not be prompted to user as it is only for expert users and can block entry level users (our main focus) So our algorithm must be good enough to do the right choice according to host and guest configuration. *I) Snapshot support* Allow users create, revert and delete a snapshot. *J) Guest cloning* *K) LDAP authentication support* We need to think also how to enable authorization on a LDAP authentication. In my first view, I think we need to provide a way to sysadmin lists the IDs to have admin role in the Kimchi config file. What about the groups? Should we use LDAP domains instead of groups? And we also need to change UI when setting users and groups, as there is no way to list all users in a LDAP server. On Kimchi configuration file we can have an authentication section like below: [authentication] method = pam | ldap ldap_server = ldap_search = ldap_domain = ldap_admin_users = *L) Allow user changes graphics type on guest* User should be able to change from VNC to Spice on a existing guest *M) Add support for serial console* *N) Live migration* Start some investigation on how to do that ---- Yeap! A lot of cool features and just a piece of our backlog... ;-) That is a brainstorm. So please, your comments/suggestions are more than welcome! Thanks, Aline Manera

1 0

[PATCHv2] Fix: accelerate mockmodel for file upload
by lvroyce＠linux.vnet.ibm.com 30 Sep '14

30 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v1>v2, use wait task rather than adding sleep time (Cristian) File upload fails with error 404 because of small read is time consuming, change read size and wait in test to guarentee storage volume created when query URI. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/mockmodel.py | 2 +- tests/test_rest.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index ab4357d..cbbdba3 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -534,7 +534,7 @@ class MockModel(object): size = 0 try: while True: - data = upload_file.file.read(8192) + data = upload_file.file.read(8192*32) if not data: break size += len(data) diff --git a/tests/test_rest.py b/tests/test_rest.py index 7eb6233..99f2176 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -1947,9 +1947,10 @@ class RestTests(unittest.TestCase): self.assertEquals(r.status_code, 202) task = r.json() - self._wait_task(task['id']) + self._wait_task(task['id'], 15) resp = self.request('/storagepools/default/storagevolumes/%s' % task['target_uri'].split('/')[-1]) + self.assertEquals(200, resp.status) # Create a file with 5M to upload -- 1.8.3.2

2 1

[PATCH] Bug Fix: Correct select menu to handle empty input
by huoyuxin＠linux.vnet.ibm.com 30 Sep '14

30 Sep '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/js/widgets/select-menu.js | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/js/widgets/select-menu.js b/ui/js/widgets/select-menu.js index ad53200..c4b0209 100644 --- a/ui/js/widgets/select-menu.js +++ b/ui/js/widgets/select-menu.js @@ -36,8 +36,10 @@ var selectedClass = 'active'; var itemTag = 'li'; var item; + that.listControl.find('li').remove(); + that.label.text(""); + that.target.val(""); if (options.length > 0) { - that.listControl.find('li').remove(); $.each(options, function(index, option) { item = $('<' + itemTag + '>' + option.label +'</' + itemTag + '>'); item.data('value', option.value); @@ -58,8 +60,6 @@ that.target.change(); } }); - } else { - kimchi.message.error.code('KCHAPI6006E'); } }, -- 1.7.1

3 3

[PATCH V4] Bugfix: Cancel option not working properly in New Storage Define
by Wen Wang 29 Sep '14

29 Sep '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V3 -> V4: Move the duplicate part to a function that reduce the duplication. V2 -> V3: Make the button style change properly with different storage pool types. V1 -> V2: Make the "Create" button change style and disable the input box only when clicked on "ok" in "confirm" diaguage. The button and the input style stay the same if user cancel the creating job. This bug fix the defect that when adding a new logical storage pool, a confrim message box show up and when canceling it, the inputbox as well as button "Create" is still disabled. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storagepool_add_main.js | 37 +++++++++++++----------------- 1 files changed, 16 insertions(+), 21 deletions(-) diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 4f1f943..ffe8fb6 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -352,8 +352,6 @@ kimchi.validateLogicalForm = function () { kimchi.addPool = function(event) { if (kimchi.validateForm()) { - $('#pool-doAdd').hide(); - $('#pool-loading').show(); var formData = $('#form-pool-add').serializeObject(); delete formData.authname; var poolType = $('#poolTypeId').selectMenu('value'); @@ -390,16 +388,11 @@ kimchi.addPool = function(event) { } else if (poolType === 'scsi'){ formData.source = { adapter_name: $('#scsiAdapter').selectMenu('value') }; } - $('input', '#form-pool-add').attr('disabled','disabled'); - if (poolType === 'logical') { - var settings = { - title : i18n['KCHAPI6001M'], - content : i18n['KCHPOOL6003M'], - confirm : i18n['KCHAPI6002M'], - cancel : i18n['KCHAPI6003M'] - }; - kimchi.confirm(settings, function() { - kimchi.createStoragePool(formData, function() { + var storagePoolAddingFunc = function() { + $('input', '#form-pool-add').attr('disabled','disabled'); + $('#pool-doAdd').hide(); + $('#pool-loading').show(); + kimchi.createStoragePool(formData, function() { kimchi.doListStoragePools(); kimchi.window.close(); }, function(err) { @@ -408,18 +401,20 @@ kimchi.addPool = function(event) { $('#pool-loading').hide(); $('#pool-doAdd').show(); }); + }; + if (poolType === 'logical') { + var settings = { + title : i18n['KCHAPI6001M'], + content : i18n['KCHPOOL6003M'], + confirm : i18n['KCHAPI6002M'], + cancel : i18n['KCHAPI6003M'] + }; + kimchi.confirm(settings, function() { + storagePoolAddingFunc(); }, function() { }); } else { - kimchi.createStoragePool(formData, function() { - kimchi.doListStoragePools(); - kimchi.window.close(); - }, function(err) { - kimchi.message.error(err.responseJSON.reason); - $('input', '#form-pool-add').removeAttr('disabled'); - $('#pool-loading').hide(); - $('#pool-doAdd').show(); - }); + storagePoolAddingFunc(); } } }; -- 1.7.1

3 2

[PATCH V2] Bug Fix: Correct select menu to handle empty input
by Wen Wang 29 Sep '14

29 Sep '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> V1 -> V2: Have the message item "Options needed." deleted from "ui/pages/i18n.json.tmpl" and make the proper change with each po file. Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- po/de_DE.po | 3 --- po/en_US.po | 3 --- po/es_ES.po | 3 --- po/fr_FR.po | 3 --- po/it_IT.po | 3 --- po/ja_JP.po | 3 --- po/kimchi.pot | 3 --- po/ko_KR.po | 3 --- po/pt_BR.po | 3 --- po/ru_RU.po | 3 --- po/zh_CN.po | 3 --- po/zh_TW.po | 3 --- ui/js/widgets/select-menu.js | 6 +++--- ui/pages/i18n.json.tmpl | 1 - 14 files changed, 3 insertions(+), 40 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 9d25e20..98bde90 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -1256,9 +1256,6 @@ msgstr "Dies ist kein gültiger URL." msgid "No such data available." msgstr "Keine solchen Daten verfügbar." -msgid "Options needed." -msgstr "" - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/po/en_US.po b/po/en_US.po index e36c88d..eb571ca 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -1128,9 +1128,6 @@ msgstr "" msgid "No such data available." msgstr "" -msgid "Options needed." -msgstr "" - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/po/es_ES.po b/po/es_ES.po index 1279969..5a3fa46 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -1274,9 +1274,6 @@ msgstr "No es un URL válido." msgid "No such data available." msgstr "No hay datos de ese tipo disponibles." -msgid "Options needed." -msgstr "" - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/po/fr_FR.po b/po/fr_FR.po index a13ef9f..414dd4a 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -1263,9 +1263,6 @@ msgstr "Ce n'est pas une URL valide." msgid "No such data available." msgstr "De telles données ne sont pas disponibles." -msgid "Options needed." -msgstr "" - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/po/it_IT.po b/po/it_IT.po index d710a66..4a6c919 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -1243,9 +1243,6 @@ msgstr "Non è un URL valido." msgid "No such data available." msgstr "Dati indicati non disponibili." -msgid "Options needed." -msgstr "" - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/po/ja_JP.po b/po/ja_JP.po index d8d20f7..af00487 100644 --- a/po/ja_JP.po +++ b/po/ja_JP.po @@ -1253,9 +1253,6 @@ msgstr "有効な URL ではありません。" msgid "No such data available." msgstr "そのようなデータはありません。" -msgid "Options needed." -msgstr "" - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/po/kimchi.pot b/po/kimchi.pot index e72ddcd..685802e 100755 --- a/po/kimchi.pot +++ b/po/kimchi.pot @@ -1128,9 +1128,6 @@ msgstr "" msgid "No such data available." msgstr "" -msgid "Options needed." -msgstr "" - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/po/ko_KR.po b/po/ko_KR.po index 7946cb2..a9f82e4 100644 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -1185,9 +1185,6 @@ msgstr "올바른 URL이 아닙니다." msgid "No such data available." msgstr "해당 데이터가 없습니다." -msgid "Options needed." -msgstr "" - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/po/pt_BR.po b/po/pt_BR.po index a86567d..f2fba64 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1265,9 +1265,6 @@ msgstr "Essa não é uma URL válida." msgid "No such data available." msgstr "Não há dados disponíveis." -msgid "Options needed." -msgstr "Opções necessárias." - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/po/ru_RU.po b/po/ru_RU.po index f17f9bc..059b999 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -1184,9 +1184,6 @@ msgstr "Это недопустимый URL." msgid "No such data available." msgstr "Нет таких данных." -msgid "Options needed." -msgstr "" - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/po/zh_CN.po b/po/zh_CN.po index 5bf59ca..f77e405 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1151,9 +1151,6 @@ msgstr "这不是一个有效的URL" msgid "No such data available." msgstr "没有可用的数据" -msgid "Options needed." -msgstr "需要选项。" - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/po/zh_TW.po b/po/zh_TW.po index 9db4edf..4040b2a 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1131,9 +1131,6 @@ msgstr "這是無效的 URL。" msgid "No such data available." msgstr "沒有此類可用資料。" -msgid "Options needed." -msgstr "" - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/ui/js/widgets/select-menu.js b/ui/js/widgets/select-menu.js index ad53200..c4b0209 100644 --- a/ui/js/widgets/select-menu.js +++ b/ui/js/widgets/select-menu.js @@ -36,8 +36,10 @@ var selectedClass = 'active'; var itemTag = 'li'; var item; + that.listControl.find('li').remove(); + that.label.text(""); + that.target.val(""); if (options.length > 0) { - that.listControl.find('li').remove(); $.each(options, function(index, option) { item = $('<' + itemTag + '>' + option.label +'</' + itemTag + '>'); item.data('value', option.value); @@ -58,8 +60,6 @@ that.target.change(); } }); - } else { - kimchi.message.error.code('KCHAPI6006E'); } }, diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index c52b175..75f1e43 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -39,7 +39,6 @@ "KCHAPI6003E": "$_("This is not a valid Linux path")", "KCHAPI6004E": "$_("This is not a valid URL.")", "KCHAPI6005E": "$_("No such data available.")", - "KCHAPI6006E": "$_("Options needed.")", "KCHAPI6007E": "$_("Can not contact the host system. Verify the host system is up and that you have network connectivity to it. HTTP request response %1. ")", "KCHAPI6001M": "$_("Delete Confirmation")", -- 1.7.1

3 2

[PATCHv6] Fix wrong config param of repository creation
by lvroyce＠linux.vnet.ibm.com 29 Sep '14

29 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Wrong config param for repository creation needs to be rejected, also fix correspoding testcases. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 1 + src/kimchi/repositories.py | 11 ++++++++++- tests/test_model.py | 13 +++++++++++-- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index d402dde..1b543ce 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -288,4 +288,5 @@ messages = { "KCHREPOS0025E": _("Unable to retrieve repository information. Details: '%(err)s'"), "KCHREPOS0026E": _("Unable to add repository. Details: '%(err)s'"), "KCHREPOS0027E": _("Unable to remove repository. Details: '%(err)s'"), + "KCHREPOS0028E": _("Configuration items: '%(items)s' are not supported by repository manager"), } diff --git a/src/kimchi/repositories.py b/src/kimchi/repositories.py index 19edc22..f826ac9 100644 --- a/src/kimchi/repositories.py +++ b/src/kimchi/repositories.py @@ -26,7 +26,7 @@ from ConfigParser import ConfigParser from kimchi.basemodel import Singleton from kimchi.config import kimchiLock -from kimchi.exception import InvalidOperation +from kimchi.exception import InvalidOperation, InvalidParameter from kimchi.exception import OperationFailed, NotFoundError, MissingParameter from kimchi.utils import validate_repo_url @@ -52,6 +52,13 @@ class Repositories(object): """ Add and enable a new repository """ + config = params.get('config', {}) + extra_keys = list( + set(config.keys()).difference(set(self._pkg_mnger.CONFIG_ENTRY))) + if len(extra_keys) > 0: + raise InvalidParameter("KCHREPOS0028E", + {'items': ",".join(extra_keys)}) + return self._pkg_mnger.addRepo(params) def getRepositories(self): @@ -105,6 +112,7 @@ class YumRepo(object): """ TYPE = 'yum' DEFAULT_CONF_DIR = "/etc/yum.repos.d" + CONFIG_ENTRY = ('repo_name', 'mirrorlist') def __init__(self): self._yb = getattr(__import__('yum'), 'YumBase') @@ -319,6 +327,7 @@ class AptRepo(object): """ TYPE = 'deb' KIMCHI_LIST = "kimchi-source.list" + CONFIG_ENTRY = ('dist', 'comps') def __init__(self): getattr(__import__('apt_pkg'), 'init_config')() diff --git a/tests/test_model.py b/tests/test_model.py index 63032f5..1f2e79c 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1309,8 +1309,7 @@ class ModelTests(unittest.TestCase): 'baseurl': 'http://www.fedora.org'}, {'repo_id': 'fedora-updates-fake', 'config': - {'mirrorlist': 'http://www.fedoraproject.org', - 'gpgkey': 'file:///tmp/KEY-fedora-updates-fake-19'}}] + {'mirrorlist': 'http://www.fedoraproject.org'}}] deb_repos = [{'baseurl': 'http://archive.ubuntu.com/ubuntu/', 'config': {'dist': 'quantal'}}, @@ -1325,12 +1324,22 @@ class ModelTests(unittest.TestCase): wrong_mirrorlist = {'repo_id': 'wrong-id', 'baseurl': 'www.example.com', 'config': {'mirrorlist': url}} + wrong_config_item = { + 'repo_id': 'wrong-id', + 'baseurl': 'www.example.com', + 'config': { + 'gpgkey': 'file:///tmp/KEY-fedora-updates-fake-19'}} yum_invalid_repos.append(wrong_baseurl) yum_invalid_repos.append(wrong_mirrorlist) + yum_invalid_repos.append(wrong_config_item) wrong_baseurl['config'] = {'dist': 'tasty'} + wrong_config = {'baseurl': deb_repos[0]['baseurl'], + 'config': { + 'unsupported_item': "a_unsupported_item"}} deb_invalid_repos.append(wrong_baseurl) + deb_invalid_repos.append(wrong_config) repo_type = inst.capabilities_lookup()['repo_mngt_tool'] if repo_type == 'yum': -- 1.8.3.2

2 1

[PATCH] Fix: retrieve right bus type in vmstorage update
by lvroyce＠linux.vnet.ibm.com 29 Sep '14

29 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> When disk source does not present in xml(i.e. cdrom ejected), bus type probe will be ignored because of former exception. Retrive right bus type before source probe to fix this. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/vmdisks.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/kimchi/vmdisks.py b/src/kimchi/vmdisks.py index 6012ada..b61c883 100644 --- a/src/kimchi/vmdisks.py +++ b/src/kimchi/vmdisks.py @@ -43,7 +43,7 @@ def get_vm_disk(dom, dev_name): "KCHVMSTOR0007E", {'dev_name': dev_name, 'vm_name': dom.name()}) path = "" - dev_bus = 'ide' + dev_bus = disk.target.attrib['bus'] try: source = disk.source if source is not None: @@ -55,8 +55,6 @@ def get_vm_disk(dom, dev_name): host.attrib['port'] + source.attrib['name']) else: path = source.attrib[DEV_TYPE_SRC_ATTR_MAP[src_type]] - # Retrieve storage bus type - dev_bus = disk.target.attrib['bus'] except: pass dev_type = disk.attrib['device'] -- 1.8.3.2

4 3