Commit 95b8519b authored by Jelte Jansen's avatar Jelte Jansen
Browse files

[1901] Replace Boss with Init

parent 826ac1b1
......@@ -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)
......
......@@ -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": {
......
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
......
......@@ -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
......
......@@ -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>
......
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.
......
......@@ -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.
......@@ -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()
......
......@@ -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().
......
......@@ -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>
......
......@@ -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'''
......
......@@ -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.'
]
......
......@@ -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>
......
......@@ -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:
# [
# ...
......
......@@ -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)
},