Commit 61cadb10 authored by Jelte Jansen's avatar Jelte Jansen
Browse files

renamed datadefinition.py to module_spec.py


git-svn-id: svn://bind10.isc.org/svn/bind10/branches/jelte-configuration@864 e5f2f494-b856-4b98-b285-d166d9295462
parent df4248e1
from isc.config.ccsession import * from isc.config.ccsession import *
from isc.config.config_data import * from isc.config.config_data import *
from isc.config.datadefinition import * from isc.config.module_spec import *
...@@ -21,7 +21,7 @@ two through the classes in ccsession) ...@@ -21,7 +21,7 @@ two through the classes in ccsession)
""" """
import isc.cc.data import isc.cc.data
import isc.config.datadefinition import isc.config.module_spec
class ConfigDataError(Exception): pass class ConfigDataError(Exception): pass
...@@ -102,7 +102,7 @@ def spec_name_list(spec, prefix="", recurse=False): ...@@ -102,7 +102,7 @@ def spec_name_list(spec, prefix="", recurse=False):
class ConfigData: class ConfigData:
"""This class stores the datadefinition and the current non-default """This class stores the module specs and the current non-default
config values. It provides functions to get the actual value or config values. It provides functions to get the actual value or
the default value if no non-default value has been set""" the default value if no non-default value has been set"""
...@@ -162,7 +162,7 @@ class ConfigData: ...@@ -162,7 +162,7 @@ class ConfigData:
return result return result
class MultiConfigData: class MultiConfigData:
"""This class stores the datadefinitions, current non-default """This class stores the module specs, current non-default
configuration values and 'local' (uncommitted) changes for configuration values and 'local' (uncommitted) changes for
multiple modules""" multiple modules"""
LOCAL = 1 LOCAL = 1
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
import unittest import unittest
import os import os
from isc.config.config_data import * from isc.config.config_data import *
from isc.config.datadefinition import * from isc.config.module_spec import *
class TestConfigData(unittest.TestCase): class TestConfigData(unittest.TestCase):
def setUp(self): def setUp(self):
......
...@@ -12,7 +12,9 @@ CONFIG_TESTDATA_PATH=@abs_top_srcdir@/src/lib/config/testdata ...@@ -12,7 +12,9 @@ CONFIG_TESTDATA_PATH=@abs_top_srcdir@/src/lib/config/testdata
export CONFIG_TESTDATA_PATH export CONFIG_TESTDATA_PATH
cd ${BIND10_PATH} cd ${BIND10_PATH}
${PYTHON_EXEC} -O ${CONFIG_PATH}/datadefinition_test.py $* ${PYTHON_EXEC} -O ${CONFIG_PATH}/config_data_test.py $*
${PYTHON_EXEC} -O ${CONFIG_PATH}/module_spec_test.py $*
${PYTHON_EXEC} -O ${CONFIG_PATH}/cfgmgr_test.py $* ${PYTHON_EXEC} -O ${CONFIG_PATH}/cfgmgr_test.py $*
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# #
# Tests for the datadefinition module # Tests for the module_spec module
# #
import unittest import unittest
......
Supports Markdown
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