Differential D602

using new testcloud interface to set per-instance hostnames. Fixes T622
ClosedPublic
Actions

Authored by tflink on Sep 25 2015, 6:17 PM.

Tags

None

Subscribers

Details

Reviewers

lbrabec
kparal
mkrizek
jskladan

Maniphest Tasks

T622: Make log messages from disposable clients unique to a specific client

Commits

rLTRN5d85ff637346: using new testcloud interface to set per-instance hostnames. Fixes T622

Summary

Uses new testcloud interface (D601) to set hostnames of disposable clients on a per-instance basis. Following existing convention (started with the log files) of using username to create hostname

Test Plan

ran locally with some tasks, works when testcloud patch is applied

Diff Detail

Repository

rLTRN libtaskotron

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

tflink retitled this revision from to using new testcloud interface to set per-instance hostnames. Fixes T622.Sep 25 2015, 6:17 PM

tflink updated this object.

tflink edited the test plan for this revision. (Show Details)

tflink added reviewers: kparal, mkrizek, jskladan, lbrabec.

tflink added a subscriber: roshi.

tflink added a task: T622: Make log messages from disposable clients unique to a specific client.Sep 25 2015, 6:17 PM

adding docstring to hostname variable

Haven't tested the patch but looks simple enough to say LGTM *s-word avoided*

This revision is now accepted and ready to land.Sep 25 2015, 6:45 PM

fixing reference for diff

This comment was removed by mkrizek.

Closed by commit rLTRN5d85ff637346: using new testcloud interface to set per-instance hostnames. Fixes T622 (authored by tflink). · Explain WhySep 30 2015, 7:27 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents

			Path	Packages
M			libtaskotron/vm.py (6 lines)

Diff 1569

libtaskotron/vm.py

1	# -- coding: utf-8 --	1		# -- coding: utf-8 --
2	# Copyright 2009-2015, Red Hat, Inc.	2		# Copyright 2009-2015, Red Hat, Inc.
3	# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+>	3		# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+>
4	# See the LICENSE file for more details on Licensing	4		# See the LICENSE file for more details on Licensing
5		5
6		6
7	"""Interface to locally spawned virtual machines that are used as disposable	7		"""Interface to locally spawned virtual machines that are used as disposable
8	clients for executing Taskotron tasks."""	8		clients for executing Taskotron tasks."""
9		9
10	from time import sleep, time	10		from time import sleep, time
11	import socket	11		import socket
		12		import getpass
12		13
13	from libtaskotron.logger import log	14		from libtaskotron.logger import log
14	import libtaskotron.exceptions as exc	15		import libtaskotron.exceptions as exc
15		16
16	from testcloud import instance, image, cli	17		from testcloud import instance, image, cli
17	from testcloud.exceptions import TestcloudInstanceError, TestcloudImageError	18		from testcloud.exceptions import TestcloudInstanceError, TestcloudImageError
18		19
19		20
Show All 19 Lines		31	Images/Fedora-Cloud-Base-22-20150521.x86_64.qcow2'
39	self.password = 'passw0rd'	40		self.password = 'passw0rd'
40		41
41	#: ip address of the remote machine (only set after prepared and spawned successfully)	42		#: ip address of the remote machine (only set after prepared and spawned successfully)
42	self.ipaddr = None	43		self.ipaddr = None
43		44
44	#: uuid of the task which spawned this instance	45		#: uuid of the task which spawned this instance
45	self.uuid = uuid	46		self.uuid = uuid
46		47
		48		#: hostname to use for spawned instance - based on username of current user
		49		self.hostname = 'taskotron-%s' % getpass.getuser()
		50
47	def _prepare_image(self):	51		def _prepare_image(self):
48	'''Use testcloud to prepare an image for local booting	52		'''Use testcloud to prepare an image for local booting
49	:raises TaskotronRemoteError: for errors in preparing the image with testcloud'''	53		:raises TaskotronRemoteError: for errors in preparing the image with testcloud'''
50		54
51	log.debug("preparing image {} for task {}".format(self.imageurl, self.uuid))	55		log.debug("preparing image {} for task {}".format(self.imageurl, self.uuid))
52	tc_image = None	56		tc_image = None
53		57
54	try:	58		try:
55	tc_image = image.Image(self.imageurl)	59		tc_image = image.Image(self.imageurl)
56	tc_image.prepare()	60		tc_image.prepare()
57	except TestcloudImageError, e:	61		except TestcloudImageError, e:
58	log.error(e)	62		log.error(e)
59	raise exc.TaskotronRemoteError("There was an error while preparing the "	63		raise exc.TaskotronRemoteError("There was an error while preparing the "
60	"testcloud image", e)	64		"testcloud image", e)
61		65
62	return tc_image	66		return tc_image
63		67
64	def _prepare_instance(self, tc_image):	68		def _prepare_instance(self, tc_image):
65	'''Prepare an instance for booting and boot it with testcloud'''	69		'''Prepare an instance for booting and boot it with testcloud'''
66	log.debug("preparing testcloud instance {}".format(self.instancename))	70		log.debug("preparing testcloud instance {}".format(self.instancename))
67	tc_instance = instance.Instance(self.instancename, tc_image)	71		tc_instance = instance.Instance(self.instancename, tc_image, hostname=self.hostname)
68	tc_instance.prepare()	72		tc_instance.prepare()
69		73
70	log.debug("spawning testcloud instance {}".format(self.instancename))	74		log.debug("spawning testcloud instance {}".format(self.instancename))
71	tc_instance.spawn_vm()	75		tc_instance.spawn_vm()
72		76
73	def _check_existing_instance(self, should_exist=False):	77		def _check_existing_instance(self, should_exist=False):
74	'''Check whether an instance with the same name already exists, raise errors if the result	78		'''Check whether an instance with the same name already exists, raise errors if the result
75	was not as expected.	79		was not as expected.
▲ Show 20 Lines • Show All 102 Lines • Show Last 20 Lines