Commit a16b7ca6 authored by Antoine Millet's avatar Antoine Millet
Browse files

Reworked vm_define to handle other formats

parent d2fe2d66

cloudcontrol/node/hypervisor/__init__.py

+4 −3
Original line number Diff line number Diff line
@@ -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')



        if format == 'xml':

            return self.hypervisor.vm_define(data)

        else:

            raise NotImplementedError('Format not supported')



    @libvirt_handler

    def vm_undefine(self, name):

cloudcontrol/node/hypervisor/kvm.py

+1 −1
Original line number Diff line number Diff line
@@ -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