BIND 10 trac811, updated. a7851af501420e9693b3c37a71de97738c8adc0e [trac811] make a ZoneMgrRefreshInfo class
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Apr 15 18:15:28 UTC 2011
The branch, trac811 has been updated
via a7851af501420e9693b3c37a71de97738c8adc0e (commit)
from 5d6455c7b141c79efee8a1eb1b0f3aea28b2eb74 (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 a7851af501420e9693b3c37a71de97738c8adc0e
Author: Jelte Jansen <jelte at isc.org>
Date: Fri Apr 15 20:14:40 2011 +0200
[trac811] make a ZoneMgrRefreshInfo class
to replace the current dict implementation. It replicates most of the dict functionality, so as not to break existing code
-----------------------------------------------------------------------
Summary of changes:
src/bin/zonemgr/tests/zonemgr_test.py | 40 +++++++++++++++-----------------
1 files changed, 19 insertions(+), 21 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/zonemgr/tests/zonemgr_test.py b/src/bin/zonemgr/tests/zonemgr_test.py
index 2c7aab7..bd9cee0 100644
--- a/src/bin/zonemgr/tests/zonemgr_test.py
+++ b/src/bin/zonemgr/tests/zonemgr_test.py
@@ -22,9 +22,9 @@ import tempfile
from zonemgr import *
ZONE_DATA_1_IN = ZoneData("sd.cn.", "IN")
-ZONE_NAME_CLASS1_IN = ZONE_DATA_1_IN.getNameClass()
+ZONE_NAME_CLASS1_IN = ZONE_DATA_1_IN.get_name_class()
ZONE_DATA_2_CH = ZoneData("tw.cn.", "CH")
-ZONE_NAME_CLASS2_CH = ZONE_DATA_2_CH.getNameClass()
+ZONE_NAME_CLASS2_CH = ZONE_DATA_2_CH.get_name_class()
ZONE_NAME_CLASS3_IN = ("example.com", "IN")
ZONE_NAME_CLASS1_CH = ("sd.cn.", "CH")
ZONE_NAME_CLASS2_IN = ("tw.cn.", "IN")
@@ -72,7 +72,7 @@ class FakeConfig:
class MyZonemgrRefresh(ZonemgrRefresh):
def __init__(self):
self._master_socket, self._slave_socket = socket.socketpair()
- self._zonemgr_refresh_info = {}
+ self._zonemgr_refresh_info = ZonemgrRefreshInfo()
def get_zone_soa(zone_name, db_file):
if zone_name == 'sd.cn.':
@@ -93,16 +93,15 @@ class MyZonemgrRefresh(ZonemgrRefresh):
zone_data1.next_refresh_time = current_time + 6500
zone_data1.zone_soa_rdata = 'a.dns.cn. root.cnnic.cn. 2009073105 7200 3600 2419200 21600'
zone_data1.zone_state = 0
- zone_data2 = ZoneData('tw.cn.', 'IN')
+ zone_data2 = ZoneData('tw.cn.', 'CH')
zone_data2.last_refresh_time = current_time
zone_data2.next_refresh_time = current_time + 6900
zone_data2.zone_soa_rdata = 'a.dns.cn. root.cnnic.cn. 2009073112 7200 3600 2419200 21600'
zone_data2.zone_state = 0
- self._zonemgr_refresh_info = {
- ('sd.cn.', 'IN'): zone_data1,
- ('tw.cn.', 'CH'): zone_data2
- }
+ self._zonemgr_refresh_info = ZonemgrRefreshInfo()
+ self._zonemgr_refresh_info.set_zone_data(zone_data1)
+ self._zonemgr_refresh_info.set_zone_data(zone_data2)
class TestZonemgrRefresh(unittest.TestCase):
def setUp(self):
@@ -268,7 +267,7 @@ class TestZonemgrRefresh(unittest.TestCase):
def test_zone_mgr_is_empty(self):
self.assertFalse(self.zone_refresh._zone_mgr_is_empty())
- self.zone_refresh._zonemgr_refresh_info = {}
+ self.zone_refresh._zonemgr_refresh_info = ZonemgrRefreshInfo()
self.assertTrue(self.zone_refresh._zone_mgr_is_empty())
def test_zonemgr_add_zone(self):
@@ -283,7 +282,7 @@ class TestZonemgrRefresh(unittest.TestCase):
sqlite3_ds.get_zone_soa = get_zone_soa
- self.zone_refresh._zonemgr_refresh_info = {}
+ self.zone_refresh._zonemgr_refresh_info = ZonemgrRefreshInfo()
self.zone_refresh.zonemgr_add_zone(ZONE_DATA_1_IN)
self.assertEqual(1, len(self.zone_refresh._zonemgr_refresh_info))
zone_soa_rdata = self.zone_refresh._zonemgr_refresh_info[ZONE_NAME_CLASS1_IN].zone_soa_rdata
@@ -369,10 +368,9 @@ class TestZonemgrRefresh(unittest.TestCase):
zone_data2.zone_soa_rdata = 'a.dns.cn. root.cnnic.cn. 2009073105 7200 3600 2419200 21600'
zone_data2.zone_state = ZONE_REFRESHING
- self.zone_refresh._zonemgr_refresh_info = {
- ("sd.cn.","IN"): zone_data1,
- ("tw.cn.","CH"): zone_data2
- }
+ self.zone_refresh._zonemgr_refresh_info = ZonemgrRefreshInfo()
+ self.zone_refresh._zonemgr_refresh_info.set_zone_data(zone_data1)
+ self.zone_refresh._zonemgr_refresh_info.set_zone_data(zone_data2)
zone_need_refresh = self.zone_refresh._find_need_do_refresh_zone()
self.assertEqual(ZONE_NAME_CLASS2_CH, zone_need_refresh)
@@ -387,9 +385,9 @@ class TestZonemgrRefresh(unittest.TestCase):
zone_data.next_refresh_time = time1 - 1
zone_data.zone_soa_rdata = 'a.dns.cn. root.cnnic.cn. 2009073105 7200 3600 2419200 21600'
zone_data.zone_state = ZONE_OK
- self.zone_refresh._zonemgr_refresh_info = {
- ("sd.cn.", "IN"): zone_data
- }
+ self.zone_refresh._zonemgr_refresh_info = ZonemgrRefreshInfo()
+ self.zone_refresh._zonemgr_refresh_info.set_zone_data(zone_data)
+
self.zone_refresh._do_refresh(ZONE_NAME_CLASS1_IN)
time2 = time.time()
zone_state = self.zone_refresh._zonemgr_refresh_info[ZONE_NAME_CLASS1_IN].zone_state
@@ -419,9 +417,9 @@ class TestZonemgrRefresh(unittest.TestCase):
zone_data.next_refresh_time = time1 - 1
zone_data.zone_soa_rdata = 'a.dns.cn. root.cnnic.cn. 2009073105 7200 3600 2419200 21600'
zone_data.zone_state = ZONE_OK
- self.zone_refresh._zonemgr_refresh_info = {
- ("sd.cn.", "IN"): zone_data
- }
+ self.zone_refresh._zonemgr_refresh_info = ZonemgrRefreshInfo()
+ self.zone_refresh._zonemgr_refresh_info.set_zone_data(zone_data)
+
self.zone_refresh._check_sock = self.zone_refresh._master_socket
listener = self.zone_refresh.run_timer(daemon=True)
# Shut down the timer thread
@@ -459,7 +457,7 @@ class TestZonemgrRefresh(unittest.TestCase):
config.zone_list = []
# First, remove everything
self.zone_refresh.update_config_data(config)
- self.assertEqual(self.zone_refresh._zonemgr_refresh_info, {})
+ self.assertEqual(len(self.zone_refresh._zonemgr_refresh_info), 0)
# Put something in
config.set_zone_list_from_name_classes([ZONE_NAME_CLASS1_IN])
self.zone_refresh.update_config_data(config)
More information about the bind10-changes
mailing list