Instead of searching VMs by name, get_vm() and vm_list() will use as criteria the title tag to search vms. This is necessary to avoid unicode conflicts with libvirt. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com&gt; --- src/kimchi/model/vms.py | 55 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index f0182b9..2ae58ee 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -169,7 +169,21 @@ class VMsModel(object): @staticmethod def get_vms(conn): conn_ = conn.get() - names = [dom.name().decode('utf-8') for dom in conn_.listAllDomains(0)] + + # retrieve title instead of name + names = [] + for dom in conn_.listAllDomains(0): + + xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE) + title = xpath_get_text(xml, '/domain/title') + + # machine does not have title: use name + if title == []: + names.append(unicode(dom.name())) + continue + + # has title: use it + names.append(title[0]) names = sorted(names, key=unicode.lower) return names @@ -882,15 +896,40 @@ class VMModel(object): @staticmethod def get_vm(name, conn): conn = conn.get() + + # try to reach vm directly try: - # outgoing text to libvirt, encode('utf-8') - return conn.lookupByName(name.encode("utf-8")) + dom = conn.lookupByName(unicode(filter(str.isalnum, + name.encode('ascii', 'xmlcharrefreplace')))) + return dom + # error: skip it and wait for the next search except libvirt.libvirtError as e: - if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN: - raise NotFoundError("KCHVM0002E", {'name': name}) - else: - raise OperationFailed("KCHVM0009E", {'name': name, - 'err': e.message}) + pass + + try: + + for dom in conn.listAllDomains(0): + + xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE) + title = xpath_get_text(xml, '/domain/title') + + # machine does not have title: use name + if title == []: + vm_name = unicode(dom.name()) + # has title: use it + else: + vm_name = title[0] + + # name match: return dom + if vm_name == name: + return dom + + except libvirt.libvirtError as e: + raise OperationFailed("KCHVM0009E", {'name': name, 'err': e.message}) + + # not found + raise NotFoundError("KCHVM0002E", {'name': name}) + def delete(self, name): conn = self.conn.get() -- 2.1.0

Library base64 does not support unicode format. So, the conversion to utf-8 will be forced before. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com&gt; --- src/kimchi/model/vms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index 3445def..97c011d 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -1077,7 +1077,7 @@ class VMModel(object): # (type, listen, port, passwd, passwdValidTo) graphics_port = self._vm_get_graphics(name)[2] if graphics_port is not None: - vnc.add_proxy_token(name, graphics_port) + vnc.add_proxy_token(name.encode("utf-8"), graphics_port) else: raise OperationFailed("KCHVM0010E", {'name': name}) -- 2.1.0

To keep compatibility, redefine the title. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com&gt; --- src/kimchi/model/vms.py | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index 97c011d..79967cc 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -59,6 +59,7 @@ DOM_STATE_MAP = {0: 'nostate', 7: 'pmsuspended'} VM_STATIC_UPDATE_PARAMS = {'name': './name', + 'title': './title', 'cpus': './vcpu', 'memory': './memory'} VM_LIVE_UPDATE_PARAMS = {} @@ -183,7 +184,8 @@ class VMsModel(object): continue # has title: use it - names.append(title[0]) + names.append(unicode(title[0])) + names = sorted(names, key=unicode.lower) return names @@ -211,7 +213,11 @@ class VMModel(object): dom = self.get_vm(name, self.conn) dom = self._static_vm_update(dom, params) self._live_vm_update(dom, params) - return dom.name().decode('utf-8') + + if params.get("name") != None: + return params["name"] + + return name def clone(self, name): """Clone a virtual machine based on an existing one. @@ -671,6 +677,21 @@ class VMModel(object): val = val * 1024 if type(val) == int: val = str(val) + + # name is passed: update name and title + if key == "name": + new_name = unicode(filter(str.isalnum, + params["name"].encode('ascii', 'xmlcharrefreplace'))) + + # update name + xpath = VM_STATIC_UPDATE_PARAMS[key] + new_xml = xml_item_update(new_xml, xpath, new_name) + + # update title + xpath = VM_STATIC_UPDATE_PARAMS["title"] + new_xml = xml_item_update(new_xml, xpath, val) + continue + xpath = VM_STATIC_UPDATE_PARAMS[key] new_xml = xml_item_update(new_xml, xpath, val) -- 2.1.0

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com&gt; --- src/kimchi/model/vmsnapshots.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/kimchi/model/vmsnapshots.py b/src/kimchi/model/vmsnapshots.py index 3a92cdc..af084a9 100644 --- a/src/kimchi/model/vmsnapshots.py +++ b/src/kimchi/model/vmsnapshots.py @@ -160,6 +160,13 @@ class VMSnapshotModel(object): # get vm name recorded in the snapshot and return new uri params vm_new_name = xpath_get_text(vir_snap.getXMLDesc(0), + 'domain/title') + + # title exists: return title + if len(vm_new_name) > 0: + return [vm_new_name[0], name] + + vm_new_name = xpath_get_text(vir_snap.getXMLDesc(0), 'domain/name')[0] return [vm_new_name, name] except libvirt.libvirtError, e: -- 2.1.0