Fix content-delivery-repo list ordering

product-definition-center · Aug 7, 2017 · 93cfd26 · 93cfd26
1 parent 1ca310c
commit 93cfd26
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/pdc_client/plugins/repo.py b/pdc_client/plugins/repo.py
@@ -25,6 +25,18 @@
     ("product_id", "Product ID"),
 ]
 
+_ORDERING = [
+    'variant_arch__variant__release__release_id',
+    'variant_arch__variant__variant_uid',
+    'variant_arch__arch__name',
+    'service',
+    'repo_family',
+    'content_format',
+    'content_category',
+    'shadow',
+    'name'
+]
+
 
 class RepoPlugin(PDCClientPlugin):
     command = 'content-delivery-repo'
@@ -135,9 +147,8 @@ def repo_list(self, args, data=None):
         filters = extract_arguments(args, prefix='filter_')
         if not filters and not data:
             self.subparsers.choices.get('list').error('At least some filter must be used.')
-        # TODO: enable ordering; can't be done due to lack of functionality on server
-        # filters["ordering"] = ["release_id", "variant_uid", "arch", "service", "repo_family", "content_format", "content_category", "shadow", "name"]
-        repos = data or self.client.get_paged(self.client['content-delivery-repos']._, **filters)
+        ordering = ','.join(_ORDERING)
+        repos = data or self.client.get_paged(self.client['content-delivery-repos']._, ordering=ordering, **filters)
 
         if args.json:
             print(self.to_json(list(repos)))

diff --git a/tests/repo/tests.py b/tests/repo/tests.py
@@ -43,17 +43,23 @@ def test_list(self, api):
         self._setup_list(api)
         with self.expect_output('list.txt'):
             self.runner.run(['content-delivery-repo', 'list', '--content-format', 'iso'])
-        self.assertEqual(api.calls['content-delivery-repos'],
-                         [('GET', {'page': 1, 'content_format': 'iso'}),
-                          ('GET', {'page': 2, 'content_format': 'iso'})])
+        result = api.calls['content-delivery-repos']
+        # Skip checking 'ordering'.
+        ordering = result[0][1]['ordering']
+        self.assertEqual(result,
+                         [('GET', {'page': 1, 'content_format': 'iso', 'ordering': ordering}),
+                          ('GET', {'page': 2, 'content_format': 'iso', 'ordering': ordering})])
 
     def test_list_json(self, api):
         self._setup_list(api)
         with self.expect_output('list.json', parse_json=True):
             self.runner.run(['--json', 'content-delivery-repo', 'list', '--content-format', 'iso'])
-        self.assertEqual(api.calls['content-delivery-repos'],
-                         [('GET', {'page': 1, 'content_format': 'iso'}),
-                          ('GET', {'page': 2, 'content_format': 'iso'})])
+        result = api.calls['content-delivery-repos']
+        # Skip checking 'ordering'.
+        ordering = result[0][1]['ordering']
+        self.assertEqual(result,
+                         [('GET', {'page': 1, 'content_format': 'iso', 'ordering': ordering}),
+                          ('GET', {'page': 2, 'content_format': 'iso', 'ordering': ordering})])
 
     def _setup_detail(self, api):
         self.repo_detail = {