GettingStarted: update Device Conf & Prov

Update ch "4.3 - Device Configuration and Provisioning"
  - Remove Windows platform
  - Re-structure some chapters
  - Move In-band Management under New chapter "Configure Bridges"
  - Remove all screeshots except "Host Interfaces Caps" and make sure
    that image is up-to-date.

Change-Id: I54df140169506c180962d9099db4a56bf1e2ccb7
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>

3 files changed, 349 insertions, 460 deletions

diff --git a/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml b/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml
index 935c9df..5d980fc 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml
@@ -2,20 +2,20 @@
 <chapter id="getting_started_ucpe_manager">
   <title>Getting Started with Enea uCPE Manager</title>
 
-  <section id="prere">
+  <section id="prereq_ucpe">
     <title>Prerequisites</title>
 
-    <para>Listed below are the main generic prerequisites required so that
-    uCPE Manager can be deployed on your host platform:</para>
+    <para>Listed below are the main generic prerequisites required so that the 
+    uCPE Manager can be deployed on the host platform:</para>
 
     <itemizedlist>
       <listitem>
-        <para>A device that is supported by NFV Access.</para>
+        <para>A device that supports NFV Access.</para>
       </listitem>
 
       <listitem>
-        <para>A machine running either Windows or CentOS with network access
-        to the physical device.</para>
+        <para>A machine running CentOS with network access to the physical
+        device.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -23,35 +23,23 @@
   <section id="install_ucpe_manager">
     <title>Install the Enea uCPE Manager</title>
 
-    <para>Unpack the uCPE Manager and install it by following the instructions
+    <para>Unpack the uCPE Manager and install it following the instructions
     provided within the release archive:
     <literal>[unpacked_folder]/dist/README</literal>.</para>
 
-    <para>There are a few things to consider during the installation phase, as
+    <para>There are things to consider during the installation phase, as
     there are a few steps where user input is required. In most cases, the
     default values should be used.</para>
 
-    <para>For demo purposes, use the internal PostgreSQL database (which
-    defaults to Y), and not the machine as part of a cluster (which defaults
-    to N). Installing on a Windows machine, will require the user to follow
-    the Windows password policies when defining the password for the <emphasis
-    role="bold">ucpemanager</emphasis> service. A good example for an
-    acceptable password would
-    be:<emphasis>_1ucpe#2manager!3_</emphasis>.</para>
-
-    <para>Check that the Windows or CentOS machine where the uCPE Manager is
-    installed has the firewall disabled. To disable the firewall, if using
-    Windows 10, go to the Control Panel, then inside <literal>Network &amp;
-    Internet</literal> and <literal>Firewall &amp; Network
-    Protection</literal>, disable the firewall for "Domain network" and
-    "Private network".</para>
+    <note><para>Check that the CentOS machine where the uCPE Manager is installed
+      has the firewall disabled.</para></note>
 
     <para>Verify that the installation has succeeded:</para>
 
     <orderedlist>
       <listitem>
         <para>Point your browser to the server machine running the uCPE
-        Manager: <literal>https://localhost</literal>.</para>
+        Manager.</para>
       </listitem>
 
       <listitem>
@@ -73,10 +61,14 @@
       infrastructure.</para>
 
       <section id="man_config">
-        <title>Manual Addition</title>
+        <title>Direct Connection</title>
+
+        <para>When using this mechanism, the uCPE Manager will periodically poll 
+          the uCPE device, using a specified IP address as the destination, attempting 
+          to establish a management connection.</para>
 
         <para>Add the uCPE device running the NFV Access Run Time Platform to
-        the management system: <literal>Devices -&gt; Manage -&gt;
+        the management system by selecting <literal>Devices -&gt; Manage -&gt;
         Add</literal>. Supply information about the uCPE device, and set the
         parameters that will be used to connect to it.</para>
 
@@ -85,7 +77,7 @@
         <itemizedlist>
           <listitem>
             <para>Type. The type of device to be added, i.e <literal>Enea
-            universal uCPE</literal>.</para>
+            universal CPE</literal>.</para>
           </listitem>
         </itemizedlist>
 
@@ -98,25 +90,19 @@
 
         <itemizedlist>
           <listitem>
-            <para>IP Address. IP address of the device. If a device is
-            installed under a local/private network and not directly visible
-            to the uCPE Manager machine, the Gateway IP of the private network
-            must be used.</para>
+            <para>IP Address. IP address of the device.</para>
           </listitem>
         </itemizedlist>
 
         <itemizedlist>
           <listitem>
-            <para>SSH Port. The NETCONF Port used for communications. This is
-            a relevant parameter if the standard NETCONF SSH (i.e. not
-            Call-Home) is being used. Default is set to 830.</para>
+            <para>SSH Port. The NETCONF Port used for communications.</para>
           </listitem>
         </itemizedlist>
 
         <itemizedlist>
           <listitem>
