Commit 73f84244 authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

[2911] make sure to use default request_ixfr from the spec, not hardcoding it.

also updated the test so the MockCC refers to the spec default, instead of
hardcoding the values.
parent d43299cb
......@@ -129,17 +129,12 @@ class XfrinTestException(Exception):
class XfrinTestTimeoutException(Exception):
pass
class MockCC(MockModuleCCSession):
def get_default_value(self, identifier):
# The returned values should be identical to the spec file
# XXX: these should be retrieved from the spec file
# (see MyCCSession of xfrout_test.py.in)
if identifier == "zones/master_port":
return TEST_MASTER_PORT
if identifier == "zones/class":
return TEST_RRCLASS_STR
if identifier == "zones/use_ixfr":
return False
class MockCC(MockModuleCCSession, ConfigData):
def __init__(self):
super().__init__()
module_spec = isc.config.module_spec_from_file(
xfrin.SPECFILE_LOCATION)
ConfigData.__init__(self, module_spec)
def add_remote_config_by_name(self, name, callback):
pass
......
......@@ -1373,7 +1373,8 @@ class ZoneInfo:
def set_request_ixfr(self, request_ixfr):
if request_ixfr is None:
request_ixfr = 'no' # if unspecified, use the default
request_ixfr = \
self._module_cc.get_default_value("zones/request_ixfr")
cfg_to_val = { 'yes': self.REQUEST_IXFR_FIRST,
'only': self.REQUEST_IXFR_ONLY,
'no': self.REQUEST_IXFR_DISABLED }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment