openstack/designate
Code Issues Proposed changes

Merge "Return the correct recordsets total_count"

Browse Source
This commit is contained in:
Jenkins 2015-07-01 15:47:56 +00:00 committed by Gerrit Code Review
commit 5e9a2aa11b
2 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
designate/api/v2/controllers/recordsets.py
View File

@ -66,7 +66,6 @@ class RecordSetsController(rest.RestController):
criterion['domain_id'] = zone_id
# Data must be filtered separately, through the Records table
recordsets_with_data = set()
data = criterion.pop('data', None)
status = criterion.pop('status', None)
@ -78,16 +77,17 @@ class RecordSetsController(rest.RestController):
if data:
records = self.central_api.find_records(
context, criterion={'data': data, 'domain_id': zone_id})
recordsets_with_data.update(
[record.recordset_id for record in records])
recordset_with_data_ids = set(record.recordset_id
for record in records)
new_rsets = RecordSetList()
for recordset in recordsets:
if recordset.id in recordsets_with_data:
if recordset.id in recordset_with_data_ids:
new_rsets.append(recordset)
recordsets = new_rsets
recordsets.total_count = len(recordset_with_data_ids)
# 'status' filter param: only return recordsets with matching status
if status:

36
designate/tests/test_api/test_v2/test_recordsets.py
View File

@ -647,6 +647,42 @@ class ApiV2RecordSetsTest(ApiV2TestCase):
# Make sure total_count picked up the change
self.assertEqual(3, response.json['metadata']['total_count'])
def test_total_count_filtered_by_data(self):
# Closes bug 1447325
url = '/zones/%s/recordsets' % self.domain['id']
# Create a recordset
fixture = self.get_recordset_fixture(self.domain['name'], fixture=0)
response = self.client.post_json(
'/zones/%s/recordsets' % self.domain['id'], fixture)
response = self.client.get(url)
# Make sure total_count picked up the change
self.assertEqual(3, response.json['metadata']['total_count'])
url = '/zones/%s/recordsets?data=nyan' % self.domain['id']
response = self.client.get(url)
self.assertEqual(0, response.json['metadata']['total_count'])
url = '/zones/%s/recordsets?data=ns1.example.org.' % self.domain['id']
response = self.client.get(url)
self.assertEqual(1, response.json['metadata']['total_count'])
# Test paging
new_domain = self.create_domain(name='example.net.')
recordset = self.create_recordset(new_domain, 'A')
self.create_record(new_domain, recordset, data='nyan')
recordset = self.create_recordset(new_domain, 'CNAME')
self.create_record(new_domain, recordset, data='nyan')
# Even with paging enabled, total_count is still the total number of
# recordsets matching the "data" filter
url = '/zones/%s/recordsets?limit=1&data=nyan' % new_domain.id
response = self.client.get(url)
self.assertEqual(2, response.json['metadata']['total_count'])
def test_total_count_pagination(self):
# Create two recordsets
fixture = self.get_recordset_fixture(self.domain['name'], fixture=0)