diff --git a/src/bin/xfrin/tests/xfrin_test.py b/src/bin/xfrin/tests/xfrin_test.py index eb2c747130..497ecd14b0 100644 --- a/src/bin/xfrin/tests/xfrin_test.py +++ b/src/bin/xfrin/tests/xfrin_test.py @@ -158,7 +158,7 @@ class MockDataSourceClient(): return (DataSourceClient.PARTIALMATCH, self) raise ValueError('Unexpected input to mock client: bug in test case?') - def find(self, name, rrtype, target=None, options=ZoneFinder.FIND_DEFAULT): + def find(self, name, rrtype, options=ZoneFinder.FIND_DEFAULT): '''Mock ZoneFinder.find(). It returns the predefined SOA RRset to queries for SOA of the common diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in index 1167befea0..18c9ed031d 100755 --- a/src/bin/xfrin/xfrin.py.in +++ b/src/bin/xfrin/xfrin.py.in @@ -584,7 +584,7 @@ class XfrinConnection(asyncore.dispatcher): if result != DataSourceClient.SUCCESS: return None result, soa_rrset = finder.find(self._zone_name, RRType.SOA(), - None, ZoneFinder.FIND_DEFAULT) + ZoneFinder.FIND_DEFAULT) if result != ZoneFinder.SUCCESS: logger.info(XFRIN_ZONE_NO_SOA, self.zone_str()) return None diff --git a/src/bin/xfrout/tests/xfrout_test.py.in b/src/bin/xfrout/tests/xfrout_test.py.in index ea4de27a18..2c7fab82f1 100644 --- a/src/bin/xfrout/tests/xfrout_test.py.in +++ b/src/bin/xfrout/tests/xfrout_test.py.in @@ -95,7 +95,7 @@ class MockDataSrcClient: return (isc.datasrc.DataSourceClient.NOTFOUND, None) return (isc.datasrc.DataSourceClient.SUCCESS, self) - def find(self, name, rrtype, target=None, options=ZoneFinder.FIND_DEFAULT): + def find(self, name, rrtype, options=ZoneFinder.FIND_DEFAULT): '''Mock ZoneFinder.find(). (At the moment) this method only handles query for type SOA. diff --git a/src/bin/xfrout/xfrout.py.in b/src/bin/xfrout/xfrout.py.in index 310a0aaca3..b536e4c4c1 100755 --- a/src/bin/xfrout/xfrout.py.in +++ b/src/bin/xfrout/xfrout.py.in @@ -336,7 +336,7 @@ class XfroutSession(): result, finder = self._datasrc_client.find_zone(zone_name) if result != DataSourceClient.SUCCESS: return (Rcode.NOTAUTH(), None) - result, soa_rrset = finder.find(zone_name, RRType.SOA(), None, + result, soa_rrset = finder.find(zone_name, RRType.SOA(), ZoneFinder.FIND_DEFAULT) if result != ZoneFinder.SUCCESS: return (Rcode.SERVFAIL(), None) diff --git a/src/lib/python/isc/datasrc/finder_python.cc b/src/lib/python/isc/datasrc/finder_python.cc index 5aa9c3eb9c..083b850a1b 100644 --- a/src/lib/python/isc/datasrc/finder_python.cc +++ b/src/lib/python/isc/datasrc/finder_python.cc @@ -59,17 +59,11 @@ PyObject* ZoneFinder_helper(ZoneFinder* finder, PyObject* args) { } PyObject* name; PyObject* rrtype; - PyObject* target = Py_None; unsigned int options_int = ZoneFinder::FIND_DEFAULT; - if (PyArg_ParseTuple(args, "O!O!|OI", &name_type, &name, + if (PyArg_ParseTuple(args, "O!O!|I", &name_type, &name, &rrtype_type, &rrtype, - &target, &options_int)) { + &options_int)) { try { - if (target != Py_None) { - PyErr_SetString(PyExc_TypeError, - "find(): target must be None in this version"); - return (NULL); - } ZoneFinder::FindOptions options = static_cast(options_int); const ZoneFinder::FindResult find_result( diff --git a/src/lib/python/isc/datasrc/tests/datasrc_test.py b/src/lib/python/isc/datasrc/tests/datasrc_test.py index 3e4a1d74c0..d0ab3f0228 100644 --- a/src/lib/python/isc/datasrc/tests/datasrc_test.py +++ b/src/lib/python/isc/datasrc/tests/datasrc_test.py @@ -279,7 +279,6 @@ class DataSrcClient(unittest.TestCase): result, rrset = finder.find(isc.dns.Name("www.example.com"), isc.dns.RRType.A(), - None, finder.FIND_DEFAULT) self.assertEqual(finder.SUCCESS, result) self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n", @@ -292,20 +291,8 @@ class DataSrcClient(unittest.TestCase): self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n", rrset.to_text()) - result, rrset = finder.find(isc.dns.Name("www.example.com"), - isc.dns.RRType.A(), None) - self.assertEqual(finder.SUCCESS, result) - self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n", - rrset.to_text()) - - # Invalid value for the "target" - self.assertRaises(TypeError, finder.find, - isc.dns.Name("www.example.com"), - isc.dns.RRType.A(), True) - result, rrset = finder.find(isc.dns.Name("www.sql1.example.com"), isc.dns.RRType.A(), - None, finder.FIND_DEFAULT) self.assertEqual(finder.DELEGATION, result) self.assertEqual("sql1.example.com. 3600 IN NS dns01.example.com.\n" + @@ -315,28 +302,24 @@ class DataSrcClient(unittest.TestCase): result, rrset = finder.find(isc.dns.Name("doesnotexist.example.com"), isc.dns.RRType.A(), - None, finder.FIND_DEFAULT) self.assertEqual(finder.NXDOMAIN, result) self.assertEqual(None, rrset) result, rrset = finder.find(isc.dns.Name("www.some.other.domain"), isc.dns.RRType.A(), - None, finder.FIND_DEFAULT) self.assertEqual(finder.NXDOMAIN, result) self.assertEqual(None, rrset) result, rrset = finder.find(isc.dns.Name("www.example.com"), isc.dns.RRType.TXT(), - None, finder.FIND_DEFAULT) self.assertEqual(finder.NXRRSET, result) self.assertEqual(None, rrset) result, rrset = finder.find(isc.dns.Name("cname-ext.example.com"), isc.dns.RRType.A(), - None, finder.FIND_DEFAULT) self.assertEqual(finder.CNAME, result) self.assertEqual( @@ -345,7 +328,6 @@ class DataSrcClient(unittest.TestCase): result, rrset = finder.find(isc.dns.Name("foo.wild.example.com"), isc.dns.RRType.A(), - None, finder.FIND_DEFAULT) self.assertEqual(finder.WILDCARD, result) self.assertEqual("foo.wild.example.com. 3600 IN A 192.0.2.255\n", @@ -353,7 +335,6 @@ class DataSrcClient(unittest.TestCase): result, rrset = finder.find(isc.dns.Name("foo.wild.example.com"), isc.dns.RRType.TXT(), - None, finder.FIND_DEFAULT) self.assertEqual(finder.WILDCARD_NXRRSET, result) self.assertEqual(None, rrset) @@ -361,17 +342,14 @@ class DataSrcClient(unittest.TestCase): self.assertRaises(TypeError, finder.find, "foo", isc.dns.RRType.A(), - None, finder.FIND_DEFAULT) self.assertRaises(TypeError, finder.find, isc.dns.Name("cname-ext.example.com"), "foo", - None, finder.FIND_DEFAULT) self.assertRaises(TypeError, finder.find, isc.dns.Name("cname-ext.example.com"), isc.dns.RRType.A(), - None, "foo") def test_find_previous(self): @@ -409,7 +387,6 @@ class DataSrcUpdater(unittest.TestCase): updater = dsc.get_updater(isc.dns.Name("example.com"), False) result, rrset = updater.find(isc.dns.Name("www.example.com"), isc.dns.RRType.A(), - None, ZoneFinder.FIND_DEFAULT) self.assertEqual(ZoneFinder.SUCCESS, result) self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n", @@ -422,17 +399,6 @@ class DataSrcUpdater(unittest.TestCase): self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n", rrset.to_text()) - result, rrset = updater.find(isc.dns.Name("www.example.com"), - isc.dns.RRType.A(), None) - self.assertEqual(ZoneFinder.SUCCESS, result) - self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n", - rrset.to_text()) - - # Invalid value for 'target' - self.assertRaises(TypeError, updater.find, - isc.dns.Name("www.example.com"), - isc.dns.RRType.A(), 1) - def test_update_delete_commit(self): dsc = isc.datasrc.DataSourceClient("sqlite3", WRITE_ZONE_DB_CONFIG) @@ -445,7 +411,6 @@ class DataSrcUpdater(unittest.TestCase): result, rrset = finder.find(isc.dns.Name("www.example.com"), isc.dns.RRType.A(), - None, finder.FIND_DEFAULT) self.assertEqual(finder.SUCCESS, result) self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n", @@ -467,14 +432,12 @@ class DataSrcUpdater(unittest.TestCase): # finder (since we have not committed) result, rrset = updater.find(isc.dns.Name("www.example.com"), isc.dns.RRType.A(), - None, finder.FIND_DEFAULT) self.assertEqual(finder.NXDOMAIN, result) self.assertEqual(None, rrset) result, rrset = finder.find(isc.dns.Name("www.example.com"), isc.dns.RRType.A(), - None, finder.FIND_DEFAULT) self.assertEqual(finder.SUCCESS, result) self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n", @@ -487,7 +450,6 @@ class DataSrcUpdater(unittest.TestCase): # the record should be gone now in the 'real' finder as well result, rrset = finder.find(isc.dns.Name("www.example.com"), isc.dns.RRType.A(), - None, finder.FIND_DEFAULT) self.assertEqual(finder.NXDOMAIN, result) self.assertEqual(None, rrset) @@ -502,7 +464,6 @@ class DataSrcUpdater(unittest.TestCase): result, rrset = finder.find(isc.dns.Name("www.example.com"), isc.dns.RRType.A(), - None, finder.FIND_DEFAULT) self.assertEqual(finder.SUCCESS, result) self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n", @@ -527,7 +488,6 @@ class DataSrcUpdater(unittest.TestCase): self.assertEqual("example.com.", finder.get_origin().to_text()) result, rrset = finder.find(isc.dns.Name("www.example.com"), isc.dns.RRType.A(), - None, finder.FIND_DEFAULT) self.assertEqual(finder.SUCCESS, result) self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n", @@ -551,7 +511,6 @@ class DataSrcUpdater(unittest.TestCase): result, rrset = finder.find(isc.dns.Name("www.example.com"), isc.dns.RRType.A(), - None, finder.FIND_DEFAULT) self.assertEqual(finder.SUCCESS, result) self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n", @@ -573,7 +532,6 @@ class DataSrcUpdater(unittest.TestCase): # finder (since we have not committed) result, rrset = updater.find(isc.dns.Name("www.example.com"), isc.dns.RRType.A(), - None, finder.FIND_DEFAULT) self.assertEqual(finder.NXDOMAIN, result) self.assertEqual(None, rrset) @@ -584,7 +542,6 @@ class DataSrcUpdater(unittest.TestCase): # the record should still be available in the 'real' finder as well result, rrset = finder.find(isc.dns.Name("www.example.com"), isc.dns.RRType.A(), - None, finder.FIND_DEFAULT) self.assertEqual(finder.SUCCESS, result) self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n",