fix: cleanup of vm definition handlers + whitespaces + comments (1b76925e) · Commits · Mirror / cc-node

ccnode/handlers.py

+23 −27

Original line number	Diff line number	Diff line
		@@ -2,16 +2,21 @@

		from logging import debug, error, warning, info
		from fnmatch import fnmatchcase
		from lvm import LVM
		from time import sleep
		from sjrpc.core import RpcError
		from sjrpc.utils import RpcHandler
		from sjrpc.utils import pure
		from errors import HypervisorError
		from errors import HostError, HypervisorError
		from common import LocalHost
		from jobs import ReceiveFileJob, SendFileJob
		from __init__ import __version__

		#FIXME should not be needed
		import traceback, sys
		from libvirt import libvirtError

		#FIXME clean this up
		_MOD_KVM = True
		try:
		import kvm
		@@ -574,46 +579,37 @@ class NodeHandler(RpcHandler):
		# VM management
		##################################

		###
		# Definition and migration of domains

		@pure
		def vm_define(self, data, format='xml'):
		'''
		'''
		info('server requested creation of a new VM')
		debug('description data is `%s`', data)
		if hasattr(self._host_handle, 'vm_define'):
		debug('request for creation of a new VM with data=`%s`', data)
		name = self._host_handle.vm_define(data)
		info('new VM has name `%s`', name)
		debug('new VM has name `%s`', name)
		return name
		else:
		raise NotImplementedError('host do not support VM creation')

		@pure
		def vm_undefine(self, name):
		'''
		'''
		info('server requested deletion of `%s`', name)
		if hasattr(self._host_handle, 'vm_get'):
		debug('request for deletion of VM definition named `%s`', name)
		vm = self._host_handle.vm_get(name)
		if hasattr(vm, 'undefine'):
		vm.undefine()
		else:
		raise NotImplementedError('VM object has not method `undefine`')
		else:
		raise NotImplementedError('host do not support ')
		debug('succesfully undefined VM `%s`', name)

		@pure
		def vm_export(self, name, format='xml'):
		'''
		'''
		info('server requested configuration of `%s`', name)
		if hasattr(self._host_handle, 'vm_get'):
		debug('request for definition data of VM `%s`', name)
		vm = self._host_handle.vm_get(name)
		if hasattr(vm, 'get_config'):
		return vm.get_config()
		else:
		raise NotImplementedError('VM object has not method `get_config`')
		else:
		raise NotImplementedError('host handler has not method `vm_get`')

		###
		# Life cycle control

		@pure
		def vm_stop(self, vm_names=None, force=False):