From 94f18defa02be8f9b062fd3ab7ab0f3446311d14 Mon Sep 17 00:00:00 2001 From: "sonu.kumar" Date: Wed, 21 Oct 2015 09:49:26 +0530 Subject: [PATCH] Fixes Output for zone type filter Closes-Bug: #1506742 Change-Id: Ifd6269fef1061da3fdc5ececd103a79789b9473f --- designate/api/v2/controllers/zones/__init__.py | 3 ++- designate/tests/test_api/test_v2/test_zones.py | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/designate/api/v2/controllers/zones/__init__.py b/designate/api/v2/controllers/zones/__init__.py index 90988138c..2e55955c5 100644 --- a/designate/api/v2/controllers/zones/__init__.py +++ b/designate/api/v2/controllers/zones/__init__.py @@ -62,7 +62,8 @@ class ZonesController(rest.RestController): params, self.SORT_KEYS) # Extract any filter params. - accepted_filters = ('name', 'email', 'status', 'description', 'ttl', ) + accepted_filters = ('name', 'type', 'email', 'status', + 'description', 'ttl', ) criterion = self._apply_filter_params( params, accepted_filters, {}) diff --git a/designate/tests/test_api/test_v2/test_zones.py b/designate/tests/test_api/test_v2/test_zones.py index 45965e977..4b3306ea9 100644 --- a/designate/tests/test_api/test_v2/test_zones.py +++ b/designate/tests/test_api/test_v2/test_zones.py @@ -685,6 +685,9 @@ class ApiV2ZonesTest(ApiV2TestCase): response = self.client.post_json('/zones/', fixture) get_urls = [ + # Filter by Type + '/zones?type=%s' % fixtures[0]['type'], + # Filter by Name '/zones?name=%s' % fixtures[0]['name'], @@ -700,7 +703,7 @@ class ApiV2ZonesTest(ApiV2TestCase): '/zones?description=test*' ] - correct_results = [1, 2, 1, 1, 1, 2] + correct_results = [2, 1, 2, 1, 1, 1, 2] for get_url, correct_result in zip(get_urls, correct_results): @@ -714,6 +717,6 @@ class ApiV2ZonesTest(ApiV2TestCase): self.assertEqual(correct_result, len(response.json['zones'])) def test_invalid_zones_filter(self): - invalid_url = '/zones?type=PRIMARY' + invalid_url = '/zones?id=155477ef-e6c5-4b94-984d-8fc68c0c1a14' self._assert_exception( 'bad_request', 400, self.client.get, invalid_url)