From a16b7ca6e116a65b7836a545817e0f782e60bada Mon Sep 17 00:00:00 2001
From: Antoine Millet <antoine.millet@arkena.com>
Date: Mon, 15 Jun 2015 12:08:38 +0200
Subject: [PATCH] Reworked vm_define to handle other formats

---
 cloudcontrol/node/hypervisor/__init__.py | 7 ++++---
 cloudcontrol/node/hypervisor/kvm.py      | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cloudcontrol/node/hypervisor/__init__.py b/cloudcontrol/node/hypervisor/__init__.py
index c53b688..d30b9b0 100644
--- a/cloudcontrol/node/hypervisor/__init__.py
+++ b/cloudcontrol/node/hypervisor/__init__.py
@@ -199,10 +199,11 @@ class Handler(HostHandler):
     @libvirt_handler
     def vm_define(self, data, format='xml'):
         logger.debug('VM define')
-        if format != 'xml':
-            raise NotImplementedError('Format not supported')
 
-        return self.hypervisor.vm_define(data)
+        if format == 'xml':
+            return self.hypervisor.vm_define(data)
+        else:
+            raise NotImplementedError('Format not supported')
 
     @libvirt_handler
     def vm_undefine(self, name):
diff --git a/cloudcontrol/node/hypervisor/kvm.py b/cloudcontrol/node/hypervisor/kvm.py
index e6e83b8..002a22a 100644
--- a/cloudcontrol/node/hypervisor/kvm.py
+++ b/cloudcontrol/node/hypervisor/kvm.py
@@ -210,7 +210,7 @@ class KVM(object):
         :return: VM name created
         """
         try:
-            return self.vir_con.defineXML(xml_desc).name()
+            return self.vir_con.defineXML(xml_desc).UUIDString()
         except libvirt.libvirtError:
             logger.exception('Error while creating domain')
             # reraise exception for the cc-server
-- 
GitLab