BIND 10 trac2967, updated. 962c4c299ee7fe733267e7ffdb1cf3f6ff3ec394 [2967] refactoring: get rid of embedded format_zone_str()
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Jul 3 22:21:25 UTC 2013
The branch, trac2967 has been updated
via 962c4c299ee7fe733267e7ffdb1cf3f6ff3ec394 (commit)
via 0583652b5a391ec078361254b6d473fa8ffdb4a2 (commit)
from d3c2b9a2fde279369ebac19e23153963fa855d1b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 962c4c299ee7fe733267e7ffdb1cf3f6ff3ec394
Author: Paul Selkirk <pselkirk at isc.org>
Date: Wed Jul 3 18:16:11 2013 -0400
[2967] refactoring: get rid of embedded format_zone_str()
commit 0583652b5a391ec078361254b6d473fa8ffdb4a2
Author: Paul Selkirk <pselkirk at isc.org>
Date: Wed Jul 3 18:06:45 2013 -0400
[2967] update f623694: override SOA rdata rather than find() method
-----------------------------------------------------------------------
Summary of changes:
src/bin/zonemgr/tests/zonemgr_test.py | 35 +++++++++++----------------------
src/bin/zonemgr/zonemgr.py.in | 15 ++++----------
2 files changed, 15 insertions(+), 35 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/zonemgr/tests/zonemgr_test.py b/src/bin/zonemgr/tests/zonemgr_test.py
index ab2f8c8..5a17476 100644
--- a/src/bin/zonemgr/tests/zonemgr_test.py
+++ b/src/bin/zonemgr/tests/zonemgr_test.py
@@ -57,6 +57,12 @@ class FakeCCSession(isc.config.ConfigData, MockModuleCCSession):
class MockDataSourceClient():
'''A simple mock data source client.'''
+ def __init__(self):
+ self.rdata_net = 'a.example.net. root.example.net. 2009073106 ' + \
+ '7200 3600 2419200 21600'
+ self.rdata_org = 'a.example.org. root.example.org. 2009073112 ' + \
+ '7200 3600 2419200 21600'
+
def find_zone(self, zone_name):
'''Mock version of DataSourceClient.find_zone().'''
return (isc.datasrc.DataSourceClient.SUCCESS, self)
@@ -64,13 +70,9 @@ class MockDataSourceClient():
def find(self, name, rrtype, options=ZoneFinder.FIND_DEFAULT):
'''Mock version of ZoneFinder.find().'''
if name == Name('example.net'):
- rdata = Rdata(RRType.SOA, RRClass.IN,
- 'a.example.net. root.example.net. 2009073106 ' +
- '7200 3600 2419200 21600')
+ rdata = Rdata(RRType.SOA, RRClass.IN, self.rdata_net)
elif name == 'example.org.':
- rdata = Rdata(RRType.SOA, RRClass.IN,
- 'a.example.org. root.example.org. 2009073112 ' +
- '7200 3600 2419200 21600')
+ rdata = Rdata(RRType.SOA, RRClass.IN, self.rdata_org)
else:
return (ZoneFinder.NXDOMAIN, None, 0)
rrset = RRset(name, RRClass.IN, RRType.SOA, RRTTL(3600))
@@ -222,12 +224,7 @@ class TestZonemgrRefresh(unittest.TestCase):
def test_zonemgr_reload_zone(self):
soa_rdata = 'a.example.net. root.example.net. 2009073106 1800 900 2419200 21600'
- def find(name, rrtype, options=ZoneFinder.FIND_DEFAULT):
- rdata = Rdata(RRType.SOA, RRClass.IN, soa_rdata)
- rrset = RRset(name, RRClass.IN, RRType.SOA, RRTTL(3600))
- rrset.add_rdata(rdata)
- return (ZoneFinder.SUCCESS, rrset, 0)
- self.zone_refresh._datasrc_clients_mgr.datasrc_client.find = find
+ self.zone_refresh._datasrc_clients_mgr.datasrc_client.rdata_net = soa_rdata
self.zone_refresh.zonemgr_reload_zone(ZONE_NAME_CLASS1_IN)
self.assertEqual(soa_rdata, self.zone_refresh._zonemgr_refresh_info[ZONE_NAME_CLASS1_IN]["zone_soa_rdata"])
@@ -302,12 +299,7 @@ class TestZonemgrRefresh(unittest.TestCase):
def test_zonemgr_add_zone(self):
soa_rdata = 'a.example.net. root.example.net. 2009073106 1800 900 2419200 21600'
- def find(name, rrtype, options=ZoneFinder.FIND_DEFAULT):
- rdata = Rdata(RRType.SOA, RRClass.IN, soa_rdata)
- rrset = RRset(name, RRClass.IN, RRType.SOA, RRTTL(3600))
- rrset.add_rdata(rdata)
- return (ZoneFinder.SUCCESS, rrset, 0)
- self.zone_refresh._datasrc_clients_mgr.datasrc_client.find = find
+ self.zone_refresh._datasrc_clients_mgr.datasrc_client.rdata_net = soa_rdata
time1 = time.time()
self.zone_refresh._zonemgr_refresh_info = {}
self.zone_refresh.zonemgr_add_zone(ZONE_NAME_CLASS1_IN)
@@ -350,12 +342,7 @@ class TestZonemgrRefresh(unittest.TestCase):
def test_zone_refresh_success(self):
soa_rdata = 'a.example.net. root.example.net. 2009073106 1800 900 2419200 21600'
- def find(name, rrtype, options=ZoneFinder.FIND_DEFAULT):
- rdata = Rdata(RRType.SOA, RRClass.IN, soa_rdata)
- rrset = RRset(name, RRClass.IN, RRType.SOA, RRTTL(3600))
- rrset.add_rdata(rdata)
- return (ZoneFinder.SUCCESS, rrset, 0)
- self.zone_refresh._datasrc_clients_mgr.datasrc_client.find = find
+ self.zone_refresh._datasrc_clients_mgr.datasrc_client.rdata_net = soa_rdata
time1 = time.time()
self.zone_refresh._zonemgr_refresh_info[ZONE_NAME_CLASS1_IN]["zone_state"] = ZONE_REFRESHING
self.zone_refresh.zone_refresh_success(ZONE_NAME_CLASS1_IN)
diff --git a/src/bin/zonemgr/zonemgr.py.in b/src/bin/zonemgr/zonemgr.py.in
index 55ebaa9..83ffe68 100755
--- a/src/bin/zonemgr/zonemgr.py.in
+++ b/src/bin/zonemgr/zonemgr.py.in
@@ -260,26 +260,19 @@ class ZonemgrRefresh:
def get_zone_soa_rrset(datasrc_client, zone_name, zone_class):
"""Retrieve the current SOA RR of the zone to be transferred."""
- def format_zone_str(zone_name, zone_class):
- """Helper function to format a zone name and class as a string
- of the form '<name>/<class>'.
- Parameters:
- zone_name (isc.dns.Name) name to format
- zone_class (isc.dns.RRClass) class to format
- """
- return zone_name.to_text(True) + '/' + str(zone_class)
# get the zone finder. this must be SUCCESS (not even
# PARTIALMATCH) because we are specifying the zone origin name.
result, finder = datasrc_client.find_zone(zone_name)
if result != DataSourceClient.SUCCESS:
# The data source doesn't know the zone. In the context in
# which this function is called, this shouldn't happen.
- raise ZonemgrException("unexpected result: zone %s doesn't exist" %
- format_zone_str(zone_name, zone_class))
+ raise ZonemgrException(
+ "unexpected result: zone %s/%s doesn't exist" %
+ (zone_name.to_text(True), str(zone_class)))
result, soa_rrset, _ = finder.find(zone_name, RRType.SOA)
if result != ZoneFinder.SUCCESS:
logger.warn(ZONEMGR_NO_SOA,
- format_zone_str(zone_name, zone_class))
+ zone_name.to_text(True), str(zone_class))
return None
return soa_rrset
More information about the bind10-changes
mailing list