KojiClient improvements and fixes
ClosedPublic
Actions

Authored by kparal on Apr 28 2014, 9:32 AM.

Details

Reviewers

tflink
mkrizek
pschindl
jskladan

Commits

rLTRN004cfa8600ba: KojiClient improvements and fixes

Summary

create a default session in init() automatically if no external session provided
allow koji_url and pkg_url to be customized through config rather than hardcoded
remove unused variables

Test Plan

Tests pass.

Diff Detail

Lint

Lint Skipped

Unit

Unit Tests Skipped

Looks good

The docstrings aren't in sphinx style, but no issues with the code or the tests

The docstrings aren't in sphinx style, but no issues with the code or the tests

I promise I'll improve once D69 is pushed :-)

Closed by commit rLTRN004cfa8600ba (authored by @kparal).

Revision Contents

			Path
M			libtaskotron/koji_utils.py (40 lines)
M			testing/test_koji_utils.py (7 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	204	ab7377f		Apr 28 2014, 9:32 AM	★	★
Diff 2	205	884e494	Commit rLTRN004cfa8600ba749fd6fe0a8d7a70d0b6de134eec	Apr 28 2014, 3:19 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
f3845a933e14	23d160eb1441	ab7377f4ebf1	Kamil Páral	KojiClient improvements and fixes (Show More…)	Apr 25 2014, 5:30 PM

Diff 205

View Options

libtaskotron/koji_utils.py

1	# -- coding: utf-8 --	1	# -- coding: utf-8 --
2	# Copyright 2014, Red Hat, Inc.	2	# Copyright 2014, Red Hat, Inc.
3	# License: GNU General Public License version 2 or later	3	# License: GNU General Public License version 2 or later
4		4
5	''' Utility methods related to Koji '''	5	''' Utility methods related to Koji '''
6		6
7	import collections	7	import collections
8	import koji	8	import koji
9	import hawkey	9	import hawkey
10		10
11	from libtaskotron import file_utils	11	from libtaskotron import file_utils
12	from libtaskotron.logger import log	12	from libtaskotron.logger import log
13	from libtaskotron import exceptions as exc	13	from libtaskotron import exceptions as exc
14	from libtaskotron import rpm_utils	14	from libtaskotron import rpm_utils
		15	from libtaskotron import config
15		16
16	KOJI_URL = 'http://koji.fedoraproject.org/kojihub'
17	PKG_URL = 'http://kojipkgs.fedoraproject.org/packages'
18		17
19	class KojiClient(object):	18	class KojiClient(object):
20	def __init__(self, koji_session=None):	19	'''Helper Koji methods.
21	self.session = koji_session
22		20
23	def get_koji_session(self):	21	Note: You can access the standard Koji client (from @module koji) as
24	if self.session is None:	22	self.session.
25	self.session = koji.ClientSession(KOJI_URL)	23	'''
		24	def __init__(self, koji_session=None):
		25	'''Create a new KojiClient
		26	@param koji_session an existing Koji session (koji.ClientSession),
		27	or None if you want a new default session to be
		28	created
		29	'''
		30	self.session = (koji_session or
		31	koji.ClientSession(config.get_config().koji_url))
26		32
27	return self.session
28		33
29	def nvr_to_urls(self, nvr, arches=None, debuginfo=False, src=True):	34	def nvr_to_urls(self, nvr, arches=None, debuginfo=False, src=True):
30	'''Get list of URLs for RPMs corresponding to a build.	35	'''Get list of URLs for RPMs corresponding to a build.
31	@param nvr build NVR	36	@param nvr build NVR
32	@param arches restrict the arches of builds to provide URLs for. If	37	@param arches restrict the arches of builds to provide URLs for. If
33	basearch i386 is in the list, i686 arch is automatically	38	basearch i386 is in the list, i686 arch is automatically
34	added (since that's the arch Koji API uses).	39	added (since that's the arch Koji API uses).
35	'''	40	'''
36
37	log.info('Querying Koji for a list of RPMS for: %s', nvr)	41	log.info('Querying Koji for a list of RPMS for: %s', nvr)
38		42
39	ksession = self.get_koji_session()
40
41	# add i686 arch if i386 is present in arches	43	# add i686 arch if i386 is present in arches
42	if arches and 'i386' in arches and 'i686' not in arches:	44	if arches and 'i386' in arches and 'i686' not in arches:
43	arches.append('i686')	45	arches.append('i686')
44		46
45	info = ksession.getBuild(nvr)	47	info = self.session.getBuild(nvr)
46	if info is None:	48	if info is None:
47	raise exc.TaskotronRemoteError(	49	raise exc.TaskotronRemoteError(
48	"No build information found for %s" % nvr)	50	"No build information found for %s" % nvr)
49		51
50	baseurl = '/'.join((PKG_URL, info['package_name'],	52	baseurl = '/'.join((config.get_config().pkg_url, info['package_name'],
51	info['version'], info['release']))	53	info['version'], info['release']))
52		54
53	rpms = ksession.listRPMs(buildID=info['id'], arches=arches)	55	rpms = self.session.listRPMs(buildID=info['id'], arches=arches)
54	if not debuginfo:	56	if not debuginfo:
55	rpms = [r for r in rpms if not r['name'].endswith('-debuginfo')]	57	rpms = [r for r in rpms if not r['name'].endswith('-debuginfo')]
56	if not src:	58	if not src:
57	rpms = [r for r in rpms if not r['arch'] == 'src']	59	rpms = [r for r in rpms if not r['arch'] == 'src']
58		60
59	urls = ['%s/%s' % (baseurl, koji.pathinfo.rpm(r)) for r in rpms]	61	urls = ['%s/%s' % (baseurl, koji.pathinfo.rpm(r)) for r in rpms]
60	if len(urls) == 0:	62	if len(urls) == 0:
61	raise exc.TaskotronRemoteError('No RPMs found for %s' % nvr)	63	raise exc.TaskotronRemoteError('No RPMs found for %s' % nvr)
62		64
63	return sorted(urls)	65	return sorted(urls)
64		66
		67
65	def get_nvr_rpms(self, nvr, rpm_dir, arches=None, debuginfo=False,	68	def get_nvr_rpms(self, nvr, rpm_dir, arches=None, debuginfo=False,
66	src=False):	69	src=False):
67	'''Retrieve the RPMs associated with a build NVR into the specified	70	'''Retrieve the RPMs associated with a build NVR into the specified
68	directory.	71	directory.
69		72
70	@param nvr build NVR	73	@param nvr build NVR
71	@param rpm_dir location where to store the RPMs	74	@param rpm_dir location where to store the RPMs
72	@return list of local filenames of the grabbed RPMs	75	@return list of local filenames of the grabbed RPMs
73	@raise TaskotronRemoteError if downloading failed	76	@raise TaskotronRemoteError if downloading failed
74	'''	77	'''
75
76	rpm_urls = self.nvr_to_urls(nvr,	78	rpm_urls = self.nvr_to_urls(nvr,
77	arches=arches,	79	arches=arches,
78	debuginfo=debuginfo,	80	debuginfo=debuginfo,
79	src=src)	81	src=src)
80
81	rpm_files = []	82	rpm_files = []
82	log.info('Fetching RPMs for: %s', nvr)	83	log.info('Fetching RPMs for: %s', nvr)
83	for url in rpm_urls:	84	for url in rpm_urls:
84	log.info(' fetching %s', url)	85	log.info(' fetching %s', url)
85	rpm_file = file_utils.download(url, rpm_dir)	86	rpm_file = file_utils.download(url, rpm_dir)
86	rpm_files.append(rpm_file)	87	rpm_files.append(rpm_file)
87		88
88	return rpm_files	89	return rpm_files
89		90
		91
90	def get_tagged_rpms(self, tag, dest, arches):	92	def get_tagged_rpms(self, tag, dest, arches):
91	'''Downloads all RPMs of all NVRs tagged by a specific Koji tag.	93	'''Downloads all RPMs of all NVRs tagged by a specific Koji tag.
92	@dest destination directory	94	@dest destination directory
93	@arches list of architectures	95	@arches list of architectures
94	@raise TaskotronRemoteError if downloading failed	96	@raise TaskotronRemoteError if downloading failed
95	'''	97	'''
96	ksession = self.get_koji_session()	98	tag_data = self.session.listTagged(tag)
97	opts = {}
98	tag_data = ksession.listTagged(tag, **opts)
99
100	nvrs = ["%(nvr)s" % x for x in tag_data]	99	nvrs = ["%(nvr)s" % x for x in tag_data]
101	rpms = []	100	rpms = []
102	for nvr in nvrs:	101	for nvr in nvrs:
103	rpms.append(self.get_nvr_rpms(nvr, dest, arches))	102	rpms.append(self.get_nvr_rpms(nvr, dest, arches))
		103
104	return rpms	104	return rpms
105		105
106		106
107	def getNEVR(build):	107	def getNEVR(build):
108	'''Extract RPM version identifier in NEVR format from Koji build object	108	'''Extract RPM version identifier in NEVR format from Koji build object
109		109
110	@param build Koji buildinfo dictionary (as returned from @module koji	110	@param build Koji buildinfo dictionary (as returned from @module koji
111	methods like getBuild())	111	methods like getBuild())
Show All 16 Lines