Browse Source

[213] Make component_configurator accessible to tests

Michal 'vorner' Vaner 13 years ago
parent
commit
ca54736634
1 changed files with 5 additions and 5 deletions
  1. 5 5
      src/bin/bind10/bind10_src.py.in

+ 5 - 5
src/bin/bind10/bind10_src.py.in

@@ -242,7 +242,7 @@ class BoB:
         self.config_filename = config_filename
         self.config_filename = config_filename
         self.cmdctl_port = cmdctl_port
         self.cmdctl_port = cmdctl_port
         self.brittle = brittle
         self.brittle = brittle
-        self.__component_configurator = isc.bind10.component.Configurator(self)
+        self._component_configurator = isc.bind10.component.Configurator(self)
         self.__core_components = {
         self.__core_components = {
             'sockcreator': {
             'sockcreator': {
                 'kind': 'core',
                 'kind': 'core',
@@ -331,8 +331,8 @@ class BoB:
             logger.info(BIND10_KILL_PROCESS, self.processes[pid].name())
             logger.info(BIND10_KILL_PROCESS, self.processes[pid].name())
             os.kill(self.processes[pid].pid(), signal.SIGTERM)
             os.kill(self.processes[pid].pid(), signal.SIGTERM)
         self.processes = {}
         self.processes = {}
-        if self.__component_configurator.running():
-            self.__component_configurator.shutdown()
+        if self._component_configurator.running():
+            self._component_configurator.shutdown()
 
 
     def read_bind10_config(self):
     def read_bind10_config(self):
         """
         """
@@ -538,7 +538,7 @@ class BoB:
             Starts up all the processes.  Any exception generated during the
             Starts up all the processes.  Any exception generated during the
             starting of the processes is handled by the caller.
             starting of the processes is handled by the caller.
         """
         """
-        self.__component_configurator.startup(self.__core_components)
+        self._component_configurator.startup(self.__core_components)
         # TODO: Once everything uses the socket creator, we can drop root
         # TODO: Once everything uses the socket creator, we can drop root
         # privileges right now
         # privileges right now
 
 
@@ -587,7 +587,7 @@ class BoB:
 
 
     def stop_all_processes(self):
     def stop_all_processes(self):
         """Stop all processes."""
         """Stop all processes."""
-        self.__component_configurator.shutdown()
+        self._component_configurator.shutdown()
 
 
     def stop_process(self, process, recipient):
     def stop_process(self, process, recipient):
         """
         """