bcourt's original mongoengine conversion work

pulp · Dec 2, 2015 · 944a05f · 944a05f
1 parent ae88cb4
commit 944a05f
Show file tree

Hide file tree

Showing 47 changed files with 1,800 additions and 1,416 deletions.
diff --git a/handlers/test/unit/handlers/test_repolib.py b/handlers/test/unit/handlers/test_repolib.py
diff --git a/plugins/pulp_rpm/plugins/catalogers/rhui.py b/plugins/pulp_rpm/plugins/catalogers/rhui.py
@@ -3,6 +3,7 @@
 from base64 import urlsafe_b64encode
 from contextlib import closing
 
+from pulp_rpm.common import ids
 from pulp_rpm.plugins.db import models
 from pulp_rpm.plugins.catalogers.yum import YumCataloger
 
@@ -32,7 +33,7 @@ def metadata(cls):
         return {
             'id': TYPE_ID,
             'display_name': "RHUI Cataloger",
-            'types': [models.RPM.TYPE]
+            'types': [ids.TYPE_ID_RPM]
         }
 
     def nectar_config(self, config):

diff --git a/plugins/pulp_rpm/plugins/catalogers/yum.py b/plugins/pulp_rpm/plugins/catalogers/yum.py
@@ -5,6 +5,7 @@
 from pulp.plugins.cataloger import Cataloger
 from pulp.server.content.sources import descriptor
 
+from pulp_rpm.common import ids
 from pulp_rpm.plugins.db import models
 from pulp_rpm.plugins.importers.yum.repomd.metadata import MetadataFiles
 from pulp_rpm.plugins.importers.yum.repomd import primary, nectar_factory
@@ -29,7 +30,7 @@ def metadata(cls):
         return {
             'id': TYPE_ID,
             'display_name': "Yum Cataloger",
-            'types': [models.RPM.TYPE]
+            'types': [ids.TYPE_ID_RPM]
         }
 
     @staticmethod
@@ -50,7 +51,7 @@ def _add_packages(conduit, base_url, md_files):
             for model in _packages:
                 unit_key = model.unit_key
                 url = urljoin(base_url, model.download_path)
-                conduit.add_entry(models.RPM.TYPE, unit_key, url)
+                conduit.add_entry(models.RPM.unit_type_id, unit_key, url)
         finally:
             fp.close()