Promote resolver._get_module to a public method

This commit is contained in:
mprahl
2019-07-02 10:45:31 -04:00
parent 1585d6b97c
commit db03f0a7f5
5 changed files with 11 additions and 7 deletions

View File

@@ -42,7 +42,7 @@ class DBResolver(GenericResolver):
def __init__(self, config):
self.config = config
def _get_module(
def get_module(
self, name, stream, version, context, state=models.BUILD_STATES["ready"], strict=False
):
with models.make_session(self.config) as session:
@@ -114,7 +114,7 @@ class DBResolver(GenericResolver):
:return: List of Modulemd metadata instances matching the query
"""
if version and context:
mmd = self._get_module(name, stream, version, context, strict=strict)
mmd = self.get_module(name, stream, version, context, strict=strict)
if mmd is None:
return
return [load_mmd(mmd["modulemd"])]

View File

@@ -121,7 +121,7 @@ class MBSResolver(GenericResolver):
else:
return modules
def _get_module(self, name, stream, version, context, state="ready", strict=False):
def get_module(self, name, stream, version, context, state="ready", strict=False):
rv = self._get_modules(name, stream, version, context, state, strict)
if rv:
return rv[0]
@@ -335,7 +335,7 @@ class MBSResolver(GenericResolver):
if mmd:
queried_mmd = mmd
else:
queried_module = self._get_module(name, stream, version, context, strict=strict)
queried_module = self.get_module(name, stream, version, context, strict=strict)
yaml = queried_module["modulemd"]
queried_mmd = load_mmd(yaml)
@@ -419,7 +419,7 @@ class MBSResolver(GenericResolver):
commit_hash = None
version = None
filtered_rpms = []
module = self._get_module(
module = self.get_module(
module_name, module_stream, module_version, module_context, strict=True
)
if module.get("modulemd"):

View File

@@ -98,6 +98,10 @@ class GenericResolver(six.with_metaclass(ABCMeta)):
return False
@abstractmethod
def get_module(self, name, stream, version, context, state="ready", strict=False):
raise NotImplementedError()
@abstractmethod
def get_module_count(self, **kwargs):
raise NotImplementedError()

View File

@@ -279,7 +279,7 @@ def find_module_built_rpms(modules_nsvc):
for nsvc in modules_nsvc:
name, stream, version, context = nsvc.split(":")
module = resolver._get_module(name, stream, version, context, strict=True)
module = resolver.get_module(name, stream, version, context, strict=True)
rpms = koji_session.listTaggedRPMS(module["koji_tag"], latest=True)[0]
built_rpms.extend(kobo.rpmlib.make_nvr(rpm, force_epoch=True) for rpm in rpms)

View File

@@ -307,7 +307,7 @@ class TestRecordStreamCollisionModules:
}["{}:{}:{}:{}".format(name, stream, version, context)]
resolver = resolver_create.return_value
resolver._get_module.side_effect = mock_get_module
resolver.get_module.side_effect = mock_get_module
def mock_listTaggedRPMS(tag, latest):
return {