Unify access to ubiconfig in Matcher subclasses

Previously methods of ModularMatcher class accessed ubiconfig via
ubiconfig.modules, but RpmMatcher used ubiconfig directly.
So let's unify the access and use ubiconfig directly also
in ModularMatcher.

tests/test_matcher.py

@@ -282,7 +282,7 @@ def test_search_moludemds(pulp):
 
 def test_modular_rpms_filenames(ubi_config):
     """Test getting filename from module artifacts, srpms are skipped."""
-    matcher = ModularMatcher(None, ubi_config.modules)
+    matcher = ModularMatcher(None, ubi_config)
     unit = UbiUnit(
         ModulemdUnit(
             name="test",
@@ -311,7 +311,7 @@ def test_modular_rpms_filenames(ubi_config):
 
 def test_modular_rpms_filenames_per_profiles(ubi_config):
     """Test getting filename from module artifacts, limited by profiles"""
-    matcher = ModularMatcher(None, ubi_config.modules)
+    matcher = ModularMatcher(None, ubi_config)
     unit = UbiUnit(
         ModulemdUnit(
             name="fake_name",
@@ -345,7 +345,7 @@ def test_modular_rpms_filenames_per_profiles(ubi_config):
 
 def test_modular_rpms_filenames_per_profiles_missing_profile(ubi_config):
     """Test getting filename from module artifacts, request for non-existing profile in modulemd"""
-    matcher = ModularMatcher(None, ubi_config.modules)
+    matcher = ModularMatcher(None, ubi_config)
     unit = UbiUnit(
         ModulemdUnit(
             name="fake_name",
@@ -480,7 +480,7 @@ def test_get_modulemd_output_set():
 
 def test_get_modulemds_criteria(ubi_config):
     """Test proper creation of criteria for modulemds query"""
-    matcher = ModularMatcher(None, ubi_config.modules)
+    matcher = ModularMatcher(None, ubi_config)
     criteria = matcher._get_modulemds_criteria()
     # there should be 1 criterium created based on ubi config
     assert len(criteria) == 1
@@ -492,7 +492,7 @@ def test_get_modulemds_criteria(ubi_config):
 
 def test_get_modular_srpms_criteria(ubi_config):
     """Testing creation of criteria for srpms query"""
-    matcher = ModularMatcher(None, ubi_config.modules)
+    matcher = ModularMatcher(None, ubi_config)
     unit_1 = UbiUnit(
         RpmUnit(
             name="test",
@@ -530,7 +530,7 @@ def test_get_modular_srpms_criteria(ubi_config):
 
 def test_get_modular_rpms_criteria(ubi_config):
     """Test creation of criteria for rpms query"""
-    matcher = ModularMatcher(None, ubi_config.modules)
+    matcher = ModularMatcher(None, ubi_config)
     unit = UbiUnit(
         ModulemdUnit(
             name="test",
@@ -622,7 +622,7 @@ def test_modular_matcher_run(pulp, ubi_config):
     pulp.insert_units(repo_3, [unit_3])
 
     repos_set = RepoSet(rpm=[repo_1], debug=[repo_2], source=[repo_3])
-    matcher = ModularMatcher(repos_set, ubi_config.modules)
+    matcher = ModularMatcher(repos_set, ubi_config)
     matcher.run()
 
     # each public attribute is properly set with one unit

ubipop/__init__.py

@@ -525,7 +525,7 @@ def run_ubi_population(self):
         ) = self._get_current_content()
 
         # start async querying for modulemds and modular and non-modular packages
-        mm = ModularMatcher(self.repos.in_repos, self.ubiconfig.modules).run()
+        mm = ModularMatcher(self.repos.in_repos, self.ubiconfig).run()
         rm = RpmMatcher(self.repos.in_repos, self.ubiconfig).run()
 
         self.repos.modules = mm.modules

ubipop/_matcher.py

@@ -222,7 +222,7 @@ def _get_modular_rpms_criteria(self):
 
     def _get_modulemds_criteria(self):
         criteria_values = []
-        for module in self._ubi_config:
+        for module in self._ubi_config.modules:
             criteria_values.append(
                 (
                     module.name,
@@ -267,7 +267,7 @@ def _keep_n_latest_modules(self, modules, n=1):
     def _modular_rpms_filenames(self, modules):
         config_map = {}
 
-        for module_config in self._ubi_config:
+        for module_config in self._ubi_config.modules:
             key = module_config.name + module_config.stream
             config_map[key] = module_config.profiles