[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 44311272cefd0780a4adcd33bdb8ae797a862e89..dc88b9d36defc80993ff84d04b526d9f6a8c360c 100644 (file)
--- 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 6047c442e7a919c43ad474c4099284c27eac16aa..f88ef8740d0bc8f4f6dd141a146f69f25befa10c 100644 (file)
--- 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()