From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Thu, 12 Jul 2012 11:47:23 +0000 (+0200)
Subject: [1976] Rename the datasrc.py plugin
X-Git-Tag: trac2351_base~97^2~7^2~2^2~21^2^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68c6c03be3d3e656b376581f5df623cff67bb473;p=thirdparty%2Fkea.git

[1976] Rename the datasrc.py plugin

It caused some naming collisions and the system tests failed because of
this. This is a workaround, the real solution needs to be done anyway.
---

diff --git a/src/bin/cfgmgr/plugins/Makefile.am b/src/bin/cfgmgr/plugins/Makefile.am
index 44311272ce..dc88b9d36d 100644
--- a/src/bin/cfgmgr/plugins/Makefile.am
+++ b/src/bin/cfgmgr/plugins/Makefile.am
@@ -8,7 +8,7 @@ datasrc.spec: datasrc.spec.pre
 config_plugindir = @prefix@/share/@PACKAGE@/config_plugins
 config_plugin_DATA = logging.spec tsig_keys.spec datasrc.spec
 
-python_PYTHON = b10logging.py tsig_keys.py datasrc.py
+python_PYTHON = b10logging.py tsig_keys.py datasrc_config_plugin.py
 pythondir = $(config_plugindir)
 
 CLEANFILES = b10logging.pyc tsig_keys.pyc
diff --git a/src/bin/cfgmgr/plugins/datasrc.py b/src/bin/cfgmgr/plugins/datasrc_config_plugin.py
similarity index 100%
rename from src/bin/cfgmgr/plugins/datasrc.py
rename to src/bin/cfgmgr/plugins/datasrc_config_plugin.py
diff --git a/src/bin/cfgmgr/plugins/tests/datasrc_test.py b/src/bin/cfgmgr/plugins/tests/datasrc_test.py
index 6047c442e7..f88ef8740d 100644
--- a/src/bin/cfgmgr/plugins/tests/datasrc_test.py
+++ b/src/bin/cfgmgr/plugins/tests/datasrc_test.py
@@ -18,7 +18,7 @@ import sys
 import os
 sys.path.extend(os.environ["B10_TEST_PLUGIN_DIR"].split(':'))
 
-import datasrc
+import datasrc_config_plugin
 import unittest
 
 class DatasrcTest(unittest.TestCase):
@@ -26,11 +26,11 @@ class DatasrcTest(unittest.TestCase):
         """
         Checks the entry point returns the correct values.
         """
-        (spec, check) = datasrc.load()
+        (spec, check) = datasrc_config_plugin.load()
         # It returns the checking function
-        self.assertEqual(check, datasrc.check)
+        self.assertEqual(check, datasrc_config_plugin.check)
         # The plugin stores it's spec
-        self.assertEqual(spec, datasrc.spec)
+        self.assertEqual(spec, datasrc_config_plugin.spec)
 
 if __name__ == '__main__':
         unittest.main()