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

[1484] Removed target parameter from python binding

Browse Source 
It was removed in the C++ version and returning something through a
parameter in python is wrong anyway.
This commit is contained in:
Michal 'vorner' Vaner
2011-12-19 11:12:12 +01:00
parent 424113eeeb
commit 855f42784d
6 changed files with 6 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,7 +158,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=None, options=ZoneFinder.FIND_DEFAULT): def find(self, name, rrtype, 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

2
src/bin/xfrin/xfrin.py.in
View File

@@ -584,7 +584,7 @@ class XfrinConnection(asyncore.dispatcher):
if result != DataSourceClient.SUCCESS: if result != DataSourceClient.SUCCESS:
return None return None
result, soa_rrset = finder.find(self._zone_name, RRType.SOA(), result, soa_rrset = finder.find(self._zone_name, RRType.SOA(),
None, ZoneFinder.FIND_DEFAULT) ZoneFinder.FIND_DEFAULT)
if result != ZoneFinder.SUCCESS: if result != ZoneFinder.SUCCESS:
logger.info(XFRIN_ZONE_NO_SOA, self.zone_str()) logger.info(XFRIN_ZONE_NO_SOA, self.zone_str())
return None return None

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=None, options=ZoneFinder.FIND_DEFAULT): def find(self, name, rrtype, 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.

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

@@ -336,7 +336,7 @@ class XfroutSession():
result, finder = self._datasrc_client.find_zone(zone_name) result, finder = self._datasrc_client.find_zone(zone_name)
if result != DataSourceClient.SUCCESS: if result != DataSourceClient.SUCCESS:
return (Rcode.NOTAUTH(), None) 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) ZoneFinder.FIND_DEFAULT)
if result != ZoneFinder.SUCCESS: if result != ZoneFinder.SUCCESS:
return (Rcode.SERVFAIL(), None) return (Rcode.SERVFAIL(), None)

10
src/lib/python/isc/datasrc/finder_python.cc
View File

