Browse Source

[1901] Replace Boss with Init

Jelte Jansen 12 years ago
parent
commit
95b8519b04
54 changed files with 228 additions and 228 deletions
  1. 11 11
      ChangeLog
  2. 49 49
      doc/guide/bind10-guide.xml
  3. 1 1
      src/bin/bind10/README
  4. 8 8
      src/bin/bind10/b10-init.py.in
  5. 4 4
      src/bin/bind10/b10-init.xml
  6. 6 6
      src/bin/bind10/creatorapi.txt
  7. 6 6
      src/bin/bind10/init_messages.mes
  8. 1 1
      src/bin/bind10/tests/args_test.py
  9. 4 4
      src/bin/bind10/tests/bind10_test.py.in
  10. 1 1
      src/bin/bindctl/bindctl.xml
  11. 1 1
      src/bin/bindctl/bindctl_main.py.in
  12. 12 12
      src/bin/bindctl/command_sets.py
  13. 1 1
      src/bin/ddns/b10-ddns.xml
  14. 3 3
      src/bin/stats/stats.py.in
  15. 5 5
      src/bin/stats/tests/b10-stats-httpd_test.py
  16. 29 29
      src/bin/stats/tests/b10-stats_test.py
  17. 5 5
      src/bin/stats/tests/test_utils.py
  18. 1 1
      src/bin/stats/tests/testdata/b10-config.db
  19. 1 1
      src/bin/zonemgr/zonemgr.py.in
  20. 1 1
      src/bin/zonemgr/zonemgr_messages.mes
  21. 1 1
      src/lib/python/isc/bind10/socket_cache.py
  22. 6 6
      src/lib/python/isc/bind10/tests/component_test.py
  23. 2 2
      src/lib/python/isc/config/cfgmgr.py
  24. 1 1
      src/lib/python/isc/config/tests/cfgmgr_test.py
  25. 5 5
      src/lib/server_common/socket_request.cc
  26. 4 4
      src/lib/server_common/tests/socket_requestor_test.cc
  27. 1 1
      tests/lettuce/configurations/auth/auth_badzone.config.orig
  28. 1 1
      tests/lettuce/configurations/auth/auth_basic.config.orig
  29. 1 1
      tests/lettuce/configurations/bindctl/bindctl.config.orig
  30. 1 1
      tests/lettuce/configurations/bindctl_commands.config.orig
  31. 1 1
      tests/lettuce/configurations/ddns/ddns.config.orig
  32. 1 1
      tests/lettuce/configurations/ddns/noddns.config.orig
  33. 1 1
      tests/lettuce/configurations/example.org.config.orig
  34. 1 1
      tests/lettuce/configurations/example.org.inmem.config
  35. 1 1
      tests/lettuce/configurations/example2.org.config
  36. 1 1
      tests/lettuce/configurations/inmemory_over_sqlite3/secondary.conf
  37. 1 1
      tests/lettuce/configurations/ixfr-out/testset1-config.db
  38. 1 1
      tests/lettuce/configurations/multi_instance/multi_auth.config.orig
  39. 1 1
      tests/lettuce/configurations/no_db_file.config
  40. 1 1
      tests/lettuce/configurations/nsec3/nsec3_auth.config
  41. 1 1
      tests/lettuce/configurations/resolver/resolver_basic.config.orig
  42. 1 1
      tests/lettuce/configurations/xfrin/inmem_slave.conf
  43. 1 1
      tests/lettuce/configurations/xfrin/retransfer_master.conf.orig
  44. 1 1
      tests/lettuce/configurations/xfrin/retransfer_master_nons.conf.orig
  45. 1 1
      tests/lettuce/configurations/xfrin/retransfer_slave.conf.orig
  46. 1 1
      tests/lettuce/configurations/xfrin/retransfer_slave_notify.conf
  47. 3 3
      tests/lettuce/data/commands/bad_command
  48. 11 11
      tests/lettuce/features/bindctl_commands.feature
  49. 1 1
      tests/lettuce/features/default.feature
  50. 5 5
      tests/lettuce/features/multi_instance.feature
  51. 9 9
      tests/lettuce/features/terrain/bind10_control.py
  52. 8 8
      tests/system/bindctl/tests.sh
  53. 1 1
      tests/system/glue/nsx1/b10-config.db.in
  54. 1 1
      tests/system/ixfr/b10-config.db.in

+ 11 - 11
ChangeLog

@@ -575,7 +575,7 @@ bind10-devel-20121115 released on November 15, 2012
 
 487.	[bug]		jinmei
 	The bind10 process now terminates a component (subprocess) by the
-	"config remove Boss/components" bindctl command even if the
+	"config remove Init/components" bindctl command even if the
 	process crashes immediately before the command is sent to bind10.
 	Previously this led to an inconsistent state between the
 	configuration and an internal component list of bind10, and bind10
@@ -599,7 +599,7 @@ bind10-devel-20121115 released on November 15, 2012
 	completion added a part twice has been solved, and it no longer
 	suggests the confusing value 'argument' as a completion-hint for
 	configuration items. Additionally, bindctl no longer crashes upon
