modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-02 10:20:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make _get_module consistent across resolvers

Browse Source 
This also adds additional code in the event a module is not
returned.
This commit is contained in:
mprahl
2019-04-22 12:40:14 -04:00
parent e72538b8b1
commit 3a7786c01b
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
module_build_service/resolver/DBResolver.py
View File

@@ -40,14 +40,18 @@ class DBResolver(GenericResolver):
def __init__(self, config):
self.config = config
def _get_module(self, name, stream, version, context, strict=False):
def _get_module(
self, name, stream, version, context, state=models.BUILD_STATES['ready'], strict=False,
):
with models.make_session(self.config) as session:
mb = models.ModuleBuild.get_build_from_nsvc(
session, name, stream, version, context)
if mb is None and strict:
session, name, stream, version, context, state=state)
if mb:
return mb.extended_json()
if strict:
raise UnprocessableEntity(
'Cannot find any module builds for %s:%s' % (name, stream))
return mb.extended_json()
def get_module_modulemds(self, name, stream, version=None, context=None, strict=False,
stream_version_lte=False):
@@ -68,6 +72,8 @@ class DBResolver(GenericResolver):
"""
if version and context:
mmd = self._get_module(name, stream, version, context, strict=strict)
if mmd is None:
return
return [self.extract_modulemd(mmd['modulemd'])]
with models.make_session(self.config) as session:

4
module_build_service/resolver/MBSResolver.py
View File

@@ -122,7 +122,9 @@ class MBSResolver(GenericResolver):
return modules
def _get_module(self, name, stream, version, context, state="ready", strict=False):
return self._get_modules(name, stream, version, context, state, strict)[0]
rv = self._get_modules(name, stream, version, context, state, strict)
if rv:
return rv[0]
def get_module_modulemds(self, name, stream, version=None, context=None, strict=False,
stream_version_lte=False):