@@ -59,17 +59,11 @@ PyObject* ZoneFinder_helper(ZoneFinder* finder, PyObject* args) {
} }
PyObject* name; PyObject* name;
PyObject* rrtype; PyObject* rrtype;
PyObject* target = Py_None;
unsigned int options_int = ZoneFinder::FIND_DEFAULT; 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, &rrtype_type, &rrtype,
&target, &options_int)) { &options_int)) {
try { try {
if (target != Py_None) {
PyErr_SetString(PyExc_TypeError,
"find(): target must be None in this version");
return (NULL);
}
ZoneFinder::FindOptions options = ZoneFinder::FindOptions options =
static_cast<ZoneFinder::FindOptions>(options_int); static_cast<ZoneFinder::FindOptions>(options_int);
const ZoneFinder::FindResult find_result( const ZoneFinder::FindResult find_result(

43
src/lib/python/isc/datasrc/tests/datasrc_test.py
View File

@@ -279,7 +279,6 @@ class DataSrcClient(unittest.TestCase):
result, rrset = finder.find(isc.dns.Name("www.example.com"), result, rrset = finder.find(isc.dns.Name("www.example.com"),
isc.dns.RRType.A(), isc.dns.RRType.A(),
None,
finder.FIND_DEFAULT) finder.FIND_DEFAULT)
self.assertEqual(finder.SUCCESS, result) self.assertEqual(finder.SUCCESS, result)
self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n", 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", self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n",
rrset.to_text()) 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"), result, rrset = finder.find(isc.dns.Name("www.sql1.example.com"),
isc.dns.RRType.A(), isc.dns.RRType.A(),
None,
finder.FIND_DEFAULT) finder.FIND_DEFAULT)
self.assertEqual(finder.DELEGATION, result) self.assertEqual(finder.DELEGATION, result)
self.assertEqual("sql1.example.com. 3600 IN NS dns01.example.com.\n" + 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"), result, rrset = finder.find(isc.dns.Name("doesnotexist.example.com"),
isc.dns.RRType.A(), isc.dns.RRType.A(),
None,
finder.FIND_DEFAULT) finder.FIND_DEFAULT)
self.assertEqual(finder.NXDOMAIN, result) self.assertEqual(finder.NXDOMAIN, result)
self.assertEqual(None, rrset) self.assertEqual(None, rrset)
result, rrset = finder.find(isc.dns.Name("www.some.other.domain"), result, rrset = finder.find(isc.dns.Name("www.some.other.domain"),
isc.dns.RRType.A(), isc.dns.RRType.A(),
None,
finder.FIND_DEFAULT) finder.FIND_DEFAULT)
self.assertEqual(finder.NXDOMAIN, result) self.assertEqual(finder.NXDOMAIN, result)
self.assertEqual(None, rrset) self.assertEqual(None, rrset)
result, rrset = finder.find(isc.dns.Name("www.example.com"), result, rrset = finder.find(isc.dns.Name("www.example.com"),
isc.dns.RRType.TXT(), isc.dns.RRType.TXT(),
None,
finder.FIND_DEFAULT) finder.FIND_DEFAULT)
self.assertEqual(finder.NXRRSET, result) self.assertEqual(finder.NXRRSET, result)
self.assertEqual(None, rrset) self.assertEqual(None, rrset)
result, rrset = finder.find(isc.dns.Name("cname-ext.example.com"), result, rrset = finder.find(isc.dns.Name("cname-ext.example.com"),
isc.dns.RRType.A(), isc.dns.RRType.A(),
None,
finder.FIND_DEFAULT) finder.FIND_DEFAULT)
self.assertEqual(finder.CNAME, result) self.assertEqual(finder.CNAME, result)
self.assertEqual( self.assertEqual(
@@ -345,7 +328,6 @@ class DataSrcClient(unittest.TestCase):
result, rrset = finder.find(isc.dns.Name("foo.wild.example.com"), result, rrset = finder.find(isc.dns.Name("foo.wild.example.com"),
isc.dns.RRType.A(), isc.dns.RRType.A(),
None,
finder.FIND_DEFAULT) finder.FIND_DEFAULT)
self.assertEqual(finder.WILDCARD, result) self.assertEqual(finder.WILDCARD, result)
self.assertEqual("foo.wild.example.com. 3600 IN A 192.0.2.255\n", 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"), result, rrset = finder.find(isc.dns.Name("foo.wild.example.com"),
isc.dns.RRType.TXT(), isc.dns.RRType.TXT(),
None,
finder.FIND_DEFAULT) finder.FIND_DEFAULT)
self.assertEqual(finder.WILDCARD_NXRRSET, result) self.assertEqual(finder.WILDCARD_NXRRSET, result)
self.assertEqual(None, rrset) self.assertEqual(None, rrset)
@@ -361,17 +342,14 @@ class DataSrcClient(unittest.TestCase):
self.assertRaises(TypeError, finder.find, self.assertRaises(TypeError, finder.find,
"foo", "foo",
isc.dns.RRType.A(), isc.dns.RRType.A(),
None,
finder.FIND_DEFAULT) finder.FIND_DEFAULT)
self.assertRaises(TypeError, finder.find, self.assertRaises(TypeError, finder.find,
isc.dns.Name("cname-ext.example.com"), isc.dns.Name("cname-ext.example.com"),
"foo", "foo",
None,
finder.FIND_DEFAULT) finder.FIND_DEFAULT)
self.assertRaises(TypeError, finder.find, self.assertRaises(TypeError, finder.find,
isc.dns.Name("cname-ext.example.com"), isc.dns.Name("cname-ext.example.com"),
isc.dns.RRType.A(), isc.dns.RRType.A(),
None,
"foo") "foo")
def test_find_previous(self): def test_find_previous(self):
@@ -409,7 +387,6 @@ class DataSrcUpdater(unittest.TestCase):
updater = dsc.get_updater(isc.dns.Name("example.com"), False) updater = dsc.get_updater(isc.dns.Name("example.com"), False)
result, rrset = updater.find(isc.dns.Name("www.example.com"), result, rrset = updater.find(isc.dns.Name("www.example.com"),
isc.dns.RRType.A(), isc.dns.RRType.A(),
None,
ZoneFinder.FIND_DEFAULT) ZoneFinder.FIND_DEFAULT)
self.assertEqual(ZoneFinder.SUCCESS, result) self.assertEqual(ZoneFinder.SUCCESS, result)
self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n", 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", self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n",
rrset.to_text()) 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): def test_update_delete_commit(self):
dsc = isc.datasrc.DataSourceClient("sqlite3", WRITE_ZONE_DB_CONFIG) 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"), result, rrset = finder.find(isc.dns.Name("www.example.com"),
isc.dns.RRType.A(), isc.dns.RRType.A(),
None,
finder.FIND_DEFAULT) finder.FIND_DEFAULT)
self.assertEqual(finder.SUCCESS, result) self.assertEqual(finder.SUCCESS, result)
self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n", 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) # finder (since we have not committed)
result, rrset = updater.find(isc.dns.Name("www.example.com"), result, rrset = updater.find(isc.dns.Name("www.example.com"),
isc.dns.RRType.A(), isc.dns.RRType.A(),
None,
finder.FIND_DEFAULT) finder.FIND_DEFAULT)
self.assertEqual(finder.NXDOMAIN, result) self.assertEqual(finder.NXDOMAIN, result)
self.assertEqual(None, rrset) self.assertEqual(None, rrset)
result, rrset = finder.find(isc.dns.Name("www.example.com"), result, rrset = finder.find(isc.dns.Name("www.example.com"),
isc.dns.RRType.A(), isc.dns.RRType.A(),
None,
finder.FIND_DEFAULT) finder.FIND_DEFAULT)
self.assertEqual(finder.SUCCESS, result) self.assertEqual(finder.SUCCESS, result)
self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n", 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 # the record should be gone now in the 'real' finder as well
result, rrset = finder.find(isc.dns.Name("www.example.com"), result, rrset = finder.find(isc.dns.Name("www.example.com"),
isc.dns.RRType.A(), isc.dns.RRType.A(),
None,
finder.FIND_DEFAULT) finder.FIND_DEFAULT)
self.assertEqual(finder.NXDOMAIN, result) self.assertEqual(finder.NXDOMAIN, result)
self.assertEqual(None, rrset) self.assertEqual(None, rrset)
@@ -502,7 +464,6 @@ class DataSrcUpdater(unittest.TestCase):
result, rrset = finder.find(isc.dns.Name("www.example.com"), result, rrset = finder.find(isc.dns.Name("www.example.com"),
isc.dns.RRType.A(), isc.dns.RRType.A(),
None,
finder.FIND_DEFAULT) finder.FIND_DEFAULT)
self.assertEqual(finder.SUCCESS, result) self.assertEqual(finder.SUCCESS, result)
self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n", 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()) self.assertEqual("example.com.", finder.get_origin().to_text())
result, rrset = finder.find(isc.dns.Name("www.example.com"), result, rrset = finder.find(isc.dns.Name("www.example.com"),
isc.dns.RRType.A(), isc.dns.RRType.A(),
None,
finder.FIND_DEFAULT) finder.FIND_DEFAULT)
self.assertEqual(finder.SUCCESS, result) self.assertEqual(finder.SUCCESS, result)
self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n", 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"), result, rrset = finder.find(isc.dns.Name("www.example.com"),
isc.dns.RRType.A(), isc.dns.RRType.A(),
None,
finder.FIND_DEFAULT) finder.FIND_DEFAULT)
self.assertEqual(finder.SUCCESS, result) self.assertEqual(finder.SUCCESS, result)
self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n", 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) # finder (since we have not committed)
result, rrset = updater.find(isc.dns.Name("www.example.com"), result, rrset = updater.find(isc.dns.Name("www.example.com"),
isc.dns.RRType.A(), isc.dns.RRType.A(),
None,
finder.FIND_DEFAULT) finder.FIND_DEFAULT)
self.assertEqual(finder.NXDOMAIN, result) self.assertEqual(finder.NXDOMAIN, result)
self.assertEqual(None, rrset) self.assertEqual(None, rrset)
@@ -584,7 +542,6 @@ class DataSrcUpdater(unittest.TestCase):
# the record should still be available in the 'real' finder as well # the record should still be available in the 'real' finder as well
result, rrset = finder.find(isc.dns.Name("www.example.com"), result, rrset = finder.find(isc.dns.Name("www.example.com"),
isc.dns.RRType.A(), isc.dns.RRType.A(),
None,
finder.FIND_DEFAULT) finder.FIND_DEFAULT)
self.assertEqual(finder.SUCCESS, result) self.assertEqual(finder.SUCCESS, result)
self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n", self.assertEqual("www.example.com. 3600 IN A 192.0.2.1\n",