-	input like 'config remove Boss'.
+	input like 'config remove Init'.
 	(Trac #2254, git 9047de5e8f973e12e536f7180738e6b515439448)
 
 484.	[func]		tomek
@@ -1462,7 +1462,7 @@ bind10-devel-20120119 released on January 19, 2012
 	the -u flag for switching the user after initialization.
 	Note: this change broke backward compatibility to boss component
 	configuration.  If your b10-config.db contains "setuid" for
-	Boss.components, you'll need to remove that entry by hand before
+	Init.components, you'll need to remove that entry by hand before
 	starting BIND 10.
 	(Trac #1508, #1509, #1510,
 	git edc5b3c12eb45437361484c843794416ad86bb00)
@@ -1785,7 +1785,7 @@ bind10-devel-20111128 released on November 28, 2011
 316.	[func]*		vorner
 	The configuration of what parts of the system run is more
 	flexible now.  Everything that should run must have an
-	entry in Boss/components.
+	entry in Init/components.
 	(Trac #213, git 08e1873a3593b4fa06754654d22d99771aa388a6)
 
 315.	[func]		tomek
@@ -1856,9 +1856,9 @@ bind10-devel-20111128 released on November 28, 2011
 	(Trac #1279, git cd3588c9020d0310f949bfd053c4d3a4bd84ef88)
 
 306.	[bug]		stephen
-	Boss process now waits for the configuration manager to initialize
+	Init process now waits for the configuration manager to initialize
 	itself before continuing with startup.  This fixes a race condition
-	whereby the Boss could start the configuration manager and then
+	whereby the Init could start the configuration manager and then
 	immediately start components that depended on that component being
 	fully initialized.
 	(Trac #1271, git 607cbae949553adac7e2a684fa25bda804658f61)
@@ -2521,7 +2521,7 @@ bind10-devel-20110322 released on March 22, 2011
 
 206.	[func]		shane
 	Add the ability to list the running BIND 10 processes using the
-	command channel. To try this, use "Boss show_processes".
+	command channel. To try this, use "Init show_processes".
 	(Trac #648, git 451bbb67c2b5d544db2f7deca4315165245d2b3b)
 
 205.	[bug]		jinmei
@@ -2685,7 +2685,7 @@ bind10-devel-20110224 released on February 24, 2011
 179.	[func]		vorner
 	It is possible to start and stop resolver and authoritative
 	server without restart of the whole system. Change of the
-	configuration (Boss/start_auth and Boss/start_resolver) is
+	configuration (Init/start_auth and Init/start_resolver) is
 	enough.
 	(Trac #565, git 0ac0b4602fa30852b0d86cc3c0b4730deb1a58fe)
 
@@ -2751,7 +2751,7 @@ bind10-devel-20110224 released on February 24, 2011
 	(Trac #449, git 8aa3b2246ae095bbe7f855fd11656ae3bdb98986)
 
 168.	[bug]		vorner
-	Boss no longer has the -f argument, which was undocumented and
+	Init no longer has the -f argument, which was undocumented and
 	stayed as a relict of previous versions, currently causing only
 	strange behaviour.
 	(Trac #572, git 17f237478961005707d649a661cc72a4a0d612d4)
@@ -3062,7 +3062,7 @@ bind10-devel-20101201 released on December 01, 2010
 	Output changed to JSON format for consistency. (svn r3694)
 
 122.	[func]		stephen
-	src/bin/bind10: Added configuration options to Boss to determine
+	src/bin/bind10: Added configuration options to Init to determine
 	whether to start the authoritative server, recursive server (or
 	both). A dummy program has been provided for test purposes.
 	(Trac #412, svn r3676)
@@ -3131,7 +3131,7 @@ bind10-devel-20101201 released on December 01, 2010
 
 111.	[bug]*		Vaner
 	Make sure process xfrin/xfrout/zonemgr/cmdctl can be stopped
-	properly when user enter "ctrl+c" or 'Boss shutdown' command
+	properly when user enter "ctrl+c" or 'Init shutdown' command
 	through bindctl.  The ZonemgrRefresh.run_timer and
 	NotifyOut.dispatcher spawn a thread themselves.
 	(Trac #335, svn r3273)

+ 49 - 49
doc/guide/bind10-guide.xml

@@ -432,9 +432,9 @@ var/
 	    run): <screen>$ <userinput>bindctl</userinput></screen>
 	    (Login with the provided default username and password.)
             <screen>
-&gt; <userinput>config add Boss/components b10-auth</userinput>
-&gt; <userinput>config set Boss/components/b10-auth/special auth</userinput>
-&gt; <userinput>config set Boss/components/b10-auth/kind needed</userinput>
+&gt; <userinput>config add Init/components b10-auth</userinput>
+&gt; <userinput>config set Init/components/b10-auth/special auth</userinput>
+&gt; <userinput>config set Init/components/b10-auth/kind needed</userinput>
 &gt; <userinput>config commit</userinput>
 &gt; <userinput>quit</userinput>
             </screen>
@@ -1274,10 +1274,10 @@ TODO
 
         <screen><userinput>&lt;module&gt; &lt;command&gt; <replaceable>[argument(s)]</replaceable></userinput></screen>
 
-        For example, the Boss module has a 'shutdown' command to shut down
+        For example, the Init module has a 'shutdown' command to shut down
         BIND 10, with an optional argument 'help':
 
-        <screen>&gt; <userinput>Boss shutdown help</userinput>
+        <screen>&gt; <userinput>Init shutdown help</userinput>
 Command  shutdown 	(Shut down BIND 10)
 		help (Get help for command)
 This command has no parameters
@@ -1300,7 +1300,7 @@ Available module names:
         </screen>
 
         When 'help' is used as a command to a module, it shows the supported commands for the module; for example:
-        <screen>&gt; <userinput>Boss help</userinput>
+        <screen>&gt; <userinput>Init help</userinput>
 Module  Init 	Master process
 Available commands:
     help        Get help for module.
@@ -1646,7 +1646,7 @@ Parameters:
                         to maps.
                     </simpara>
                     <simpara>
-                        For example, the <command>Boss/components</command>
+                        For example, the <command>Init/components</command>
                         elements is a named set;
                         adding, showing, and then removing an element
                         can be done with the following three commands (note
@@ -1654,13 +1654,13 @@ Parameters:
                         'example_module'):
                     </simpara>
                     <simpara>
-                        <command>config add Boss/components example_module</command>
+                        <command>config add Init/components example_module</command>
                     </simpara>
                     <simpara>
-                        <command>config show Boss/components/example_module</command>
+                        <command>config show Init/components/example_module</command>
                     </simpara>
                     <simpara>
-                        <command>config remove Boss/components example_module</command>
+                        <command>config remove Init/components example_module</command>
                     </simpara>
                 </listitem>
             </varlistentry>
@@ -1708,21 +1708,21 @@ Parameters:
 
         <screen>&gt; <userinput>execute init_authoritative_server show</userinput>
 !echo adding Authoritative server component
-config add /Boss/components b10-auth
-config set /Boss/components/b10-auth/kind needed
-config set /Boss/components/b10-auth/special auth
+config add /Init/components b10-auth
+config set /Init/components/b10-auth/kind needed
+config set /Init/components/b10-auth/special auth
 !echo adding Xfrin component
-config add /Boss/components b10-xfrin
-config set /Boss/components/b10-xfrin/address Xfrin
-config set /Boss/components/b10-xfrin/kind dispensable
+config add /Init/components b10-xfrin
+config set /Init/components/b10-xfrin/address Xfrin
+config set /Init/components/b10-xfrin/kind dispensable
 !echo adding Xfrout component
-config add /Boss/components b10-xfrout
-config set /Boss/components/b10-xfrout/address Xfrout
-config set /Boss/components/b10-xfrout/kind dispensable
+config add /Init/components b10-xfrout
+config set /Init/components/b10-xfrout/address Xfrout
+config set /Init/components/b10-xfrout/kind dispensable
 !echo adding Zone Manager component
-config add /Boss/components b10-zonemgr
-config set /Boss/components/b10-zonemgr/address Zonemgr
-config set /Boss/components/b10-zonemgr/kind dispensable
+config add /Init/components b10-zonemgr
+config set /Init/components/b10-zonemgr/address Zonemgr
+config set /Init/components/b10-zonemgr/kind dispensable
 !echo Components added. Please enter "config commit" to
 !echo finalize initial setup and run the components.
         </screen>
@@ -1770,7 +1770,7 @@ config set /Boss/components/b10-zonemgr/kind dispensable
         <section id="bindctl_execute_notes">
             <title>Notes on execute scripts</title>
             Within scripts, you can add or remove modules with the normal
-            configuration commands for <command>Boss/components</command>.
+            configuration commands for <command>Init/components</command>.
             However, as module
             configuration and commands do not show up until the module is
             running, it is currently not possible to add a module and set
@@ -2091,7 +2091,7 @@ AND_MATCH := "ALL": [ RULE_RAW, RULE_RAW, ... ]
       <para>
         The BIND 10 suite may be shut down by stopping the
         parent <command>bind10</command> process. This may be done
-        by running the <userinput>Boss shutdown</userinput> command
+        by running the <userinput>Init shutdown</userinput> command
         at the <command>bindctl</command> prompt.
       </para>
     </section>
@@ -2105,7 +2105,7 @@ AND_MATCH := "ALL": [ RULE_RAW, RULE_RAW, ... ]
 	of the required <command>b10-sockcreator</command>,
 	<command>b10-msgq</command> and <command>b10-cfgmgr</command>
 	components.
-	The configuration is in the <varname>Boss/components</varname>
+	The configuration is in the <varname>Init/components</varname>
 	section. Each element represents one component, which is
 	an abstraction of a process.
       </para>
@@ -2113,10 +2113,10 @@ AND_MATCH := "ALL": [ RULE_RAW, RULE_RAW, ... ]
       <para>
 	To add a process to the set, let's say the resolver (which
 	is not started by default), you would do this:
-        <screen>&gt; <userinput>config add Boss/components b10-resolver</userinput>
-&gt; <userinput>config set Boss/components/b10-resolver/special resolver</userinput>
-&gt; <userinput>config set Boss/components/b10-resolver/kind needed</userinput>
-&gt; <userinput>config set Boss/components/b10-resolver/priority 10</userinput>
+        <screen>&gt; <userinput>config add Init/components b10-resolver</userinput>
+&gt; <userinput>config set Init/components/b10-resolver/special resolver</userinput>
+&gt; <userinput>config set Init/components/b10-resolver/kind needed</userinput>
+&gt; <userinput>config set Init/components/b10-resolver/priority 10</userinput>
 &gt; <userinput>config commit</userinput></screen></para>
 
       <para>
@@ -2230,9 +2230,9 @@ address, but the usual ones don't." mean? -->
         You might want to do that to gain more performance (each one uses only
         single core). Just put multiple entries under different names, like
         this, with the same config:
-        <screen>&gt; <userinput>config add Boss/components b10-resolver-2</userinput>
-&gt; <userinput>config set Boss/components/b10-resolver-2/special resolver</userinput>
-&gt; <userinput>config set Boss/components/b10-resolver-2/kind needed</userinput>
+        <screen>&gt; <userinput>config add Init/components b10-resolver-2</userinput>
+&gt; <userinput>config set Init/components/b10-resolver-2/special resolver</userinput>
+&gt; <userinput>config set Init/components/b10-resolver-2/kind needed</userinput>
 &gt; <userinput>config commit</userinput></screen>
       </para>
       <para>
@@ -2248,7 +2248,7 @@ address, but the usual ones don't." mean? -->
 
       <para>
         The running processes started by <command>bind10</command>
-        may be listed by running <userinput>Boss show_processes</userinput>
+        may be listed by running <userinput>Init show_processes</userinput>
         using <command>bindctl</command>.
       </para>
 
@@ -3024,9 +3024,9 @@ what is XfroutClient xfr_client??
         It can be done by using the <command>bindctl</command>
         utility.  For example:
       <screen>
-&gt; <userinput>config add Boss/components b10-ddns</userinput>
-&gt; <userinput>config set Boss/components/b10-ddns/address DDNS</userinput>
-&gt; <userinput>config set Boss/components/b10-ddns/kind dispensable</userinput>
+&gt; <userinput>config add Init/components b10-ddns</userinput>
+&gt; <userinput>config set Init/components/b10-ddns/address DDNS</userinput>
+&gt; <userinput>config set Init/components/b10-ddns/kind dispensable</userinput>
 &gt; <userinput>config commit</userinput>
 </screen>
       <note><simpara>
@@ -3217,10 +3217,10 @@ what is XfroutClient xfr_client??
       <command>bindctl</command>, for example:
 
       <screen>
-&gt; <userinput>config add Boss/components b10-resolver</userinput>
-&gt; <userinput>config set Boss/components/b10-resolver/special resolver</userinput>
-&gt; <userinput>config set Boss/components/b10-resolver/kind needed</userinput>
-&gt; <userinput>config set Boss/components/b10-resolver/priority 10</userinput>
+&gt; <userinput>config add Init/components b10-resolver</userinput>
+&gt; <userinput>config set Init/components/b10-resolver/special resolver</userinput>
+&gt; <userinput>config set Init/components/b10-resolver/kind needed</userinput>
+&gt; <userinput>config set Init/components/b10-resolver/priority 10</userinput>
 &gt; <userinput>config commit</userinput>
 </screen>
 
@@ -3425,16 +3425,16 @@ $</screen>
         After starting BIND 10 and entering bindctl, the first step
         in configuring the server is to add it to the list of running BIND 10 services.
 <screen>
-&gt; <userinput>config add Boss/components b10-dhcp4</userinput>
-&gt; <userinput>config set Boss/components/b10-dhcp4/kind dispensable</userinput>
+&gt; <userinput>config add Init/components b10-dhcp4</userinput>
+&gt; <userinput>config set Init/components/b10-dhcp4/kind dispensable</userinput>
 &gt; <userinput>config commit</userinput>
 </screen>
       </para>
       <para>
          To remove <command>b10-dhcp4</command> from the set of running services,
-         the <command>b10-dhcp4</command> is removed from list of Boss components:
+         the <command>b10-dhcp4</command> is removed from list of Init components:
 <screen>
-&gt; <userinput>config remove Boss/components b10-dhcp4</userinput>
+&gt; <userinput>config remove Init/components b10-dhcp4</userinput>
 &gt; <userinput>config commit</userinput>
 </screen>
       </para>
@@ -3726,16 +3726,16 @@ Dhcp4/renew-timer	1000	integer	(default)
         After starting BIND 10 and starting <command>bindctl</command>, the first step
         in configuring the server is to add <command>b10-dhcp6</command> to the list of running BIND 10 services.
 <screen>
-&gt; <userinput>config add Boss/components b10-dhcp6</userinput>
-&gt; <userinput>config set Boss/components/b10-dhcp6/kind dispensable</userinput>
+&gt; <userinput>config add Init/components b10-dhcp6</userinput>
+&gt; <userinput>config set Init/components/b10-dhcp6/kind dispensable</userinput>
 &gt; <userinput>config commit</userinput>
 </screen>
       </para>
       <para>
          To remove <command>b10-dhcp6</command> from the set of running services,
-         the <command>b10-dhcp4</command> is removed from list of Boss components:
+         the <command>b10-dhcp4</command> is removed from list of Init components:
 <screen>
-&gt; <userinput>config remove Boss/components b10-dhcp6</userinput>
+&gt; <userinput>config remove Init/components b10-dhcp6</userinput>
 &gt; <userinput>config commit</userinput>
 </screen>
       </para>
@@ -4164,7 +4164,7 @@ Dhcp6/renew-timer	1000	integer	(default)
         "queries.tcp": 1749,
         "queries.udp": 867868
     },
-    "Boss": {
+    "Init": {
         "boot_time": "2011-01-20T16:59:03Z"
     },
     "Stats": {

+ 1 - 1
src/bin/bind10/README

@@ -1,4 +1,4 @@
-This directory contains the source for the "Boss of Bind" program.
+This directory contains the source for the "Init of Bind" program.
 
 Files:
   Makefile.am      - build information

+ 8 - 8
src/bin/bind10/b10-init.py.in

@@ -16,7 +16,7 @@
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 """
-This file implements the Boss of Bind (BoB, or bob) program.
+This file implements the Init of Bind (BoB, or bob) program.
 
 Its purpose is to start up the BIND 10 system, and then manage the
 processes, by starting and stopping processes, plus restarting
@@ -103,7 +103,7 @@ isc.util.process.rename(sys.argv[0])
 # number, and the overall BIND 10 version number (set in configure.ac).
 VERSION = "bind10 20110223 (BIND 10 @PACKAGE_VERSION@)"
 
-# This is for boot_time of Boss
+# This is for boot_time of Init
 _BASETIME = time.gmtime()
 
 # Detailed error message commonly used on startup failure, possibly due to
@@ -191,14 +191,14 @@ class CChannelConnectError(Exception): pass
 class ProcessStartError(Exception): pass
 
 class BoB:
-    """Boss of BIND class."""
+    """Init of BIND class."""
 
     def __init__(self, msgq_socket_file=None, data_path=None,
                  config_filename=None, clear_config=False,
                  verbose=False, nokill=False, setuid=None, setgid=None,
                  username=None, cmdctl_port=None, wait_time=10):
         """
-            Initialize the Boss of BIND. This is a singleton (only one can run).
+            Initialize the Init of BIND. This is a singleton (only one can run).
 
             The msgq_socket_file specifies the UNIX domain socket file that the
             msgq process listens on.  If verbose is True, then b10-init reports
@@ -210,7 +210,7 @@ class BoB:
             The cmdctl_port is passed to cmdctl and specify on which port it
             should listen.
 
-            wait_time controls the amount of time (in seconds) that Boss waits
+            wait_time controls the amount of time (in seconds) that Init waits
             for selected processes to initialize before continuing with the
             initialization.  Currently this is only the configuration manager.
         """
@@ -442,7 +442,7 @@ class BoB:
 
     def process_running(self, msg, who):
         """
-            Some processes return a message to the Boss after they have
+            Some processes return a message to the Init after they have
             started to indicate that they are running.  The form of the
             message is a dictionary with contents {"running:", "<process>"}.
             This method checks the passed message and returns True if the
@@ -508,7 +508,7 @@ class BoB:
         # Subscribe to the message queue.  The only messages we expect to receive
         # on this channel are once relating to process startup.
         if self.cc_session is not None:
-            self.cc_session.group_subscribe("Boss")
+            self.cc_session.group_subscribe("Init")
 
         return msgq_proc
 
@@ -723,7 +723,7 @@ class BoB:
 
     def component_shutdown(self, exitcode=0):
         """
-        Stop the Boss instance from a components' request. The exitcode
+        Stop the Init instance from a components' request. The exitcode
         indicates the desired exit code.
 
         If we did not start yet, it raises an exception, which is meant

+ 4 - 4
src/bin/bind10/b10-init.xml

@@ -246,18 +246,18 @@ TODO: configuration section
     <para>
       The configuration provides settings for components for
       <command>b10-init</command> to manage under
-      <varname>/Boss/components/</varname>.
+      <varname>/Init/components/</varname>.
       The default elements are:
     </para>
 
     <itemizedlist>
 
       <listitem>
-        <para> <varname>/Boss/components/b10-cmdctl</varname> </para>
+        <para> <varname>/Init/components/b10-cmdctl</varname> </para>
       </listitem>
 
       <listitem>
-        <para> <varname>/Boss/components/b10-stats</varname> </para>
+        <para> <varname>/Init/components/b10-stats</varname> </para>
       </listitem>
 
     </itemizedlist>
@@ -425,7 +425,7 @@ xfrin
 
     <para>
       The statistics data collected by the <command>b10-stats</command>
-      daemon for <quote>Boss</quote> include:
+      daemon for <quote>Init</quote> include:
     </para>
 
     <variablelist>

+ 6 - 6
src/bin/bind10/creatorapi.txt

@@ -1,7 +1,7 @@
 Socket creator API
 ==================
 
-This API is between Boss and other modules to allow them requesting of sockets.
+This API is between Init and other modules to allow them requesting of sockets.
 For simplicity, we will use the socket creator for all (even non-privileged)
 ports for now, but we should have some function where we can abstract it later.
 
@@ -29,8 +29,8 @@ b10-init will create a unix-domain socket and listen on it. When something
 requests a socket over the command channel and the socket is created, some kind
 of token is returned to the application (which will represent the future
 socket). The application then connects to the unix-domain socket, sends the
-token over the connection (so Boss will know which socket to send there, in case
-multiple applications ask for sockets simultaneously) and Boss sends the socket
+token over the connection (so Init will know which socket to send there, in case
+multiple applications ask for sockets simultaneously) and Init sends the socket
 in return.
 
 In theory, we could send the requests directly over the unix-domain
@@ -48,8 +48,8 @@ socket, but it has two disadvantages:
 
 Caching of sockets
 ------------------
-To allow sending the same socket to multiple application, the Boss process will
-hold a cache. Each socket that is created and sent is kept open in Boss and
+To allow sending the same socket to multiple application, the Init process will
+hold a cache. Each socket that is created and sent is kept open in Init and
 preserved there as well. A reference count is kept with each of them.
 
 When another application asks for the same socket, it is simply sent from the
@@ -67,7 +67,7 @@ There are two possibilities:
   some name). This one is better if we want to migrate to dbus, since dbus
   already has this capability as well as sending the sockets inbound (at least it
   seems so on unix) and we could get rid of the unix-domain socket completely.
-* Keep the unix-domain connections open forever. Boss can remember which socket
+* Keep the unix-domain connections open forever. Init can remember which socket
   was sent to which connection and when the connection closes (because the
   application crashed), it can drop all the references on the sockets. This
   seems easier to implement.

+ 6 - 6
src/bin/bind10/init_messages.mes

@@ -298,15 +298,15 @@ shown, and BIND10 will now shut down.
 
 % BIND10_STARTUP_UNEXPECTED_MESSAGE unrecognised startup message %1
 During the startup process, a number of messages are exchanged between the
-Boss process and the processes it starts.  This error is output when a
-message received by the Boss process is recognised as being of the
+Init process and the processes it starts.  This error is output when a
+message received by the Init process is recognised as being of the
 correct format but is unexpected.  It may be that processes are starting
 of sequence.
 
 % BIND10_STARTUP_UNRECOGNISED_MESSAGE unrecognised startup message %1
 During the startup process, a number of messages are exchanged between the
-Boss process and the processes it starts.  This error is output when a
-message received by the Boss process is not recognised.
+Init process and the processes it starts.  This error is output when a
+message received by the Init process is not recognised.
 
 % BIND10_STOP_PROCESS asking %1 to shut down
 The b10-init module is sending a shutdown command to the given module over
@@ -318,10 +318,10 @@ action will be taken by the b10-init process.
 
 % BIND10_WAIT_CFGMGR waiting for configuration manager process to initialize
 The configuration manager process is so critical to operation of BIND 10
-that after starting it, the Boss module will wait for it to initialize
+that after starting it, the Init module will wait for it to initialize
 itself before continuing.  This debug message is produced during the
 wait and may be output zero or more times depending on how long it takes
-the configuration manager to start up.  The total length of time Boss
+the configuration manager to start up.  The total length of time Init
 will wait for the configuration manager before reporting an error is
 set with the command line --wait switch, which has a default value of
 ten seconds.

+ 1 - 1
src/bin/bind10/tests/args_test.py

@@ -17,7 +17,7 @@ SUID_USER="shane"
 BIND10_EXE="../run_bind10.sh"
 TIMEOUT=3
 
-class TestBossArgs(unittest.TestCase):
+class TestInitArgs(unittest.TestCase):
     def _waitForString(self, bob, s):
         found_string = False
         start_time = time.time()

+ 4 - 4
src/bin/bind10/tests/bind10_test.py.in

@@ -490,7 +490,7 @@ class TestBoB(unittest.TestCase):
             def group_recvmsg(self, nonblock, seq): pass
         class DummyModuleCCSession():
             module_spec = isc.config.module_spec.ModuleSpec({
-                    "module_name": "Boss",
+                    "module_name": "Init",
                     "statistics": [
                         {
                             "item_name": "boot_time",
@@ -1121,7 +1121,7 @@ class MockComponent:
     def kill(self, forceful):
         self.forceful = forceful
 
-class TestBossCmd(unittest.TestCase):
+class TestInitCmd(unittest.TestCase):
     def test_ping(self):
         """
         Confirm simple ping command works.
@@ -1276,7 +1276,7 @@ class TestPIDFile(unittest.TestCase):
         self.assertRaises(IOError, dump_pid,
                           'nonexistent_dir' + os.sep + 'bind10.pid')
 
-class TestBossComponents(unittest.TestCase):
+class TestInitComponents(unittest.TestCase):
     """
     Test b10-init propagates component configuration properly to the
     component configurator and acts sane.
@@ -1743,7 +1743,7 @@ class TestBossComponents(unittest.TestCase):
         self.assertEqual(attempts, 2)
 
         self.assertEqual(cc_socket_file, bob.msgq_socket_file)
-        self.assertEqual(cc_sub, 'Boss')
+        self.assertEqual(cc_sub, 'Init')
 
         # isc.cc.Session, time.time() and time.sleep() are restored
         # during tearDown().

+ 1 - 1
src/bin/bindctl/bindctl.xml

@@ -218,7 +218,7 @@
        <command>config</command> for Configuration commands.
 <!-- TODO: or is config from the cfgmgr module? -->
        Additional modules may be available, such as
-       <command>Boss</command>, <command>Xfrin</command>, and
+       <command>Init</command>, <command>Xfrin</command>, and
        <command>Auth</command>.
      </para>
 

+ 1 - 1
src/bin/bindctl/bindctl_main.py.in

@@ -34,7 +34,7 @@ isc.util.process.rename()
 # number, and the overall BIND 10 version number (set in configure.ac).
 VERSION = "bindctl 20110217 (BIND 10 @PACKAGE_VERSION@)"
 
-DEFAULT_IDENTIFIER_DESC = "The identifier specifies the config item. Child elements are separated with the '/' character. List indices can be specified with '[i]', where i is an integer specifying the index, starting with 0. Examples: 'Boss/start_auth', 'Recurse/listen_on[0]/address'. If no identifier is given, shows the item at the current location."
+DEFAULT_IDENTIFIER_DESC = "The identifier specifies the config item. Child elements are separated with the '/' character. List indices can be specified with '[i]', where i is an integer specifying the index, starting with 0. Examples: 'Init/start_auth', 'Recurse/listen_on[0]/address'. If no identifier is given, shows the item at the current location."
 
 def prepare_config_commands(tool):
     '''Prepare fixed commands for local configuration editing'''

+ 12 - 12
src/bin/bindctl/command_sets.py

@@ -35,21 +35,21 @@ command_sets = {
         'commands':
             [
             '!echo adding Authoritative server component',
-            'config add /Boss/components b10-auth',
-            'config set /Boss/components/b10-auth/kind needed',
-            'config set /Boss/components/b10-auth/special auth',
+            'config add /Init/components b10-auth',
+            'config set /Init/components/b10-auth/kind needed',
+            'config set /Init/components/b10-auth/special auth',
             '!echo adding Xfrin component',
-            'config add /Boss/components b10-xfrin',
-            'config set /Boss/components/b10-xfrin/address Xfrin',
-            'config set /Boss/components/b10-xfrin/kind dispensable',
+            'config add /Init/components b10-xfrin',
+            'config set /Init/components/b10-xfrin/address Xfrin',
+            'config set /Init/components/b10-xfrin/kind dispensable',
             '!echo adding Xfrout component',
-            'config add /Boss/components b10-xfrout',
-            'config set /Boss/components/b10-xfrout/address Xfrout',
-            'config set /Boss/components/b10-xfrout/kind dispensable',
+            'config add /Init/components b10-xfrout',
+            'config set /Init/components/b10-xfrout/address Xfrout',
+            'config set /Init/components/b10-xfrout/kind dispensable',
             '!echo adding Zone Manager component',
-            'config add /Boss/components b10-zonemgr',
-            'config set /Boss/components/b10-zonemgr/address Zonemgr',
-            'config set /Boss/components/b10-zonemgr/kind dispensable',
+            'config add /Init/components b10-zonemgr',
+            'config set /Init/components/b10-zonemgr/address Zonemgr',
+            'config set /Init/components/b10-zonemgr/kind dispensable',
             '!echo Components added. Please enter "config commit" to',
             '!echo finalize initial setup and run the components.'
             ]

+ 1 - 1
src/bin/ddns/b10-ddns.xml

@@ -119,7 +119,7 @@
         <listitem>
           <para>
             This value is ignored at this moment, but is provided for
-            compatibility with the <command>bind10</command> Boss process.
+            compatibility with the <command>bind10</command> Init process.
           </para>
         </listitem>
       </varlistentry>

+ 3 - 3
src/bin/stats/stats.py.in

@@ -249,17 +249,17 @@ class Stats:
 
         # It counts the number of instances of same module by
         # examining the third value from the array result of
-        # 'show_processes' of Boss
+        # 'show_processes' of Init
         seq = self.cc_session.group_sendmsg(
             isc.config.ccsession.create_command("show_processes"),
-            'Boss')
+            'Init')
         (answer, env) = self.cc_session.group_recvmsg(False, seq)
         modules = []
         if answer:
             (rcode, value) = isc.config.ccsession.parse_answer(answer)
             if rcode == 0 and type(value) is list:
                 # NOTE: For example, the "show_processes" command
-                # of Boss is assumed to return the response in this
+                # of Init is assumed to return the response in this
                 # format:
                 #  [
                 #  ...

+ 5 - 5
src/bin/stats/tests/b10-stats-httpd_test.py

@@ -68,7 +68,7 @@ XMLNS_XSD = "http://www.w3.org/2001/XMLSchema"
 XMLNS_XSI = stats_httpd.XMLNS_XSI
 
 DUMMY_DATA = {
-    'Boss' : {
+    'Init' : {
         "boot_time": time.strftime('%Y-%m-%dT%H:%M:%SZ', CONST_BASETIME)
         },
     'Auth' : {
@@ -278,7 +278,7 @@ class TestHttpHandler(unittest.TestCase):
                              + stats_httpd.XSD_URL_PATH)
             # check the path of XSL
             self.assertTrue(xsl_doctype.startswith(
-                    '<?xml-stylesheet type="text/xsl" href="' + 
+                    '<?xml-stylesheet type="text/xsl" href="' +
                     stats_httpd.XSL_URL_PATH
                     + '"?>'))
             # check whether the list of 'identifier' attributes in
@@ -397,7 +397,7 @@ class TestHttpHandler(unittest.TestCase):
 
         # 404 NotFound (too long path)
         self.client._http_vsn_str = 'HTTP/1.0'
-        self.client.putrequest('GET', stats_httpd.XML_URL_PATH + '/Boss/boot_time/a')
+        self.client.putrequest('GET', stats_httpd.XML_URL_PATH + '/Init/boot_time/a')
         self.client.endheaders()
         response = self.client.getresponse()
         self.assertEqual(response.status, 404)
@@ -1001,7 +1001,7 @@ class TestStatsHttpd(unittest.TestCase):
             self.assertFalse('item_format' in spec)
             self.assertFalse('format' in stats_xml[i].attrib)
 
-    @unittest.skipUnless(xml_parser, "skipping the test using XMLParser") 
+    @unittest.skipUnless(xml_parser, "skipping the test using XMLParser")
     def test_xsd_handler(self):
         self.stats_httpd = MyStatsHttpd(get_availaddr())
         xsd_string = self.stats_httpd.xsd_handler()
@@ -1036,7 +1036,7 @@ class TestStatsHttpd(unittest.TestCase):
                 self.assertEqual(attribs[i][1], stats_xsd[i].attrib['type'])
             self.assertEqual(attribs[i][2], stats_xsd[i].attrib['use'])
 
-    @unittest.skipUnless(xml_parser, "skipping the test using XMLParser") 
+    @unittest.skipUnless(xml_parser, "skipping the test using XMLParser")
     def test_xsl_handler(self):
         self.stats_httpd = MyStatsHttpd(get_availaddr())
         xsl_string = self.stats_httpd.xsl_handler()

+ 29 - 29
src/bin/stats/tests/b10-stats_test.py

@@ -319,15 +319,15 @@ class TestStats(unittest.TestCase):
         self.assertEqual(
             send_command(
                 'show', 'Stats',
-                params={ 'owner' : 'Boss',
+                params={ 'owner' : 'Init',
                   'name'  : 'boot_time' }),
-            (0, {'Boss': {'boot_time': self.const_datetime}}))
+            (0, {'Init': {'boot_time': self.const_datetime}}))
         self.assertEqual(
             send_command(
                 'show', 'Stats',
-                params={ 'owner' : 'Boss',
+                params={ 'owner' : 'Init',
                   'name'  : 'boot_time' }),
-            (0, {'Boss': {'boot_time': self.const_datetime}}))
+            (0, {'Init': {'boot_time': self.const_datetime}}))
         self.assertEqual(
             send_command('status', 'Stats'),
             (0, "Stats is up. (PID " + str(os.getpid()) + ")"))
@@ -335,13 +335,13 @@ class TestStats(unittest.TestCase):
         (rcode, value) = send_command('show', 'Stats')
         self.assertEqual(rcode, 0)
         self.assertEqual(len(value), 3)
-        self.assertTrue('Boss' in value)
+        self.assertTrue('Init' in value)
         self.assertTrue('Stats' in value)
         self.assertTrue('Auth' in value)
         self.assertEqual(len(value['Stats']), 5)
-        self.assertEqual(len(value['Boss']), 1)
-        self.assertTrue('boot_time' in value['Boss'])
-        self.assertEqual(value['Boss']['boot_time'], self.const_datetime)
+        self.assertEqual(len(value['Init']), 1)
+        self.assertTrue('boot_time' in value['Init'])
+        self.assertEqual(value['Init']['boot_time'], self.const_datetime)
         self.assertTrue('report_time' in value['Stats'])
         self.assertTrue('boot_time' in value['Stats'])
         self.assertTrue('last_update_time' in value['Stats'])
@@ -350,12 +350,12 @@ class TestStats(unittest.TestCase):
         (rcode, value) = send_command('showschema', 'Stats')
         self.assertEqual(rcode, 0)
         self.assertEqual(len(value), 3)
-        self.assertTrue('Boss' in value)
+        self.assertTrue('Init' in value)
         self.assertTrue('Stats' in value)
         self.assertTrue('Auth' in value)
         self.assertEqual(len(value['Stats']), 5)
-        self.assertEqual(len(value['Boss']), 1)
-        for item in value['Boss']:
+        self.assertEqual(len(value['Init']), 1)
+        for item in value['Init']:
             self.assertTrue(len(item) == 7)
             self.assertTrue('item_name' in item)
             self.assertTrue('item_type' in item)
@@ -383,10 +383,10 @@ class TestStats(unittest.TestCase):
 
     def test_update_modules(self):
         self.stats = stats.Stats()
-        self.assertEqual(len(self.stats.modules), 3) # Auth, Boss, Stats
+        self.assertEqual(len(self.stats.modules), 3) # Auth, Init, Stats
         self.stats.update_modules()
         self.assertTrue('Stats' in self.stats.modules)
-        self.assertTrue('Boss' in self.stats.modules)
+        self.assertTrue('Init' in self.stats.modules)
         self.assertFalse('Dummy' in self.stats.modules)
         my_statistics_data = stats.get_spec_defaults(self.stats.modules['Stats'].get_statistics_spec())
         self.assertTrue('report_time' in my_statistics_data)
@@ -399,7 +399,7 @@ class TestStats(unittest.TestCase):
         self.assertEqual(my_statistics_data['last_update_time'], self.const_default_datetime)
         self.assertEqual(my_statistics_data['timestamp'], 0.0)
         self.assertEqual(my_statistics_data['lname'], "")
-        my_statistics_data = stats.get_spec_defaults(self.stats.modules['Boss'].get_statistics_spec())
+        my_statistics_data = stats.get_spec_defaults(self.stats.modules['Init'].get_statistics_spec())
         self.assertTrue('boot_time' in my_statistics_data)
         self.assertEqual(my_statistics_data['boot_time'], self.const_default_datetime)
         orig_parse_answer = stats.isc.config.ccsession.parse_answer
@@ -411,8 +411,8 @@ class TestStats(unittest.TestCase):
         self.stats = stats.Stats()
         my_statistics_data = self.stats.get_statistics_data()
         self.assertTrue('Stats' in my_statistics_data)
-        self.assertTrue('Boss' in my_statistics_data)
-        self.assertTrue('boot_time' in my_statistics_data['Boss'])
+        self.assertTrue('Init' in my_statistics_data)
+        self.assertTrue('boot_time' in my_statistics_data['Init'])
         my_statistics_data = self.stats.get_statistics_data(owner='Stats')
         self.assertTrue('Stats' in my_statistics_data)
         self.assertTrue('report_time' in my_statistics_data['Stats'])
@@ -601,7 +601,7 @@ class TestStats(unittest.TestCase):
                              ['foo1']['nds_queries.perzone'],\
                              _new_val)
         self.assertEqual(self.stats.update_statistics_data(
-                'Boss', 'bar1', _test_exp7), ["KeyError: 'foo'"])
+                'Init', 'bar1', _test_exp7), ["KeyError: 'foo'"])
         self.assertEqual(self.stats.update_statistics_data(
                 'Foo', 'foo1', _test_exp6), ['unknown module name: Foo'])
 
@@ -717,9 +717,9 @@ class TestStats(unittest.TestCase):
         self.assertEqual(
             send_command(
                 'show', 'Stats',
-                params={ 'owner' : 'Boss',
+                params={ 'owner' : 'Init',
                   'name'  : 'boot_time' }),
-            (0, {'Boss': {'boot_time': self.const_datetime}}))
+            (0, {'Init': {'boot_time': self.const_datetime}}))
         stats_server.shutdown()
 
     def test_commands(self):
@@ -833,7 +833,7 @@ class TestStats(unittest.TestCase):
         self.assertEqual(rcode, 0)
         self.assertEqual(len(value), 3)
         self.assertTrue('Stats' in value)
-        self.assertTrue('Boss' in value)
+        self.assertTrue('Init' in value)
         self.assertTrue('Auth' in value)
         self.assertFalse('__Dummy__' in value)
         schema = value['Stats']
@@ -849,7 +849,7 @@ class TestStats(unittest.TestCase):
             if len(item) == 7:
                 self.assertTrue('item_format' in item)
 
-        schema = value['Boss']
+        schema = value['Init']
         self.assertEqual(len(schema), 1)
         for item in schema:
             self.assertTrue(len(item) == 7)
@@ -879,7 +879,7 @@ class TestStats(unittest.TestCase):
             self.stats.command_showschema(owner='Stats'))
         self.assertEqual(rcode, 0)
         self.assertTrue('Stats' in value)
-        self.assertFalse('Boss' in value)
+        self.assertFalse('Init' in value)
         self.assertFalse('Auth' in value)
         for item in value['Stats']:
             self.assertTrue(len(item) == 6 or len(item) == 7)
@@ -896,7 +896,7 @@ class TestStats(unittest.TestCase):
             self.stats.command_showschema(owner='Stats', name='report_time'))
         self.assertEqual(rcode, 0)
         self.assertTrue('Stats' in value)
-        self.assertFalse('Boss' in value)
+        self.assertFalse('Init' in value)
         self.assertFalse('Auth' in value)
         self.assertEqual(len(value['Stats'][0]), 7)
         self.assertTrue('item_name' in value['Stats'][0])
@@ -1150,15 +1150,15 @@ class TestStats(unittest.TestCase):
         self.assertEqual(
             send_command('show', 'Stats'),
             (0, stat.statistics_data))
-        # check statistics data of 'Boss'
+        # check statistics data of 'Init'
         b10_init = self.base.b10_init.server
         self.assertEqual(
-            stat.statistics_data_bymid['Boss'][b10_init.cc_session.lname],
+            stat.statistics_data_bymid['Init'][b10_init.cc_session.lname],
             {'boot_time': self.const_datetime})
         self.assertEqual(
-            len(stat.statistics_data_bymid['Boss']), 1)
+            len(stat.statistics_data_bymid['Init']), 1)
         self.assertEqual(
-            stat.statistics_data['Boss'],
+            stat.statistics_data['Init'],
             {'boot_time': self.const_datetime})
         # check statistics data of each 'Auth' instances
         list_auth = ['', '2']
@@ -1227,9 +1227,9 @@ class TestStats(unittest.TestCase):
         self.assertEqual(
             send_command('status', 'Stats'),
             (0, "Stats is up. (PID " + str(os.getpid()) + ")"))
-        # check default statistics data of 'Boss'
+        # check default statistics data of 'Init'
         self.assertEqual(
-            stat.statistics_data['Boss'],
+            stat.statistics_data['Init'],
             {'boot_time': self.const_default_datetime})
         stats_server.shutdown()
 

+ 5 - 5
src/bin/stats/tests/test_utils.py

@@ -140,11 +140,11 @@ class MockCfgmgr:
     def shutdown(self):
         self.cfgmgr.running = False
 
-class MockBoss:
+class MockInit:
     spec_str = """\
 {
   "module_spec": {
-    "module_name": "Boss",
+    "module_name": "Init",
     "module_description": "Mock Master process",
     "config_data": [
       {
@@ -537,8 +537,8 @@ class BaseModules:
         # MockCfgmgr
         self.cfgmgr = ThreadingServerManager(MockCfgmgr)
         self.cfgmgr.run()
-        # MockBoss
-        self.b10_init = ThreadingServerManager(MockBoss)
+        # MockInit
+        self.b10_init = ThreadingServerManager(MockInit)
         self.b10_init.run()
         # MockAuth
         self.auth = ThreadingServerManager(MockAuth)
@@ -558,7 +558,7 @@ class BaseModules:
         # MockAuth
         self.auth2.shutdown(True)
         self.auth.shutdown(True)
-        # MockBoss
+        # MockInit
         self.b10_init.shutdown(True)
         # MockCfgmgr
         self.cfgmgr.shutdown(True)

+ 1 - 1
src/bin/stats/tests/testdata/b10-config.db

@@ -1,5 +1,5 @@
 { "version": 2,
-  "Boss": {
+  "Init": {
     "components": {
       "b10-auth": {
         "kind": "needed",

+ 1 - 1
src/bin/zonemgr/zonemgr.py.in

@@ -625,7 +625,7 @@ class Zonemgr:
         ZONE_NOTIFY_COMMAND is issued by Auth process;
         ZONE_NEW_DATA_READY_CMD and ZONE_XFRIN_FAILED are issued by
         Xfrin process;
-        shutdown is issued by a user or Boss process. """
+        shutdown is issued by a user or Init process. """
         answer = create_answer(0)
         if command == ZONE_NOTIFY_COMMAND:
             """ Handle Auth notify command"""

+ 1 - 1
src/bin/zonemgr/zonemgr_messages.mes

@@ -69,7 +69,7 @@ new data.
 
 % ZONEMGR_RECEIVE_SHUTDOWN received SHUTDOWN command
 This is a debug message indicating that the zone manager has received
-a SHUTDOWN command over the command channel from the Boss process.
+a SHUTDOWN command over the command channel from the Init process.
 It will act on this command and shut down.
 
 % ZONEMGR_RECEIVE_UNKNOWN received unknown command '%1'

+ 1 - 1
src/lib/python/isc/bind10/socket_cache.py

@@ -115,7 +115,7 @@ class Cache:
     Each socket kept here has a reference count and when it drops to zero,
     it is removed from cache and closed.
 
-    This is expected to be part of Boss, it is not a general utility class.
+    This is expected to be part of Init, it is not a general utility class.
 
     It is not expected to be subclassed. The methods and members are named
     as protected so tests are easier access into them.

+ 6 - 6
src/lib/python/isc/bind10/tests/component_test.py

@@ -31,9 +31,9 @@ class TestError(Exception):
     """
     pass
 
-class BossUtils:
+class InitUtils:
     """
-    A class that brings some utilities for pretending we're Boss.
+    A class that brings some utilities for pretending we're Init.
     This is expected to be inherited by the testcases themselves.
     """
     def setUp(self):
@@ -86,7 +86,7 @@ class BossUtils:
     def start_cmdctl(self):
         pass
 
-class ComponentTests(BossUtils, unittest.TestCase):
+class ComponentTests(InitUtils, unittest.TestCase):
     """
     Tests for the bind10.component.Component class
     """
@@ -94,7 +94,7 @@ class ComponentTests(BossUtils, unittest.TestCase):
         """
         Pretend a newly started system.
         """
-        BossUtils.setUp(self)
+        InitUtils.setUp(self)
         self._shutdown = False
         self._exitcode = None
         self.__start_called = False
@@ -712,7 +712,7 @@ class FailComponent(BaseComponent):
     def _start_internal(self):
         raise TestError("test error")
 
-class ConfiguratorTest(BossUtils, unittest.TestCase):
+class ConfiguratorTest(InitUtils, unittest.TestCase):
     """
     Tests for the configurator.
     """
@@ -720,7 +720,7 @@ class ConfiguratorTest(BossUtils, unittest.TestCase):
         """
         Prepare some test data for the tests.
         """
-        BossUtils.setUp(self)
+        InitUtils.setUp(self)
         self.log = []
         # The core "hardcoded" configuration
         self.__core = {

+ 2 - 2
src/lib/python/isc/config/cfgmgr.py

@@ -210,7 +210,7 @@ class ConfigManager:
         else:
             self.cc = isc.cc.Session()
         self.cc.group_subscribe("ConfigManager")
-        self.cc.group_subscribe("Boss", "ConfigManager")
+        self.cc.group_subscribe("Init", "ConfigManager")
         self.running = False
         # As a core module, CfgMgr is different than other modules,
         # as it does not use a ModuleCCSession, and hence needs
@@ -233,7 +233,7 @@ class ConfigManager:
             ccsession.default_logconfig_handler({}, self.log_config_data)
 
     def notify_b10_init(self):
-        """Notifies the Boss module that the Config Manager is running"""
+        """Notifies the Init module that the Config Manager is running"""
         # TODO: Use a real, broadcast notification here.
         self.cc.group_sendmsg({"running": "ConfigManager"}, "Init")
 

+ 1 - 1
src/lib/python/isc/config/tests/cfgmgr_test.py

@@ -174,7 +174,7 @@ class TestConfigManager(unittest.TestCase):
         self.assertEqual(self.cm.data_path, self.writable_data_path)
         self.assertIsNotNone(self.cm.config)
         self.assertTrue(self.fake_session.has_subscription("ConfigManager"))
-        self.assertTrue(self.fake_session.has_subscription("Boss", "ConfigManager"))
+        self.assertTrue(self.fake_session.has_subscription("Init", "ConfigManager"))
         self.assertFalse(self.cm.running)
 
     def test_notify_b10_init(self):

+ 5 - 5
src/lib/server_common/socket_request.cc

@@ -125,7 +125,7 @@ createReleaseSocketMessage(const std::string& token) {
     return (isc::config::createCommand(RELEASE_SOCKET_COMMAND(), release));
 }
 
-// Checks and parses the response receive from Boss
+// Checks and parses the response receive from Init
 // If successful, token and path will be set to the values found in the
 // answer.
 // If the response was an error response, or does not contain the
@@ -158,7 +158,7 @@ readRequestSocketAnswer(isc::data::ConstElementPtr recv_msg,
     path = answer->get("path")->stringValue();
 }
 
-// Connect to the domain socket that has been received from Boss.
+// Connect to the domain socket that has been received from Init.
 // (i.e. the one that is used to pass created sockets over).
 //
 // This should only be called if the socket had not been connected to
@@ -218,7 +218,7 @@ getSocketFd(const std::string& token, int sock_pass_fd) {
         isc_throw(SocketRequestor::SocketError, "Error writing socket token");
     }
 
-    // Boss first sends some data to signal that getting the socket
+    // Init first sends some data to signal that getting the socket
     // from its cache succeeded
     char status[3];        // We need a space for trailing \0, hence 3
     memset(status, 0, 3);
@@ -301,7 +301,7 @@ public:
                                        share_name);
 
         // Send it to b10-init
-        const int seq = session_.group_sendmsg(request_msg, "Boss");
+        const int seq = session_.group_sendmsg(request_msg, "Init");
 
         // Get the answer from b10-init.
         // Just do a blocking read, we can't really do much anyway
@@ -331,7 +331,7 @@ public:
             createReleaseSocketMessage(token);
 
         // Send it to b10-init
-        const int seq = session_.group_sendmsg(release_msg, "Boss");
+        const int seq = session_.group_sendmsg(release_msg, "Init");
         LOG_DEBUG(logger, DBGLVL_TRACE_DETAIL, SOCKETREQUESTOR_RELEASESOCKET).
             arg(token);
 

+ 4 - 4
src/lib/server_common/tests/socket_requestor_test.cc

@@ -76,7 +76,7 @@ TEST(SocketRequestorAccess, initialized) {
     initTestSocketRequestor(NULL);
 }
 
-// This class contains a fake (module)ccsession to emulate answers from Boss
+// This class contains a fake (module)ccsession to emulate answers from Init
 class SocketRequestorTest : public ::testing::Test {
 public:
     SocketRequestorTest() : session(ElementPtr(new ListElement),
@@ -100,7 +100,7 @@ public:
     }
 
     // Creates a valid socket request answer, as it would be sent by
-    // Boss. 'valid' in terms of format, not values
+    // Init. 'valid' in terms of format, not values
     void
     addAnswer(const std::string& token, const std::string& path) {
         ElementPtr answer_part = Element::createMap();
@@ -141,7 +141,7 @@ createExpectedRequest(const std::string& address,
 
     // create the envelope
     const ElementPtr packet = Element::createList();
-    packet->add(Element::create("Boss"));
+    packet->add(Element::create("Init"));
     packet->add(Element::create("*"));
     packet->add(createCommand("get_socket", command_args));
     packet->add(Element::create(-1));
@@ -282,7 +282,7 @@ createExpectedRelease(const std::string& token) {
 
     // create the envelope
     const ElementPtr packet = Element::createList();
-    packet->add(Element::create("Boss"));
+    packet->add(Element::create("Init"));
     packet->add(Element::create("*"));
     packet->add(createCommand("drop_socket", command_args));
     packet->add(Element::create(-1));

+ 1 - 1
tests/lettuce/configurations/auth/auth_badzone.config.orig

@@ -29,7 +29,7 @@
             ]
         }
     },
-    "Boss": {
+    "Init": {
         "components": {
             "b10-auth": { "kind": "needed", "special": "auth" },
             "b10-cmdctl": { "special": "cmdctl", "kind": "needed" }

+ 1 - 1
tests/lettuce/configurations/auth/auth_basic.config.orig

@@ -13,7 +13,7 @@
             "address": "127.0.0.1"
         } ]
     },
-    "Boss": {
+    "Init": {
         "components": {
             "b10-auth": { "kind": "needed", "special": "auth" },
             "b10-cmdctl": { "special": "cmdctl", "kind": "needed" }

+ 1 - 1
tests/lettuce/configurations/bindctl/bindctl.config.orig

@@ -17,7 +17,7 @@
     "data_sources": {
         "classes": {}
     },
-    "Boss": {
+    "Init": {
         "components": {
             "b10-cmdctl": { "special": "cmdctl", "kind": "needed" }
         }

+ 1 - 1
tests/lettuce/configurations/bindctl_commands.config.orig

@@ -23,7 +23,7 @@
             "address": "127.0.0.1"
         } ]
     },
-    "Boss": {
+    "Init": {
         "components": {
             "b10-auth": { "kind": "dispensable", "special": "auth" },
             "b10-xfrin": { "address": "Xfrin", "kind": "dispensable" },

+ 1 - 1
tests/lettuce/configurations/ddns/ddns.config.orig

@@ -39,7 +39,7 @@
             ]
         }
     },
-    "Boss": {
+    "Init": {
         "components": {
             "b10-xfrout": {
                 "kind": "dispensable",

+ 1 - 1
tests/lettuce/configurations/ddns/noddns.config.orig

@@ -35,7 +35,7 @@
             ]
         }
     },
-    "Boss": {
+    "Init": {
         "components": {
             "b10-xfrout": {"kind": "dispensable"},
             "b10-auth": {"kind": "needed", "special": "auth"},

+ 1 - 1
tests/lettuce/configurations/example.org.config.orig

@@ -26,7 +26,7 @@
             ]
         }
     },
-    "Boss": {
+    "Init": {
         "components": {
             "b10-auth": { "kind": "needed", "special": "auth" },
             "b10-cmdctl": { "special": "cmdctl", "kind": "needed" }

+ 1 - 1
tests/lettuce/configurations/example.org.inmem.config

@@ -26,7 +26,7 @@
             ]
         }
     },
-    "Boss": {
+    "Init": {
         "components": {
             "b10-auth": { "kind": "needed", "special": "auth" },
             "b10-cmdctl": { "special": "cmdctl", "kind": "needed" }

+ 1 - 1
tests/lettuce/configurations/example2.org.config

@@ -27,7 +27,7 @@
             ]
         }
     },
-    "Boss": {
+    "Init": {
         "components": {
             "b10-auth": { "kind": "needed", "special": "auth" },
             "b10-cmdctl": { "special": "cmdctl", "kind": "needed" }

+ 1 - 1
tests/lettuce/configurations/inmemory_over_sqlite3/secondary.conf

@@ -29,7 +29,7 @@
             ]
         }
     },
-    "Boss": {
+    "Init": {
         "components": {
             "b10-auth": { "kind": "needed", "special": "auth" },
             "b10-xfrin": { "address": "Xfrin", "kind": "dispensable" },

+ 1 - 1
tests/lettuce/configurations/ixfr-out/testset1-config.db

@@ -51,7 +51,7 @@
             ]
         }
     },
-    "Boss": {
+    "Init": {
         "components": {
             "b10-auth": { "kind": "needed", "special": "auth" },
             "b10-xfrin": { "address": "Xfrin", "kind": "dispensable" },

+ 1 - 1
tests/lettuce/configurations/multi_instance/multi_auth.config.orig

@@ -24,7 +24,7 @@
             }]
         }
     },
-    "Boss": {
+    "Init": {
         "components": {
             "b10-auth-2": {"kind": "dispensable", "special": "auth"},
             "b10-auth": {"kind": "dispensable", "special": "auth"},

+ 1 - 1
tests/lettuce/configurations/no_db_file.config

@@ -27,7 +27,7 @@
             ]
         }
     },
-    "Boss": {
+    "Init": {
         "components": {
             "b10-auth": { "kind": "needed", "special": "auth" },
             "b10-cmdctl": { "special": "cmdctl", "kind": "needed" }

+ 1 - 1
tests/lettuce/configurations/nsec3/nsec3_auth.config

@@ -27,7 +27,7 @@
             ]
         }
     },
-    "Boss": {
+    "Init": {
         "components": {
             "b10-auth": {"kind": "needed", "special": "auth"},
             "b10-cmdctl": {"kind": "needed", "special": "cmdctl"}

+ 1 - 1
tests/lettuce/configurations/resolver/resolver_basic.config.orig

@@ -1 +1 @@
-{"version": 2, "Logging": {"loggers": [{"severity": "DEBUG", "name": "*", "debuglevel": 99}]}, "Resolver": {"query_acl": [{"action": "REJECT", "from": "127.0.0.1"}], "listen_on": [{"port": 47806, "address": "127.0.0.1"}]}, "Boss": {"components": {"b10-resolver": {"kind": "needed"}, "b10-cmdctl": {"kind": "needed", "special": "cmdctl"}}}}
+{"version": 2, "Logging": {"loggers": [{"severity": "DEBUG", "name": "*", "debuglevel": 99}]}, "Resolver": {"query_acl": [{"action": "REJECT", "from": "127.0.0.1"}], "listen_on": [{"port": 47806, "address": "127.0.0.1"}]}, "Init": {"components": {"b10-resolver": {"kind": "needed"}, "b10-cmdctl": {"kind": "needed", "special": "cmdctl"}}}}

+ 1 - 1
tests/lettuce/configurations/xfrin/inmem_slave.conf

@@ -30,7 +30,7 @@
             ]
         }
     },
-    "Boss": {
+    "Init": {
         "components": {
             "b10-auth": { "kind": "needed", "special": "auth" },
             "b10-xfrin": { "address": "Xfrin", "kind": "dispensable" },

+ 1 - 1
tests/lettuce/configurations/xfrin/retransfer_master.conf.orig

@@ -36,7 +36,7 @@
     "Stats": {
         "poll-interval": 1
     },
-    "Boss": {
+    "Init": {
         "components": {
             "b10-auth": { "kind": "needed", "special": "auth" },
             "b10-xfrout": { "address": "Xfrout", "kind": "dispensable" },

+ 1 - 1
tests/lettuce/configurations/xfrin/retransfer_master_nons.conf.orig

@@ -36,7 +36,7 @@
     "Stats": {
         "poll-interval": 1
     },
-    "Boss": {
+    "Init": {
         "components": {
             "b10-auth": { "kind": "needed", "special": "auth" },
             "b10-xfrout": { "address": "Xfrout", "kind": "dispensable" },

+ 1 - 1
tests/lettuce/configurations/xfrin/retransfer_slave.conf.orig

@@ -24,7 +24,7 @@
             }]
         }
     },
-    "Boss": {
+    "Init": {
         "components": {
             "b10-auth": { "kind": "needed", "special": "auth" },
             "b10-xfrin": { "address": "Xfrin", "kind": "dispensable" },

+ 1 - 1
tests/lettuce/configurations/xfrin/retransfer_slave_notify.conf

@@ -37,7 +37,7 @@
             "class": "IN"
         } ]
     },
-    "Boss": {
+    "Init": {
         "components": {
             "b10-auth": { "kind": "needed", "special": "auth" },
             "b10-xfrin": { "address": "Xfrin", "kind": "dispensable" },

+ 3 - 3
tests/lettuce/data/commands/bad_command

@@ -1,8 +1,8 @@
 !echo shouldshow
 # just add something so the test can verify it's reverted
-config add /Boss/components b10-auth
-config set /Boss/components/b10-auth/kind needed
-config set /Boss/components/b10-auth/special auth
+config add /Init/components b10-auth
+config set /Init/components/b10-auth/kind needed
+config set /Init/components/b10-auth/special auth
 bad command
 # this should not be reached
 !echo shouldnotshow

+ 11 - 11
tests/lettuce/features/bindctl_commands.feature

@@ -7,7 +7,7 @@ Feature: control with bindctl
         # a number of modules. It then removes all non-essential modules,
         # and checks whether they do disappear from the list of running
         # modules (note that it 'misuses' the help command for this,
-        # there is a Boss command 'show_processes' but it's output is
+        # there is a Init command 'show_processes' but it's output is
         # currently less standardized than 'help')
         Given I have bind10 running with configuration bindctl_commands.config
         And wait for bind10 stderr message BIND10_STARTED_CC
@@ -19,7 +19,7 @@ Feature: control with bindctl
         And wait for bind10 stderr message STATS_STARTING
         And wait for bind10 stderr message STATSHTTPD_STARTED
 
-        Then remove bind10 configuration Boss/components/NOSUCHMODULE
+        Then remove bind10 configuration Init/components/NOSUCHMODULE
         last bindctl output should contain Error
 
         bind10 module Xfrout should be running
@@ -30,29 +30,29 @@ Feature: control with bindctl
         bind10 module StatsHttpd should be running
         bind10 module Resolver should not be running
 
-        Then remove bind10 configuration Boss/components value b10-xfrout
+        Then remove bind10 configuration Init/components value b10-xfrout
         And wait for new bind10 stderr message BIND10_PROCESS_ENDED
         last bindctl output should not contain Error
 
         # assuming it won't error for further modules (if it does, the final
         # 'should not be running' tests would fail anyway)
-        Then remove bind10 configuration Boss/components value b10-stats-httpd
+        Then remove bind10 configuration Init/components value b10-stats-httpd
         And wait for new bind10 stderr message BIND10_PROCESS_ENDED
         last bindctl output should not contain Error
 
-        Then remove bind10 configuration Boss/components value b10-stats
+        Then remove bind10 configuration Init/components value b10-stats
         And wait for new bind10 stderr message BIND10_PROCESS_ENDED
         last bindctl output should not contain Error
 
-        Then remove bind10 configuration Boss/components value b10-zonemgr
+        Then remove bind10 configuration Init/components value b10-zonemgr
         And wait for new bind10 stderr message BIND10_PROCESS_ENDED
         last bindctl output should not contain Error
 
-        Then remove bind10 configuration Boss/components value b10-xfrin
+        Then remove bind10 configuration Init/components value b10-xfrin
         And wait for new bind10 stderr message BIND10_PROCESS_ENDED
         last bindctl output should not contain Error
 
-        Then remove bind10 configuration Boss/components value b10-auth
+        Then remove bind10 configuration Init/components value b10-auth
         And wait for new bind10 stderr message BIND10_PROCESS_ENDED
         last bindctl output should not contain Error
 
@@ -103,7 +103,7 @@ Feature: control with bindctl
         last bindctl output should not contain shouldnotshow
         # This would fail if the entire list was passed, or the configuration
         # was committed
-        send bind10 the command config show Boss/components
+        send bind10 the command config show Init/components
         last bindctl output should not contain b10-auth
 
         # nested_command contains another execute script
@@ -124,8 +124,8 @@ Feature: control with bindctl
 
         When I send bind10 the command execute init_authoritative_server show
         # just test some parts of the output
-        last bindctl output should contain /Boss/components/b10-auth/special
-        last bindctl output should contain /Boss/components/b10-zonemgr/kind
+        last bindctl output should contain /Init/components/b10-auth/special
+        last bindctl output should contain /Init/components/b10-zonemgr/kind
         last bindctl output should contain Please
 
         # nothing should have been changed

+ 1 - 1
tests/lettuce/features/default.feature

@@ -8,7 +8,7 @@ Feature: default bind10 config
     And wait for bind10 stderr message STATS_STARTING
 
     # These should be running
-    bind10 module Boss should be running
+    bind10 module Init should be running
     And bind10 module Logging should be running
     And bind10 module Stats should be running
 

+ 5 - 5
tests/lettuce/features/multi_instance.feature

@@ -34,7 +34,7 @@ Feature: Multiple instances
         If I remember the pid of process b10-auth
         And remember the pid of process b10-auth-2
 
-        When I remove bind10 configuration Boss/components value b10-auth-2
+        When I remove bind10 configuration Init/components value b10-auth-2
         And wait for new bind10 stderr message BIND10_PROCESS_ENDED
 
         Then the pid of process b10-auth should not have changed
@@ -42,9 +42,9 @@ Feature: Multiple instances
 
         When I send bind10 the following commands
         """
-        config add Boss/components b10-auth-2
-        config set Boss/components/b10-auth-2/special auth
-        config set Boss/components/b10-auth-2/kind needed
+        config add Init/components b10-auth-2
+        config set Init/components/b10-auth-2/special auth
+        config set Init/components/b10-auth-2/kind needed
         config commit
         """
         And wait for new bind10 stderr message AUTH_SERVER_STARTED
@@ -53,7 +53,7 @@ Feature: Multiple instances
         Then the pid of process b10-auth should not have changed
         A query for example.com should have rcode REFUSED
 
-        When I remove bind10 configuration Boss/components value b10-auth
+        When I remove bind10 configuration Init/components value b10-auth
         And wait for new bind10 stderr message BIND10_PROCESS_ENDED
         Then the pid of process b10-auth-2 should not have changed
         A query for example.com should have rcode REFUSED

+ 9 - 9
tests/lettuce/features/terrain/bind10_control.py

@@ -202,7 +202,7 @@ def parse_bindctl_output_as_data_structure():
                       "parseable data structure: '" + output + "': " + str(ve)
 
 def find_process_pid(step, process_name):
-    """Helper function to request the running processes from Boss, and
+    """Helper function to request the running processes from Init, and
        return the pid of the process with the given process_name.
        Fails with an assert if the response from b10-init is not valid JSON,
        or if the process with the given name is not found.
@@ -211,19 +211,19 @@ def find_process_pid(step, process_name):
     # are of the form [ pid, "name" ]
     # Not checking data form; errors will show anyway (if these turn
     # out to be too vague, we can change this)
-    step.given('send bind10 the command Boss show_processes')
+    step.given('send bind10 the command Init show_processes')
     running_processes = parse_bindctl_output_as_data_structure()
 
     for process in running_processes:
         if process[1] == process_name:
             return process[0]
     assert False, "Process named " + process_name +\
-                  " not found in output of Boss show_processes";
+                  " not found in output of Init show_processes";
 
 @step("remember the pid of process ([\S]+)")
 def remember_pid(step, process_name):
     """Stores the PID of the process with the given name as returned by
-       Boss show_processes command.
+       Init show_processes command.
        Fails if the process with the given name does not appear to exist.
        Stores the component_name->pid value in the dict world.process_pids.
        This should only be used by the related step
@@ -239,7 +239,7 @@ def remember_pid(step, process_name):
 @step('pid of process ([\S]+) should not have changed')
 def check_pid(step, process_name):
     """Checks the PID of the process with the given name as returned by
-       Boss show_processes command.
+       Init show_processes command.
        Fails if the process with the given name does not appear to exist.
        Fails if the process with the given name exists, but has a different
        pid than it had when the step 'remember the pid of process' was
@@ -343,9 +343,9 @@ def configure_ddns_on(step):
     step.behave_as("""
     When I send bind10 the following commands
         \"\"\"
-        config add Boss/components b10-ddns
-        config set Boss/components/b10-ddns/kind dispensable
-        config set Boss/components/b10-ddns/address DDNS
+        config add Init/components b10-ddns
+        config set Init/components/b10-ddns/kind dispensable
+        config set Init/components/b10-ddns/address DDNS
         config commit
         \"\"\"
     """)
@@ -358,7 +358,7 @@ def configure_ddns_off(step):
     step.behave_as("""
     When I send bind10 the following commands
         \"\"\"
-        config remove Boss/components b10-ddns
+        config remove Init/components b10-ddns
         config commit
         \"\"\"
     """)

+ 8 - 8
tests/system/bindctl/tests.sh

@@ -38,8 +38,8 @@ if [ $status != 0 ]; then echo "I:failed"; fi
 n=`expr $n + 1`
 
 echo "I:Starting b10-auth and checking that it works ($n)"
-echo 'config add Boss/components b10-auth
-config set Boss/components/b10-auth { "special": "auth", "kind": "needed" }
+echo 'config add Init/components b10-auth
+config set Init/components/b10-auth { "special": "auth", "kind": "needed" }
 config commit
 quit
 ' | $RUN_BINDCTL \
@@ -68,7 +68,7 @@ if [ $status != 0 ]; then echo "I:failed"; fi
 n=`expr $n + 1`
 
 echo "I:Stopping b10-auth and checking that ($n)"
-echo 'config remove Boss/components b10-auth
+echo 'config remove Init/components b10-auth
 config commit
 quit
 ' | $RUN_BINDCTL \
@@ -79,8 +79,8 @@ if [ $status != 0 ]; then echo "I:failed"; fi
 n=`expr $n + 1`
 
 echo "I:Restarting b10-auth and checking that ($n)"
-echo 'config add Boss/components b10-auth
-config set Boss/components/b10-auth { "special": "auth", "kind": "needed" }
+echo 'config add Init/components b10-auth
+config set Init/components/b10-auth { "special": "auth", "kind": "needed" }
 config commit
 quit
 ' | $RUN_BINDCTL \
@@ -143,8 +143,8 @@ n=`expr $n + 1`
 echo "I:Starting more b10-auths and checking that ($n)"
 for i in 2 3
 do
-    echo 'config add Boss/components b10-auth-'$i'
-config set Boss/components/b10-auth-'$i' { "special": "auth", "kind": "needed" }
+    echo 'config add Init/components b10-auth-'$i'
+config set Init/components/b10-auth-'$i' { "special": "auth", "kind": "needed" }
 config commit
 quit
 ' | $RUN_BINDCTL \
@@ -180,7 +180,7 @@ n=`expr $n + 1`
 echo "I:Stopping extra b10-auths and checking that ($n)"
 for i in 3 2
 do
-    echo 'config remove Boss/components b10-auth-'$i'
+    echo 'config remove Init/components b10-auth-'$i'
 config commit
 quit
 ' | $RUN_BINDCTL \

+ 1 - 1
tests/system/glue/nsx1/b10-config.db.in

@@ -23,7 +23,7 @@
         }
      ]
  },
- "Boss": {
+ "Init": {
    "components": {
      "b10-auth": {"kind": "needed", "special": "auth" },
      "b10-xfrin": { "address": "Xfrin", "kind": "dispensable" },

+ 1 - 1
tests/system/ixfr/b10-config.db.in

@@ -38,7 +38,7 @@
             "class": "IN"
         }]
     },
-    "Boss": {
+    "Init": {
         "components": {
             "b10-auth": {"kind": "needed", "special": "auth" },
             "b10-xfrin": { "address": "Xfrin", "kind": "dispensable" },