enforce return of None in Host handler (1d04de9e) · Commits · Mirror / cc-node

ccnode/common.py

+61 −12

Original line number	Diff line number	Diff line
		@@ -134,7 +134,14 @@ class LocalHost(Host):
		def get_loadavg(self):
		'''
		'''
		return ' '.join('%.2f' % load for load in os.getloadavg())
		load = None
		try:
		data = ' '.join('%.2f' % load for load in os.getloadavg())
		if data:
		load = data
		except:
		pass
		return load

		def get_arch(self):
		'''
		@@ -151,27 +158,62 @@ class LocalHost(Host):
		def get_cpu(self):
		'''
		'''
		return cpu_count()
		cpucount = None
		try:
		data = cpu_count()
		if data:
		cpucount = data
		except:
		pass
		return cpucount

		def get_cpu_usage(self):
		'''
		'''
		return '%.1f' % psutil.cpu_percent()
		usage = None
		try:
		data = '%.1f' % psutil.cpu_percent()
		if data:
		usage = data
		except:
		pass
		return usage

		def get_mem(self):
		'''
		'''
		return psutil.avail_phymem() + psutil.used_phymem()
		mem = None
		try:
		data = psutil.avail_phymem() + psutil.used_phymem()
		if data:
		mem = data
		except:
		pass
		return mem

		def get_mem_free(self):
		'''
		'''
		return psutil.avail_phymem()
		free = None
		try:
		data = psutil.avail_phymem()
		if data:
		free = data
		except:
		pass
		return free

		def get_mem_used(self):
		'''
		'''
		return psutil.used_phymem()
		used = None
		try:
		data = psutil.used_phymem()
		if data:
		used = data
		except:
		pass
		return used

		def get_disks(self):
		'''
		@@ -213,12 +255,19 @@ class LocalHost(Host):
		def execute(self, command):
		'''
		'''
		output = None
		try:
		#FIXME: stop using shell=true and parse arguments with shlex.split()
		return Popen(command, shell=True,
		data = Popen(command, shell=True,
		bufsize=-1,
		stdin=PIPE,
		stdout=PIPE,
		stderr=PIPE).communicate()
		if data:
		output = data
		except:
		pass
		return output


		class Hypervisor(LocalHost):