mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 22:15:23 +00:00
Code Issues Releases Wiki Activity

[1369] omit optional parameters of ZoneFinder.find()

Browse Source
This commit is contained in:
JINMEI Tatuya
2011-12-06 15:25:52 -08:00
parent fd5713eae0
commit b7b90e5053
3 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/xfrin/tests/xfrin_test.py
View File

@@ -159,7 +159,7 @@ class MockDataSourceClient():
return (DataSourceClient.PARTIALMATCH, self) return (DataSourceClient.PARTIALMATCH, self)
raise ValueError('Unexpected input to mock client: bug in test case?') raise ValueError('Unexpected input to mock client: bug in test case?')
def find(self, name, rrtype, target, options): def find(self, name, rrtype, target=None, options=ZoneFinder.FIND_DEFAULT):
'''Mock ZoneFinder.find(). '''Mock ZoneFinder.find().
It returns the predefined SOA RRset to queries for SOA of the common It returns the predefined SOA RRset to queries for SOA of the common
@@ -1528,8 +1528,7 @@ class TestXFRSessionWithSQLite3(TestXfrinConnection):
def get_zone_serial(self): def get_zone_serial(self):
result, finder = self.conn._datasrc_client.find_zone(TEST_ZONE_NAME) result, finder = self.conn._datasrc_client.find_zone(TEST_ZONE_NAME)
self.assertEqual(DataSourceClient.SUCCESS, result) self.assertEqual(DataSourceClient.SUCCESS, result)
result, soa = finder.find(TEST_ZONE_NAME, RRType.SOA(), result, soa = finder.find(TEST_ZONE_NAME, RRType.SOA())
None, ZoneFinder.FIND_DEFAULT)
self.assertEqual(ZoneFinder.SUCCESS, result) self.assertEqual(ZoneFinder.SUCCESS, result)
self.assertEqual(1, soa.get_rdata_count()) self.assertEqual(1, soa.get_rdata_count())
return get_soa_serial(soa.get_rdata()[0]) return get_soa_serial(soa.get_rdata()[0])
@@ -1537,7 +1536,7 @@ class TestXFRSessionWithSQLite3(TestXfrinConnection):
def record_exist(self, name, type): def record_exist(self, name, type):
result, finder = self.conn._datasrc_client.find_zone(TEST_ZONE_NAME) result, finder = self.conn._datasrc_client.find_zone(TEST_ZONE_NAME)
self.assertEqual(DataSourceClient.SUCCESS, result) self.assertEqual(DataSourceClient.SUCCESS, result)
result, soa = finder.find(name, type, None, ZoneFinder.FIND_DEFAULT) result, soa = finder.find(name, type)
return result == ZoneFinder.SUCCESS return result == ZoneFinder.SUCCESS
def test_do_ixfrin_sqlite3(self): def test_do_ixfrin_sqlite3(self):

2
src/bin/xfrout/tests/xfrout_test.py.in
View File

@@ -95,7 +95,7 @@ class MockDataSrcClient:
return (isc.datasrc.DataSourceClient.NOTFOUND, None) return (isc.datasrc.DataSourceClient.NOTFOUND, None)
return (isc.datasrc.DataSourceClient.SUCCESS, self) return (isc.datasrc.DataSourceClient.SUCCESS, self)
def find(self, name, rrtype, target, options): def find(self, name, rrtype, target=None, options=ZoneFinder.FIND_DEFAULT):
'''Mock ZoneFinder.find(). '''Mock ZoneFinder.find().
(At the moment) this method only handles query for type SOA. (At the moment) this method only handles query for type SOA.

15
src/lib/python/isc/notify/notify_out.py
View File

@@ -284,14 +284,12 @@ class NotifyOut:
format_zone_str(zone_name, zone_class)) format_zone_str(zone_name, zone_class))
return [] return []
result, ns_rrset = finder.find(zone_name, RRType.NS(), None, result, ns_rrset = finder.find(zone_name, RRType.NS())
finder.FIND_DEFAULT)
if result is not finder.SUCCESS or ns_rrset is None: if result is not finder.SUCCESS or ns_rrset is None:
logger.warn(NOTIFY_OUT_ZONE_NO_NS, logger.warn(NOTIFY_OUT_ZONE_NO_NS,
format_zone_str(zone_name, zone_class)) format_zone_str(zone_name, zone_class))
return [] return []
result, soa_rrset = finder.find(zone_name, RRType.SOA(), None, result, soa_rrset = finder.find(zone_name, RRType.SOA())
finder.FIND_DEFAULT)
if result is not finder.SUCCESS or soa_rrset is None or \ if result is not finder.SUCCESS or soa_rrset is None or \
soa_rrset.get_rdata_count() != 1: soa_rrset.get_rdata_count() != 1:
logger.warn(NOTIFY_OUT_ZONE_BAD_SOA, logger.warn(NOTIFY_OUT_ZONE_BAD_SOA,
@@ -304,13 +302,11 @@ class NotifyOut:
ns_name = Name(ns_rdata.to_text()) ns_name = Name(ns_rdata.to_text())
if soa_mname == ns_name: if soa_mname == ns_name:
continue continue
result, rrset = finder.find(ns_name, RRType.A(), None, result, rrset = finder.find(ns_name, RRType.A())
finder.FIND_DEFAULT)
if result is finder.SUCCESS and rrset is not None: if result is finder.SUCCESS and rrset is not None:
addrs.extend([a.to_text() for a in rrset.get_rdata()]) addrs.extend([a.to_text() for a in rrset.get_rdata()])
result, rrset = finder.find(ns_name, RRType.AAAA(), None, result, rrset = finder.find(ns_name, RRType.AAAA())
finder.FIND_DEFAULT)
if result is finder.SUCCESS and rrset is not None: if result is finder.SUCCESS and rrset is not None:
addrs.extend([aaaa.to_text() for aaaa in rrset.get_rdata()]) addrs.extend([aaaa.to_text() for aaaa in rrset.get_rdata()])
@@ -504,8 +500,7 @@ class NotifyOut:
zone_name.to_text() + '/' + zone_name.to_text() + '/' +
zone_class.to_text() + ' not found') zone_class.to_text() + ' not found')
result, soa_rrset = finder.find(zone_name, RRType.SOA(), None, result, soa_rrset = finder.find(zone_name, RRType.SOA())
finder.FIND_DEFAULT)
if result is not finder.SUCCESS or soa_rrset is None or \ if result is not finder.SUCCESS or soa_rrset is None or \
soa_rrset.get_rdata_count() != 1: soa_rrset.get_rdata_count() != 1:
raise NotifyOutDataSourceError('_get_zone_soa: Zone ' + raise NotifyOutDataSourceError('_get_zone_soa: Zone ' +