From 052424b3e26a6da894d741cc3df3658f1d6a6e2e Mon Sep 17 00:00:00 2001
From: Dana Walker <dawalker@redhat.com>
Date: Fri, 8 Nov 2019 09:29:55 -0500
Subject: [PATCH] Rename endpoints for content to be in plural form

For consistency, now:
modulemd -> modulemds
packageenvironmwent -> packageenvironments
packagecategory -> packagecategories
packagegroup -> packagegroups

closes #5679
https://pulp.plan.io/issues/5679
---
 CHANGES/5679.removal        | 8 ++++++++
 pulp_rpm/app/serializers.py | 6 +++---
 pulp_rpm/app/viewsets.py    | 8 ++++----
 3 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 CHANGES/5679.removal

diff --git a/CHANGES/5679.removal b/CHANGES/5679.removal
new file mode 100644
index 000000000..7d855cc6a
--- /dev/null
+++ b/CHANGES/5679.removal
@@ -0,0 +1,8 @@
+Rename endpoints for content to be in plural form consistently
+
+Endpoints removed -> added:
+
+/pulp/api/v3/content/rpm/modulemd/ -> /pulp/api/v3/content/rpm/modulemds/
+/pulp/api/v3/content/rpm/packagecategory/ -> /pulp/api/v3/content/rpm/packagecategories/
+/pulp/api/v3/content/rpm/packageenvironment/ -> /pulp/api/v3/content/rpm/packageenvironments/
+/pulp/api/v3/content/rpm/packagegroup/ -> /pulp/api/v3/content/rpm/packagegroups/
diff --git a/pulp_rpm/app/serializers.py b/pulp_rpm/app/serializers.py
index 899787f86..c3799c780 100644
--- a/pulp_rpm/app/serializers.py
+++ b/pulp_rpm/app/serializers.py
@@ -618,7 +618,7 @@ class PackageCategorySerializer(NoArtifactContentSerializer):
         required=False,
         queryset=PackageGroup.objects.all(),
         many=True,
-        view_name='content-rpm/packagegroup-detail'
+        view_name='content-rpm/packagegroups-detail'
     )
 
     class Meta:
@@ -676,7 +676,7 @@ class PackageEnvironmentSerializer(NoArtifactContentSerializer):
         required=False,
         queryset=PackageGroup.objects.all(),
         many=True,
-        view_name='content-rpm/packagegroup-detail'
+        view_name='content-rpm/packagegroups-detail'
     )
     optionalgroups = RelatedField(
         help_text=_("Groups optionally related to this Environment."),
@@ -684,7 +684,7 @@ class PackageEnvironmentSerializer(NoArtifactContentSerializer):
         required=False,
         queryset=PackageGroup.objects.all(),
         many=True,
-        view_name='content-rpm/packagegroup-detail'
+        view_name='content-rpm/packagegroups-detail'
     )
 
     class Meta:
diff --git a/pulp_rpm/app/viewsets.py b/pulp_rpm/app/viewsets.py
index 3691520fc..adf73be8e 100644
--- a/pulp_rpm/app/viewsets.py
+++ b/pulp_rpm/app/viewsets.py
@@ -244,7 +244,7 @@ class PackageGroupViewSet(ReadOnlyContentViewSet,
     PackageGroup ViewSet.
     """
 
-    endpoint_name = 'packagegroup'
+    endpoint_name = 'packagegroups'
     queryset = PackageGroup.objects.all()
     serializer_class = PackageGroupSerializer
 
@@ -255,7 +255,7 @@ class PackageCategoryViewSet(ReadOnlyContentViewSet,
     PackageCategory ViewSet.
     """
 
-    endpoint_name = 'packagecategory'
+    endpoint_name = 'packagecategories'
     queryset = PackageCategory.objects.all()
     serializer_class = PackageCategorySerializer
 
@@ -266,7 +266,7 @@ class PackageEnvironmentViewSet(ReadOnlyContentViewSet,
     PackageEnvironment ViewSet.
     """
 
-    endpoint_name = 'packageenvironment'
+    endpoint_name = 'packageenvironments'
     queryset = PackageEnvironment.objects.all()
     serializer_class = PackageEnvironmentSerializer
 
@@ -311,7 +311,7 @@ class ModulemdViewSet(SingleArtifactContentUploadViewSet):
     ViewSet for Modulemd.
     """
 
-    endpoint_name = 'modulemd'
+    endpoint_name = 'modulemds'
     queryset = Modulemd.objects.all()
     serializer_class = ModulemdSerializer