Rename modulemd-defaults type

Rename modulemd-defaults to modulemd_defaults throughtout the type. This maintains consistency in use of underscore over dash. closes #5684 https://pulp.plan.io/issues/5684
pulp · Nov 12, 2019 · 5f80344 · 5f80344
1 parent 4416ab4
commit 5f80344
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/CHANGES/5684.misc b/CHANGES/5684.misc
@@ -0,0 +1,3 @@
+Rename modulemd-defaults type to modulemd_defaults
+
+For consistency, change from using a dash to an underscore in the name.
diff --git a/pulp_rpm/app/models.py b/pulp_rpm/app/models.py
@@ -1183,7 +1183,7 @@ class ModulemdDefaults(Content):
             Modulemd digest
     """
 
-    TYPE = "modulemd-defaults"
+    TYPE = "modulemd_defaults"
 
     module = models.CharField(max_length=255)
     stream = models.CharField(max_length=255)

diff --git a/pulp_rpm/app/modulemd.py b/pulp_rpm/app/modulemd.py
@@ -68,14 +68,14 @@ def parse_modulemd(module_names, module_index):
 
 def parse_defaults(module_index):
     """
-    Get modulemd-defaults.
+    Get modulemd_defaults.
 
     Args:
         module_index (mmdlib.ModuleIndex):
             libmodulemd index object
 
     Returns:
-        list of modulemd-defaults as dict
+        list of modulemd_defaults as dict
 
     """
     ret = list()

diff --git a/pulp_rpm/app/tasks/publishing.py b/pulp_rpm/app/tasks/publishing.py
@@ -318,7 +318,7 @@ def create_rempomd_xml(packages, publication, extra_repomdrecords, sub_folder=No
             pk__in=publication.repository_version.content):
         upd_xml.add_chunk(update_record_xml(update_record))
 
-    # Process modulemd and modulemd-defaults
+    # Process modulemd and modulemd_defaults
     with open(mod_yml_path, 'ab') as mod_yml:
         for modulemd in Modulemd.objects.filter(
                 pk__in=publication.repository_version.content):

diff --git a/pulp_rpm/tests/functional/constants.py b/pulp_rpm/tests/functional/constants.py
@@ -130,7 +130,7 @@
 
 RPM_MODULES_CONTENT_NAME = 'rpm.modulemd'
 
-RPM_MODULES_DEFAULTS_CONTENT_NAME = 'rpm.modulemd-defaults'
+RPM_MODULES_DEFAULTS_CONTENT_NAME = 'rpm.modulemd_defaults'
 
 RPM_ADVISORY_MODULAR_COUNT = 6