-            <para>SSH User Name. The user name for SSH connectivity. Default
-            user is <literal>root</literal>.</para>
+            <para>SSH User Name. The user name for SSH connectivity.</para>
           </listitem>
         </itemizedlist>
 
@@ -136,8 +122,8 @@
 
         <itemizedlist>
           <listitem>
-            <para>Device ID. The unique instance ID of the device. This is
-            what links a device to its day-0 configuration (stored in the
+            <para>Device ID. The unique instance ID of the device. This links 
+              a device to its day-0 configuration (stored in the
             offline configuration system). It is a required field if you want
             to perform Zero-Touch Provisioning.</para>
           </listitem>
@@ -145,22 +131,29 @@
       </section>
 
       <section id="using_call_home">
-        <title>Using Call-Home</title>
-
-        <para>The uCPE Manager must be configured to bring the uCPE device
-        under management. This is done by selecting the <literal>Device Calls
-        Home</literal> checkbox when adding a device. When Device Calls Home
-        is checked, the device will initiate a connection by opening a socket
-        to the uCPE Manager for NETCONF traffic (over SSH), while the uCPE
-        Manager waits for device connection.</para>
+        <title>Device Call Home Connection</title>
+
+        <para>Follow the same steps as described in previous section, making sure
+          that the <literal>Device Calls Home</literal> checkbox is selected.</para>
+          
+          <para>When using this mechanism, the device will initiate a connection 
+            to the uCPE Manager for NETCONF traffic (over SSH), while the uCPE 
+            Manager waits for a device connection. Make sure the uCPE Manager IP
+            address has been configured on the device. For more information please see section 
+          <link linkend="install_ena_stick">Installing Enea NFV Access</link> for more details.</para>
       </section>
     </section>
 
     <section id="host_int_net_config">
-      <title>Prepare uCPE device for VNF onboarding</title>
+      <title>Configure NFV Infrastructure</title>
+
+      <para>Once a management connection with the uCPE device has been established
+      by using any of the supported methods, the virtualization networking
+      infrastructure can be configured either manually or by using Zero Touch
+      Provisioning.</para>
 
       <para>The uCPE Manager can list network interfaces found on a device by
-      selecting: <literal>Device</literal> -&gt;
+      selecting the uCPE device first and then selecting
       <literal>Configuration</literal> -&gt; <literal>OpenVSwitch
       </literal>-&gt; <literal>Host Interface Caps</literal>:</para>
 
@@ -175,234 +168,301 @@
         </mediaobject>
       </figure>
 
-      <para>Network interfaces can be set in three modes: DPDK, SR-IOV and
-      PCI-Passthrough.</para>
+      <para>Available network interfaces can be added to the management
+      system, for use by the networking virtualization infrastructure.</para>
 
-      <section id="dpdk_interface">
-        <title>DPDK Interface Type</title>
+      <section id="man_configuration">
+        <title>Manual Configuration</title>
 
-        <para>Configuring a physical interface in DPDK mode will require a
-        DPDK-based application (e.g. OVS-DPDK) in order to access and use the
-        interface. An interface set as DPDK can be attached to an OVS-DPDK
-        bridge. Select the uCPE device, then from the top toolbar select:
-        <literal>Configuration</literal> -&gt;<literal> OpenVSwitch
-        </literal>-&gt; <literal>Host Interfaces</literal> -&gt;<literal>
-        Add</literal>:</para>
+        <para>For Manual Configuration of uCPE networking, select the uCPE device 
+          first and then <literal>Configuration</literal> -&gt; <literal>OpenVSwitch</literal>.
+          In the <literal>Host Interfaces Caps</literal>, one can find a list of available network
+        interfaces and their capabilities.</para>
 
-        <figure>
-          <title>DPDK Host Interface</title>
+        <section id="configure_interfaces">
+          <title>Configuring Interfaces</title>
 
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center"
-                         fileref="images/dpdk_interface_type.png" scale="90" />
-            </imageobject>
-          </mediaobject>
-        </figure>
+          <para><emphasis role="bold">DPDK Interface Type</emphasis></para>
 
-        <para>For DPDK mode, the user must set following fields:</para>
+          <para>Configuring a physical interface in DPDK mode will require a
+          DPDK-based application (e.g. OVS-DPDK) in order to access and use
+          the interface. An interface set as the DPDK can be attached to an
+            OVS-DPDK bridge.</para>
+          
+          <para>Select the uCPE device, then from the top toolbar
+          select <literal>Configuration</literal> -&gt; <literal>OpenVSwitch
+            </literal> -&gt; <literal>Host Interfaces</literal> -&gt; <literal>
+            Add</literal>.</para>
 
-        <itemizedlist>
-          <listitem>
-            <para>Source: PCI address of the physical interface</para>
-          </listitem>
+          <para>For DPDK mode, the user must set values for the following fields:</para>
 
-          <listitem>
-            <para>Type: dpdk</para>
-          </listitem>
+          <itemizedlist>
+            <listitem>
+              <para>Source: the PCI address of the physical interface.</para>
+            </listitem>
 
-          <listitem>
-            <para>Networking-type: dpdk</para>
-          </listitem>
+            <listitem>
+              <para>Type: dpdk</para>
+            </listitem>
 
-          <listitem>
-            <para>Dpdk-type: kernel module that allow user space access of
-            physical interface</para>
-          </listitem>
-        </itemizedlist>
+            <listitem>
+              <para>Networking-type: dpdk</para>
+            </listitem>
 
-        <para>Create an OpenVSwitch bridge (<literal>ovsbr0</literal>) on the
-        device that uses a DPDK interface, by selecting the uCPE device, then
-        from the top toolbar selecting: <literal>Configuration</literal>-&gt;
-        <literal>OpenVSwitch</literal> -&gt; <literal>Bridges</literal> -&gt;
-        <literal>Add</literal>:</para>
+            <listitem>
+              <para>Dpdk-type: the kernel module that allows user space access to the 
+                physical interface.</para>
+            </listitem>
+          </itemizedlist>
 
-        <figure>
-          <title>OVS bridge</title>
+          <para>Create an OpenVSwitch bridge (<literal>ovsbr0</literal>) on
+          the device that uses a DPDK interface, by selecting the uCPE device,
+          then from the top toolbar selecting <literal>Configuration</literal> 
+            -&gt; <literal>OpenVSwitch</literal> -&gt; <literal>Bridges</literal> -&gt;
+          <literal>Add</literal>.</para>
 
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="images/ovs_bridge.png"
-                         scale="95" />
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </section>
+          <para><emphasis role="bold">SR-IOV Interface Type</emphasis></para>
 
-      <section id="sriov_interface_type">
-        <title>SR-IOV Interface Type</title>
+          <para>SR-IOV mode will create a number of virtual functions on the host
+          which can be used to route traffic to VMs. Select the uCPE device,
+          then from the top toolbar select <literal>Configuration</literal> 
+            -&gt; <literal>OpenVSwitch</literal> -&gt; <literal>Host Interfaces
+            </literal> -&gt; <literal>Add</literal>.</para>
 
-        <para>SR-IOV mode will create a number of virtual functions on host
-        that can be used to route traffic to VMs. Select the uCPE device, then
-        from the top toolbar select: <literal>Configuration</literal>
-        -&gt;<literal> OpenVSwitch </literal>-&gt; <literal>Host Interfaces
-        </literal>-&gt;<literal> Add</literal>:</para>
+          <para>For SR-IOV mode, the user must set values for the following fields:</para>
 
-        <para>For SR-IOV mode, the user must set following fields:</para>
+          <itemizedlist>
+            <listitem>
+              <para>Source: the PCI address of the physical interface.</para>
+            </listitem>
 
-        <itemizedlist>
-          <listitem>
-            <para>Source: PCI address of the physical interface</para>
-          </listitem>
+            <listitem>
+              <para>Type: sr-iov</para>
+            </listitem>
 
-          <listitem>
-            <para>Type: sr-iov</para>
-          </listitem>
+            <listitem>
+              <para>Networking-type: srIov</para>
+            </listitem>
 
-          <listitem>
-            <para>Networking-type: srIov</para>
-          </listitem>
+            <listitem>
+              <para>sriov-mode: adapter-pool</para>
+            </listitem>
 
-          <listitem>
-            <para>sriov-mode: adapter-pool</para>
-          </listitem>
+            <listitem>
+              <para>sriov-num-vfs: the number of virtual functions to
+              create.</para>
+            </listitem>
+          </itemizedlist>
 
-          <listitem>
-            <para>sriov-num-vfs: the number of virtual functions to
-            create</para>
-          </listitem>
-        </itemizedlist>
+          <para><emphasis role="bold">PCI Passthrough Interface
+          Type</emphasis></para>
 
-        <figure>
-          <title>SR-IOV Interface Type</title>
+          <para>For the PCI Passthrough a user does not have to configure a
+          physical interface, instead simply select the PCI address and
+          connect it to a virtual port when the VNF instantiation step is reached.</para>
+        </section>
 
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center"
-                         fileref="images/sriov_interface_type.png" scale="90" />
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </section>
+        <section id="configure_bridges">
+          <title>Configuring Bridges</title>
 
-      <section id="pci_interface_type">
-        <title>PCI Passthrough Interface Type</title>
+          <para><emphasis role="bold">In-band Management</emphasis></para>
 
-        <para>For PCI Passthrough the user does not have to configure a
-        physical interface, instead simply select the PCI address and connect
-        it to a virtual port at the VNF instantiation step.</para>
-      </section>
-    </section>
+          <para>In-band Management refers to a model where both the data plane
+          and control plane flow over the same network path.</para>
 
-    <section id="zero_touch_prov">
-      <title>Zero Touch Provisioning</title>
-
-      <para>Zero-Touch Provisioning (ZTP) is an alternative to Manual
-      configuration. ZTP refers to the process by which, when a device starts
-      up for the first time, its initial configuration is pushed down by an
-      external management system, so that it is setup for proper operation
-      without additional manual intervention by an operator.</para>
-
-      <para>A variety of operations can occur as part of ZTP such as initial
-      device setup, configuration of managed objects, etc. The goal is to set
-      up a device to the maximum possible extent without forcing an operator
-      to be physically present (initially) to manage the device.</para>
-
-      <para>In order to create a static configuration supporting ZTP, the uCPE
-      Manager user needs to identify the <literal>Device ID</literal> of the
-      machine running NFV Access.</para>
-
-      <para>During the automatic installation process when the
-      <literal>Automatic install</literal> step is reached, enter the option
-      menu <literal>Customize kernel parameters</literal> and set the
-      <literal>uCPE Manager IP address</literal>. Please check <xref
-      linkend="install_ena_stick" />, for how to set the uCPE Manager IP
-      address at boot time. The Device ID will be listed in the installer
-      under the <literal>Customize kernel parameters</literal> menu.</para>
-
-      <para>With the address parameter set, run
-      <literal>list_deviceID.sh</literal> after NFV Access is installed and
-      booted, to get the device ID of the uCPE device.</para>
-
-      <note>
-        <para>It is possible to let NFV Access know the uCPE Manager IP
-        address at run-time by setting <literal>vcpemgr=&lt;IP&gt;</literal>
-        as a kernel boot parameter in the grub configuration file. Reboot is
-        required after this update.</para>
-
-        <para>This step needs to be done each time the uCPE Manager host
-        changes its IP address.</para>
-      </note>
-
-      <para>An offline configuration can be prepared in advance for the uCPE
-      Manager to setup the infrastructure on the device.</para>
-
-      <section id="offline_configuration">
-        <title>Offline Configuration</title>
-
-        <para>The Offline Configuration subsystem is used to pre-populate a
-        configuration for a device that will be brought under management at a
-        future point in time. When creating an offline configuration store, an
-        optional<literal> Device ID</literal> can be specified - this ID
-        uniquely identifies the device to be initialized.</para>
-
-        <para>Use the GUI (shown below) launched by the <literal>Applications
-        -&gt; Offline Config -&gt; Add</literal> menu:</para>
+          <para>In some situations, In-band Management is the only option
+          available to both control and configure the uCPE device, while also
+          allowing for data-path traffic to pass over the same physical
+          interface.</para>
 
-        <figure>
-          <title>Onboard New VNF</title>
+          <para>The main requirement in order to use this solution is to have all
+          traffic pass through a defined WAN physical port.</para>
 
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="images/offline_config.png"
-                         scale="80" />
-            </imageobject>
-          </mediaobject>
-        </figure>
+          <para>Three types of traffic are mentioned hereafter:</para>
 
-        <para>Specify the exact value of the <literal>Device ID</literal> in
-        the required field. This will tag the device needed for the initial
-        configuration provided by the offline configuration store. Choose
-        <literal>Merge</literal> as the Default Upload Method if you do not
-        want any boot configuration set on the device, to be wiped out.
-        Selecting <literal>Replace</literal> will set the entire device
-        configuration to match values in the offline configuration.</para>
-
-        <para>After creating the Offline Config Store, access the device
-        through <literal> Applications -&gt; offline config -&gt; Config
-        App</literal> and provision it with the required initial
-        configuration. This operation mirrors what happens during regular
-        offline configuration.</para>
-
-        <para>Now that the store has been provisioned successfully, it is
-        ready to send this configuration to the device when it first comes
-        online.</para>
-      </section>
+          <itemizedlist>
+            <listitem>
+              <para>Device management. Part of the device configuration done by the
+              uCPE Manager.</para>
+            </listitem>
+
+            <listitem>
+              <para>VNF(s) configuration. Enabling or disabling features of a
+              VNF. E.g. enabling/disabling the firewall or VPN setup.</para>
+            </listitem>
 
-      <section id="initial_communications">
-        <title>Initial Communications</title>
+            <listitem>
+              <para>Data-path. All other traffic that is not used in the
+              control plane and needs to reach a LAN network.</para>
+            </listitem>
+          </itemizedlist>
 
-        <para>There are two possible paths to this process, depending upon
-        whether or not NETCONF Call-Home functionality is used:</para>
+          <note>
+            <para>For use-cases where latency is very important, it is
+            recommended to use out-of-band management with a dedicated
+            physical interface for the data-path.</para>
+          </note>
+
+          <para>The solution provided by Enea for In-band management is based
+          upon Open vSwitch bridges which control all traffic passing through
+            the WAN physical port. The NFV Access platform will assume the activated 
+              connection with the uCPE Manager should be used for In-band management. 
+            The physical port used by the active connection will be attached to the 
+            In-band management WAN bridge. Communication with the uCPE Manager 
+            should not be affected, it is reestablished automatically after In-band management
+          activation.</para>
+
+          <para>All network traffic, with the exception of any received from
+          the uCPE Manager, will be sent to the VNF or dropped if there
+          is no VNF instantiated on the uCPE device. The VNF connected to the
+          WAN bridge must be configured for In-band management since traffic
+          from the VNF manager and data-path will be sent to only one port
+          (WAN) of the VNF.</para>
+
+          <note>
+            <para>Only one VNF must be connected to the In-band management WAN
+            bridge.</para>
+          </note>
+
+          <table>
+            <title>Setup Prerequisites</title>
+
+            <tgroup cols="2">
+              <colspec align="left" colwidth="2*" />
+
+              <colspec align="left" colwidth="4*" />
+
+              <tbody>
+                <row>
+                  <entry>WAN port</entry>
+
+                  <entry>The physical port supported by DPDK.</entry>
+                </row>
+
+                <row>
+                  <entry>Dynamic IP on WAN port</entry>
+
+                  <entry>The DHCP server configured to distribute the same IP address
+                  for the same MAC.</entry>
+                </row>
+
+                <row>
+                  <entry>uCPE Manager</entry>
+
+                  <entry>The uCPE Manager IP address must be public (accessible
+                  for the uCPE device) and static.</entry>
+                </row>
+              </tbody>
+            </tgroup>
+          </table>
+
+          <para><emphasis role="bold">How to activate In-band Management from
+          the uCPE Manager</emphasis></para>
+
+          <orderedlist>
+            <listitem>
+              <para>Select the uCPE device.</para>
+            </listitem>
 
-        <orderedlist>
-          <listitem>
-            <para>If Call-Home is not enabled/supported, the uCPE Manager
-            creates a SSH session to the device over the port configured
-            through the <literal>Add Device </literal> process (default 830).
-            It then initiates NETCONF communications over this session.</para>
-          </listitem>
+            <listitem>
+              <para>Select Configuration.</para>
+            </listitem>
 
-          <listitem>
-            <para>If the device uses Call-Home, it creates a socket connection
-            to port 4334 on the management system which runs the uCPE Manager.
-            The uCPE Manager then creates a SSH session over this socket and
-            initiates NETCONF communications as a client.</para>
-          </listitem>
-        </orderedlist>
+            <listitem>
+              <para>Click OpenvSwitch.</para>
+            </listitem>
+
+            <listitem>
+              <para>Select the Bridges option, then click Add.</para>
+            </listitem>
+          </orderedlist>
+
+          <para>
+            <emphasis role="bold">In-band management WAN DPDK bridge configuration</emphasis>
+          </para>
+          
+          <itemizedlist>
+            <listitem><para><emphasis role="bold">name</emphasis>. Provide a name for the WAN bridge e.g.
+                  "ibm-wan-br".</para></listitem>
+            <listitem><para><emphasis role="bold">ovs-bridge-type</emphasis>. dpdkWan</para></listitem>
+            <listitem><para><emphasis role="bold">mgmt-address</emphasis>. IPv4 (add the IP address of the uCPE Manager machine).</para></listitem>
+            <listitem><para><emphasis role="bold">mgmt-port</emphasis>. 4334</para></listitem>
+            </itemizedlist>
+
+          <para>The connection between the uCPE device and uCPE Manager will
+          be recreated and all traffic will pass through the new bridge
+          (ibm-wan-br). The WAN port of the very first instantiated VNF must
+            be connected to the <literal>ibm-wan-br</literal> bridge and it 
+            should receive the same IP address as the WAN interfaces of the uCPE device.</para>
+
+          <figure>
+            <title>Enea In-band Management solution</title>
+
+            <mediaobject>
+              <imageobject>
+                <imagedata align="center"
+                           fileref="images/In-bandManagement.png" scale="65" />
+              </imageobject>
+            </mediaobject>
+          </figure>
+
+          <para>The VNF can be reached on the same IP address as the uCPE
+          device, e.g. <literal>https://&lt;WAN_IP&gt;</literal> if a HTTP
+          server is present on that VNF.</para>
+
+          <note>
+            <para>The In-band management bridge must be recreated each time
+            the uCPE Manager IP is changed.</para>
+          </note>
+        </section>
+      </section>
 
-        <para>Once communications with the device have been established, the
-        Device Manager will try and connect to it.</para>
+      <section id="zero_touch_prov">
+        <title>Zero Touch Provisioning</title>
+
+        <para>Zero-Touch Provisioning (ZTP) refers to the process of when a device
+        starts up for the first time and its initial configuration is pushed down
+        by an external management system, so that it is setup for proper
+        operation without additional manual intervention by an
+        operator. ZTP is an alternative to Manual configuration.</para>
+
+        <para>A variety of operations can occur as part of ZTP such as initial
+        device setup, configuration of managed objects, etc. The goal is to
+        set up a device to the maximum possible extent without forcing an
+        operator to be physically present (initially) to manage the
+        device.</para>
+
+        <para>An offline configuration can be prepared in advance for the uCPE
+        Manager to setup the infrastructure on the device.</para>
+
+        <section id="offline_configuration">
+          <title>Offline Configuration</title>
+
+          <para>The Offline Configuration subsystem is used to pre-populate a
+          configuration for a device that will be brought under management at
+            a future point in time.</para>
+          
+          <para>When creating an offline configuration store a 
+            <literal>Device ID</literal> can be specified. This ID
+          uniquely identifies the device to be initialized.</para>
+
+          <para>From the top toolbar menu select <literal>Applications</literal> -&gt;
+          <literal>Offline Config</literal> -&gt; <literal>Add</literal>. 
+            Specify the exact value of the <literal>Device ID</literal> in the 
+            required field. This will tag the device needed for 
+            the initial configuration provided by the
+          offline configuration store. Choose <literal>Merge</literal> as the
+          "Default Upload Method" if you do not want any boot configuration set
+          on the device, to be wiped out. Selecting <literal>Replace</literal>
+          will set the entire device configuration to match values in the
+          offline configuration.</para>
+
+          <para>After creating the Offline Config Store, access the device
+          through <literal>Applications</literal> -&gt; <literal>offline config</literal> 
+            -&gt; <literal>Config App</literal> and provision it with the required initial
+          configuration. This operation mirrors what happens during regular
+          offline configuration.</para>
+        </section>
       </section>
     </section>
   </section>
@@ -410,10 +470,9 @@
   <section id="vnf_management">
     <title>VNF Management</title>
 
-    <para>The Enea uCPE Manager is responsible for
-    onboarding, configuring (e.g. CloudInit) and ensuring life cycle
-    management of VNFs that are instantiated and run on the various uCPE
-    devices.</para>
+    <para>The Enea uCPE Manager is responsible for onboarding, configuring
+    (e.g. CloudInit) and ensuring life cycle management of VNFs that are
+    instantiated and run on the various uCPE devices.</para>
 
     <section id="onboarding_a_vnf">
       <title>Onboarding a VNF</title>
@@ -423,8 +482,8 @@
       uCPE devices). This is accomplished using the Enea uCPE Manager
       Onboarding graphical user interface.</para>
 
-      <para>Typically, the Getting Started Guide of a VNF contains all necessary
-      information needed to onboard a VNF.</para>
+      <para>Typically, the Getting Started Guide of a VNF contains all
+      necessary information needed to onboard a VNF.</para>
 
       <section id="retrieve_art">
         <title>Retrieving Artifacts</title>
@@ -438,7 +497,8 @@
           </listitem>
 
           <listitem>
-            <para>Procure any VNF-specific files from the VNF vendor, e.g. license file.</para>
+            <para>Procure any VNF-specific files from the VNF vendor, e.g.
+            license file.</para>
 
             <note>
               <para>There are no standard ways of managing VNF licenses,
@@ -477,11 +537,13 @@
                 <para>This decides what resources the VNF is configured for,
                 along with networking and day zero configurations.</para>
 
-                <note><para>Generally, the Getting Started Guide for the VNF
-                provides guidelines for resource allocation, but since
-                performance is dependent on hardware capacity, the right
-                resource allocation for deployment is determined
-                  through benchmarking.</para></note>
+                <note>
+                  <para>Generally, the Getting Started Guide for the VNF
+                  provides guidelines for resource allocation, but since
+                  performance is dependent on hardware capacity, the right
+                  resource allocation for deployment is determined through
+                  benchmarking.</para>
+                </note>
               </listitem>
 
               <listitem>
@@ -533,22 +595,22 @@
 
           <listitem>
             <para>When prompted by the UI, make sure the <literal>VM
-            Image</literal> radio button at the top of the onboarding 
-              screen is selected, it will trigger a popup menu.</para>
+            Image</literal> radio button at the top of the onboarding screen
+            is selected, it will trigger a popup menu.</para>
           </listitem>
         </orderedlist>
 
-        <para>This menu contains data fields where both necessary and optional 
-          information about the VNF can be supplied. After doing so, press
-          the onboard button, the uCPE Manager will create the VNF package and onboard it.</para>
+        <para>This menu contains data fields where both necessary and optional
+        information about the VNF can be supplied. After doing so, press the
+        onboard button, the uCPE Manager will create the VNF package and
+        onboard it.</para>
 
         <figure>
           <title>Onboard a VNF</title>
 
           <mediaobject>
             <imageobject>
-              <imagedata align="center"
-                         contentwidth="600"
+              <imagedata align="center" contentwidth="600"
                          fileref="images/onboard_a_vnf_image.png" />
             </imageobject>
           </mediaobject>
@@ -559,9 +621,9 @@
         <itemizedlist>
           <listitem>
             <para><emphasis role="bold">VM Image File</emphasis>. This is the
-            Virtual Machine image file for the VNF. Typically, it is a
-            QCOW image. Press <literal>Choose File</literal> and select the
-            image you wish to upload.</para>
+            Virtual Machine image file for the VNF. Typically, it is a QCOW
+            image. Press <literal>Choose File</literal> and select the image
+            you wish to upload.</para>
           </listitem>
 
           <listitem>
@@ -577,8 +639,8 @@
 
           <listitem>
             <para><emphasis role="bold">Description</emphasis>. This field
-            contains any description provided and is only displayed
-            in the GUI tables in the uCPE Manager.</para>
+            contains any description provided and is only displayed in the GUI
+            tables in the uCPE Manager.</para>
           </listitem>
 
           <listitem>
@@ -616,13 +678,14 @@
         <para>This table will contain the interfaces required by this VNF to
         be configured, when creating an instance. Consult the VNF vendor to
         determine which and how many are required. Each interface requires a
-        name, and optionally a description, used only by the uCPE Manager.</para>
+        name, and optionally a description, used only by the uCPE
+        Manager.</para>
 
         <para><emphasis role="bold">Cloud Init Tab</emphasis></para>
 
         <para>Click the <literal>Clout Init</literal> tab to provide the
-        Clout-Init configuration. There are three fields that need to be 
-          populated:</para>
+        Clout-Init configuration. There are three fields that need to be
+        populated:</para>
 
         <orderedlist>
           <listitem>
@@ -630,9 +693,9 @@
             Datasource</emphasis></para>
 
             <para>To onboard a VNF you must specify the <literal>Cloud-Init
-            Datasource</literal> that the VNF uses. This
-            information is procured from the VNF Vendor. Choose one of the following
-            methods to specify the datasource:</para>
+            Datasource</literal> that the VNF uses. This information is
+            procured from the VNF Vendor. Choose one of the following methods
+            to specify the datasource:</para>
 
             <itemizedlist spacing="compact">
               <listitem>
@@ -690,10 +753,10 @@
 
         <para>In this table, you can enter values for properties that will be
         used during instantiation of the VNF. The values will augment the
-          default values in the <filename>Domain.XML</filename> file used 
-          by <literal>libvirt/virsh</literal> (running in NFV Access) when 
-          creating an instance of the VNF. Consult with the VNF Vendor
-        or ENEA support for values needed by specific VNFs.</para>
+        default values in the <filename>Domain.XML</filename> file used by
+        <literal>libvirt/virsh</literal> (running in NFV Access) when creating
+        an instance of the VNF. Consult with the VNF Vendor or ENEA support
+        for values needed by specific VNFs.</para>
 
         <para><emphasis role="bold">Property Values</emphasis></para>
 
@@ -706,9 +769,9 @@
       <title>Instantiating a VNF</title>
 
       <para>When a VNF is onboarded and available in the VNF catalog, it can
-      be instantiated on connected uCPE devices. The configurations 
-        provided when the VNF is onboarded, serve as a template for instantiation. 
-        Follow the instructions below to instantiate a VNF:</para>
+      be instantiated on connected uCPE devices. The configurations provided
+      when the VNF is onboarded, serve as a template for instantiation. Follow
+      the instructions below to instantiate a VNF:</para>
 
       <orderedlist>
         <listitem>
@@ -757,8 +820,8 @@
         </listitem>
 
         <listitem>
-          <para>Add VNF-specific configuration data by uploading a Cloud-Init file
-          (when the Cloud-Init is used).</para>
+          <para>Add VNF-specific configuration data by uploading a Cloud-Init
+          file (when the Cloud-Init is used).</para>
         </listitem>
 
         <listitem>
@@ -766,8 +829,8 @@
         </listitem>
 
         <listitem>
-          <para>Hit the <literal>Create</literal> button to deploy the
-          VNF and run it on the specified uCPE device.</para>
+          <para>Hit the <literal>Create</literal> button to deploy the VNF and
+          run it on the specified uCPE device.</para>
         </listitem>
       </orderedlist>
 
@@ -785,8 +848,9 @@
 
       <orderedlist>
         <listitem>
-          <para>SSH to the uCPE device from the Enea uCPE Manager (<literal>Device-&gt;SSH</literal>) 
-            with default user and password: <literal>root</literal>.</para>
+          <para>SSH to the uCPE device from the Enea uCPE Manager
+          (<literal>Device-&gt;SSH</literal>) with default user and password:
+          <literal>root</literal>.</para>
         </listitem>
 
         <listitem>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/host_interface_caps.png b/doc/book-enea-nfv-access-getting-started/doc/images/host_interface_caps.png
index 5adb5c2..42188a5 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/host_interface_caps.png
+++ b/doc/book-enea-nfv-access-getting-started/doc/images/host_interface_caps.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/in_band_management.xml b/doc/book-enea-nfv-access-getting-started/doc/in_band_management.xml
deleted file mode 100644
index 6f5cdb1..0000000
--- a/doc/book-enea-nfv-access-getting-started/doc/in_band_management.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<chapter id="in_band_managemen">
-  <title>In-band Management</title>
-
-  <para>In-band Management refers to a model where both the data plane and
-  control plane flow over the same network path.</para>
-
-  <para>In some situations, In-band Management is the only option available to
-  both control and configure the uCPE device, while also allowing for data-path
-  traffic to pass over the same physical interface.</para>
-
-  <para>The main requirement for this use case solution is to have all traffic
-  pass through a defined WAN physical port.</para>
-
-  <para>Three types of traffic are mentioned:</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>Device management - e.g.: device configuration
-      done by the uCPE Manager.</para>
-    </listitem>
-
-    <listitem>
-      <para>VNF(s) configuration - enabling or disabling features of a VNF.
-      E.g. enabling/disabling the firewall or VPN setup.</para>
-    </listitem>
-
-    <listitem>
-      <para>Data-path - all the other traffic that is not used in the control
-      plane and needs to reach a LAN network.</para>
-    </listitem>
-  </itemizedlist>
-
-  <note>
-    <para>For use-cases where latency is very important, it is recommended to
-    use out-of-band management with a dedicated physical interface for the
-    data-path.</para>
-  </note>
-
-  <para>The solution provided by Enea for In-band management is based upon
-  Open vSwitch bridges which control all traffic passing through the WAN
-  physical port. Note that the NFV Access platform will assume that the
-  activated connection with the uCPE Manager should be used for In-band
-  management. The physical port used by the active connection will be attached
-  to the In-band management WAN bridge. Communication with the uCPE Manager
-  should not be affected, it is reestablished automatically after In-band
-  management activation.</para>
-
-  <para>All network traffic, with the exception of any received from the uCPE
-  Manager, will be sent towards the VNF or dropped if there is no VNF
-  instantiated on the uCPE device. The VNF connected to the WAN bridge
-  must be configured for In-band management since traffic from the VNF manager
-  and data-path will be sent to only to one port (WAN) of the VNF.</para>
-
-  <note>
-    <para>Only one VNF must be connected to the In-band management WAN bridge.</para>
-  </note>
-
-  <table>
-    <title>Setup Prerequisites</title>
-
-    <tgroup cols="2">
-      <colspec align="left" colwidth="2*" />
-
-      <colspec align="left" colwidth="4*" />
-
-      <tbody>
-        <row>
-          <entry>WAN port</entry>
-
-          <entry>Physical port supported by DPDK</entry>
-        </row>
-
-        <row>
-          <entry>Dynamic IP on WAN port</entry>
-
-          <entry>DHCP server configured to distribute same IP address for same
-          MAC</entry>
-        </row>
-
-        <row>
-          <entry>uCPE Manager</entry>
-
-          <entry>uCPE Manager IP address must be public (accessible for the uCPE device)
-          and static</entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </table>
-
-  <para><emphasis role="bold">How to activate In-band Management from the uCPE
-  Manager</emphasis></para>
-
-  <orderedlist>
-    <listitem>
-      <para>Select the uCPE device.</para>
-    </listitem>
-
-    <listitem>
-      <para>Select Configuration.</para>
-    </listitem>
-
-    <listitem>
-      <para>Click OpenvSwitch.</para>
-    </listitem>
-
-    <listitem>
-      <para> Select the Bridges option, then click Add.</para>
-    </listitem>
-  </orderedlist>
-
-  <table>
-    <title>In-band management WAN DPDK bridge configuration</title>
-
-    <tgroup cols="2">
-      <colspec align="left" colwidth="2*" />
-
-      <colspec align="left" colwidth="4*" />
-
-      <tbody>
-        <row>
-          <entry>name</entry>
-
-          <entry>Provide a name for the WAN bridge e.g. "ibm-wan-br"</entry>
-        </row>
-
-        <row>
-          <entry>ovs-bridge-type</entry>
-
-          <entry>dpdkWan</entry>
-        </row>
-
-        <row>
-          <entry>mgmt-address</entry>
-
-          <entry>IPv4 (add IP address of uCPE Manager machine)</entry>
-        </row>
-
-        <row>
-          <entry>mgmt-port</entry>
-
-          <entry>4334</entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </table>
-
-  <para>The connection between the uCPE device and uCPE Manager will be recreated
-  and all traffic will pass through the new bridge (ibm-wan-br). The user
-  should be able to continue device configuration. The WAN port of the very
-  first instantiated VNF must be connected to ibm-wan-br and it should receive
-  the same IP address as the WAN interfaces of the uCPE device.</para>
-
-  <figure>
-    <title>Enea In-band Management solution</title>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata align="center" fileref="images/In-bandManagement.png"
-                   scale="65" />
-      </imageobject>
-    </mediaobject>
-  </figure>
-
-  <para>The VNF can be reached on the same IP address as the uCPE device, e.g.
-  <literal>https://&lt;WAN_IP&gt;</literal> if a HTTP server is present
-   on that VNF.</para>
-
-  <note>
-    <para>The In-band management bridge must be recreated each time the uCPE
-    Manager IP is changed.</para>
-  </note>
-</chapter>