1 files changed, 689 insertions, 233 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 9d5eecc..1663e8c 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
@@ -5,12 +5,13 @@
   <section id="prereq_ucpe">
     <title>Prerequisites</title>
 
-    <para>Listed below are the main generic prerequisites required so that the 
+    <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 uCPE device with Enea NFV Access Run Time Platform installed.</para>
+        <para>A uCPE device with Enea NFV Access Run Time Platform
+        installed.</para>
       </listitem>
 
       <listitem>
@@ -24,53 +25,408 @@
     <title>Install the Enea uCPE Manager</title>
 
     <para>Unpack the uCPE Manager and install it following the instructions
-    provided within the release archive:
-    <literal>[unpacked_folder]/dist/README</literal>.</para>
+    below.</para>
 
-    <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>
+    <section id="prep_sys_ucpe_mg">
+      <title>Preparing your system</title>
 
-    <note><para>Check that the CentOS machine where the uCPE Manager is installed
-      has the firewall disabled.</para></note>
+      <orderedlist>
+        <listitem>
+          <para>Open a terminal with administrative rights, i.e. log into a
+          <emphasis role="bold">bash</emphasis> shell with
+          <literal>root</literal> privileges.</para>
+        </listitem>
 
-    <para>Verify that the installation has succeeded:</para>
+        <listitem>
+          <para>Choose the target installation folder, e.g.
+          <literal>/opt/ems</literal>. Everything will be installed under a
+          folder called <literal>ucpemanager</literal> within the target
+          installation folder.</para>
+        </listitem>
+      </orderedlist>
 
-    <orderedlist>
-      <listitem>
-        <para>Point your browser to the server machine running the uCPE
-        Manager.</para>
-      </listitem>
+      <para>The application files will be installed in
+      <literal>/opt/ems/ucpemanager/application</literal>. The database will
+      be installed in <literal>/opt/ems/ucpemanager/database</literal>.</para>
 
-      <listitem>
-        <para>In the login screen, log in with the username: <emphasis
-        role="bold">admin</emphasis> and password: <emphasis
-        role="bold">admin</emphasis>.</para>
-      </listitem>
-    </orderedlist>
+      <note>
+        <para>If you have multiple spindles, it is recommended to let the
+        application run off one and the database off the other. This will
+        result in optimum performance. It is also recommended that the swap
+        disk be the same as the one used for the application.</para>
+      </note>
+
+      <para>Assuming another spindle is used (<literal>/drive2</literal>) do
+      the following:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>Create a folder which will host the database (e.g.
+          <literal>emsDatabase</literal>).</para>
+        </listitem>
+
+        <listitem>
+          <para>Create a soft-link that will point to this folder:</para>
+
+          <programlisting>ln -s /opt/ems/elementcenter/database /drive2/emsDatabase</programlisting>
+        </listitem>
+
+        <listitem>
+          <para>Follow the installation process as described below.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+
+    <section id="installing_ucpe_mg">
+      <title>Installing the uCPE Manager</title>
+
+      <orderedlist>
+        <listitem>
+          <para>Open a terminal with administrative rights, i.e. log into a
+          <emphasis role="bold">bash</emphasis> shell with
+          <literal>root</literal> privileges.</para>
+        </listitem>
+
+        <listitem>
+          <para><command>cd</command> to the folder you are installing
+          from.</para>
+        </listitem>
+
+        <listitem>
+          <para>Verify that the folder you are installing from contains the
+          following files:</para>
+
+          <itemizedlist>
+            <listitem>
+              <para><filename>README</filename></para>
+            </listitem>
+
+            <listitem>
+              <para><filename>install.sh</filename></para>
+            </listitem>
+
+            <listitem>
+              <para><filename>doinstall.sh</filename></para>
+            </listitem>
+
+            <listitem>
+              <para><literal>configureHA.sh</literal></para>
+            </listitem>
+
+            <listitem>
+              <para><filename>ucpemanager-x.y-Buildz-Linux.tar.gz</filename></para>
+            </listitem>
+
+            <listitem>
+              <para><filename>ReleaseNotes</filename></para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>Run the following command:</para>
+
+          <programlisting>./install.sh /opt/ems ucpemanager-x.y-Buildz-Linux.tar.gz.</programlisting>
+        </listitem>
+      </orderedlist>
+
+      <para>This command will:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>Extract the application files from the compressed install
+          kit.</para>
+        </listitem>
+
+        <listitem>
+          <para>Install the bundled database (if the user specifies an
+          internal database).</para>
+        </listitem>
+
+        <listitem>
+          <para>Install <literal>ucpemanager</literal> as a service with the
+          name <filename>ucpemanager</filename>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Start the <literal>ucpemanager</literal> service.</para>
+        </listitem>
+      </itemizedlist>
+
+      <note>
+        <para>The service will be automatically started when the computer
+        boots up.</para>
+
+        <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 by:</para>
+
+      <orderedlist>
+        <listitem>
+          <para>Pointing your browser to the server machine running the uCPE
+          Manager.</para>
+        </listitem>
+
+        <listitem>
+          <para>In the login screen, log in with the username: <emphasis
+          role="bold">admin</emphasis> and password: <emphasis
+          role="bold">admin</emphasis>.</para>
+        </listitem>
+      </orderedlist>
+
+      <para>In order to manage the ucpemanager service, user can run:
+      <programlisting>service ucpemanager start/stop</programlisting></para>
+
+      <para><emphasis role="bold">Installing with the restore
+      option</emphasis></para>
+
+      <para>It is possible to use a restore file created by the "System
+      Backup" utility provided in the uCPE Manager, to install a system and
+      set it to a known state.</para>
+
+      <note>
+        <para>The file to be used is the zip file created by System Backup,
+        not the one created by the uninstall or upgrade processes described
+        below.</para>
+      </note>
+
+      <para>The name format of this file will be:
+      <filename>SystemBackup_MMMDD_YYYY_HHMM_SS.zip</filename> (e.g
+      <literal>SystemBackup_Feb19_2013_2257_42.zip</literal>). </para>
+
+      <para>Follow the steps for Installation provided above and provide an
+      additional argument as shown below:</para>
+
+      <programlisting>"./install.sh \
+/opt/ems ucpemanager-1.0-Build8-Linux.tar.gz  \
+ SystemBackup_MMMDD_YYYY_HHMM_SS.zip"</programlisting>
+
+      <para>The other steps are exactly the same as specified in the
+      Installation instructions. 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>
+    </section>
+
+    <section id="upgrading_ucpe_mg">
+      <title>Upgrading the uCPE Manager</title>
+
+      <orderedlist>
+        <listitem>
+          <para>Verify that the folder you are upgrading from contains the
+          following files:</para>
+
+          <itemizedlist>
+            <listitem>
+              <para><filename>upgrade.sh</filename></para>
+            </listitem>
+
+            <listitem>
+              <para><filename>doupgrade.sh</filename></para>
+            </listitem>
+
+            <listitem>
+              <para><filename>configureHA.sh</filename></para>
+            </listitem>
+
+            <listitem>
+              <para><filename>ucpemanager-x.y-Buildz-Linux.tar.gz</filename></para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>Run the following command:</para>
+
+          <programlisting>./upgrade.sh /opt/ems ucpemanager-1.0-Build8-Linux.tar.gz" </programlisting>
+        </listitem>
+      </orderedlist>
+
+      <para>Running this command will:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>Stop the currently running ucpemanager service.</para>
+        </listitem>
+
+        <listitem>
+          <para>Create a compressed file of the ucpemanager application
+          folder, called:
+          <literal>ucpemanager-Backup-YYYYddMMHHmm.tar.gz</literal>, which
+          contains a snapshot of the existing installation.</para>
+        </listitem>
+
+        <listitem>
+          <para>Rename the <literal>application</literal> folder to
+          <literal>application_original</literal>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Extract the application files from the specified compressed
+          install kit. There will now exist a (new) application folder, with
+          the contents of the new kit.</para>
+        </listitem>
+
+        <listitem>
+          <para>Start the ucpemanager service.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>When the ucpemanager service starts, it will recognize the fact
+      that an old version of the application needs to be upgraded (based upon
+      the existence of the <literal>application_original</literal> folder. All
+      the relevant data from the old installation will be copied to the new
+      one and the <literal>application_original</literal> folder will be
+      deleted.</para>
+    </section>
+
+    <section id="uninstalling_ucpe_mg">
+      <title>Uninstalling an existing uCPE Manager installation</title>
+
+      <orderedlist>
+        <listitem>
+          <para>Verify that the folder you are uninstalling from contains the
+          following files:</para>
+
+          <itemizedlist>
+            <listitem>
+              <para><filename>uninstall.sh</filename></para>
+            </listitem>
+
+            <listitem>
+              <para><filename>douninstall.sh</filename></para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>Run the following command:</para>
+
+          <programlisting>./uninstall.sh /opt/ems</programlisting>
+        </listitem>
+      </orderedlist>
+
+      <para>Running this command will:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>Stop the currently running ucpemanager service.</para>
+        </listitem>
+
+        <listitem>
+          <para>Create a compressed file of the ucpemanager application
+          folder, called
+          <literal>ucpemanager-Backup-YYYYddMMHHmm.tar.gz</literal>, which
+          contains a snapshot of the existing installation.</para>
+        </listitem>
+
+        <listitem>
+          <para>Uninstall the ucpemanager service, so that it will not startup
+          on reboot.</para>
+        </listitem>
+
+        <listitem>
+          <para>Uninstall the database service (if an internal database is
+          being used).</para>
+        </listitem>
+
+        <listitem>
+          <para>Completely remove the contents of the
+          <literal>application</literal> and <literal>database</literal>
+          folders.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>After these steps, the uCPE Manager is completely removed from the
+      system.</para>
+    </section>
+
+    <section id="restoring_pre_installation">
+      <title>Restoring a previous uCPE Manager installation</title>
+
+      <orderedlist>
+        <listitem>
+          <para>Verify that the folder you are restoring from contains the
+          following files:</para>
+
+          <itemizedlist>
+            <listitem>
+              <para><filename>restore.sh</filename></para>
+            </listitem>
+
+            <listitem>
+              <para><filename>dorestore.sh</filename></para>
+            </listitem>
+
+            <listitem>
+              <para><filename>configureHA.sh</filename></para>
+            </listitem>
+
+            <listitem>
+              <para><filename>ucpemanager-Backup-YYYYddMMHHmm.tar.gz</filename>
+              (the original installation snapshot, as obtained from a previous
+              uninstall).</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>Run the following command:</para>
+
+          <programlisting>./restore.sh /opt/ems ucpemanager-Backup-YYYYddMMHHmm.tar.gz</programlisting>
+        </listitem>
+      </orderedlist>
+
+      <para>Running this command will remove any vestiges of the existing
+      ucpemanager service, if they exist, and reinstall the ucpemanager
+      application on the specified target, restoring the data in the database
+      and files in the process. </para>
+
+      <para>The ucpemanager service is then started and the older version is
+      now running on the system.</para>
+    </section>
   </section>
 
   <section id="device_config_provision">
     <title>Device Configuration and Provisioning</title>
 
+    <para>The following describes the steps required for setting up the
+    virtualization infrastructure, ensuring that a uCPE device is ready for
+    virtualized service deployment. The sections herein contain information
+    about enrolling uCPE devices into the Enea uCPE Manager, selecting
+    physical interfaces to be used by virtualized networking and creating
+    different types of bridges to enable VNF communication. The Zero Touch
+    Provisioning mechanism is also touched upon, as alternative to manual
+    configuration of the virtualization infrastructure.</para>
+
     <section id="device_config">
       <title>Add a uCPE device to the Management System</title>
 
-      <para>This section describes how to connect to an instance of NFV Access
-      installed on a specific uCPE device, and how to setup the virtual
-      infrastructure.</para>
+      <para>Enrolling uCPE devices into the Enea uCPE Manager can be
+      accomplished using one of the two possible methods.</para>
 
       <section id="man_config">
         <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>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 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>
+        the management system by:</para>
+
+        <orderedlist>
+          <listitem>
+            <para>Selecting in the uCPE Manager: <literal>Devices -&gt; Manage
+            -&gt; Add</literal>.</para>
+          </listitem>
+
+          <listitem>
+            <para>Suppling information about the uCPE device, and setting the
+            parameters that will be used to connect to it.</para>
+          </listitem>
+        </orderedlist>
 
         <para>The relevant parameters are:</para>
 
@@ -90,19 +446,21 @@
 
         <itemizedlist>
           <listitem>
-            <para>IP Address. IP address of the device.</para>
+            <para>IP Address. IP address of the ucPE device.</para>
           </listitem>
         </itemizedlist>
 
         <itemizedlist>
           <listitem>
-            <para>SSH Port. The NETCONF Port used for communications.</para>
+            <para>SSH Port. The NETCONF Port used for communications. Default
+            is set to 830.</para>
           </listitem>
         </itemizedlist>
 
         <itemizedlist>
           <listitem>
-            <para>SSH User Name. The user name for SSH connectivity.</para>
+            <para>SSH User Name. The user name for SSH connectivity. Default
+            user is root.</para>
           </listitem>
         </itemizedlist>
 
@@ -115,17 +473,17 @@
         <itemizedlist>
           <listitem>
             <para>Device Calls Home. This checkbox indicates the direction of
-            device communications. In the Manual Configuration, leave this box
-            blank.</para>
+            device communications. For Direct Connection, leave this flag
+            unchecked.</para>
           </listitem>
         </itemizedlist>
 
         <itemizedlist>
           <listitem>
-            <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>
+            <para>Device ID. The unique identifier of the uCPE 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>
         </itemizedlist>
       </section>
@@ -133,24 +491,26 @@
       <section id="using_call_home">
         <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>
+        <para>Follow the same steps as described in the previous section,
+        making sure that the <literal>Device Calls Home</literal> checkbox is
+        selected this time.</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>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>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 the uCPE device first and then selecting
@@ -162,8 +522,8 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata align="center" fileref="images/host_interface_caps.png"
-                       scale="55" />
+            <imagedata align="center" contentwidth="600"
+                       fileref="images/host_interface_caps.png" />
           </imageobject>
         </mediaobject>
       </figure>
@@ -174,27 +534,40 @@
       <section id="man_configuration">
         <title>Manual Configuration</title>
 
-        <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>
+        <para>For Manual Configuration of uCPE networking, select the uCPE
+        device first and then <literal>Configuration</literal> -&gt;
+        <literal>OpenVSwitch</literal>. In <literal>Host Interfaces
+        Caps</literal>, one can find a list of available network interfaces
+        and their capabilities.</para>
 
         <section id="configure_interfaces">
           <title>Configuring Interfaces</title>
 
+          <para>In order to make physical network interfaces available to the
+          virtualization infrastructure and VNFs, they must be configured into
+          the management system.</para>
+
+          <para>To add an interface into the uCPE Manager, select the uCPE
+          device, then from the top toolbar select <literal>Configuration
+          -&gt; OpenVSwitch -&gt; Host Interfaces</literal>. The available
+          Interface types are detailed below.</para>
+
           <para><emphasis role="bold">DPDK Interface Type</emphasis></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>
+          OVS-DPDK bridge.</para>
+
+          <note>
+            <para>Make sure the <literal>Enable DPDK</literal> checkbox is
+            selected in <literal>Device -&gt; Configuration -&gt;
+            DPDK</literal>, otherwise no interface can be assigned to the
+            DPDK.</para>
+          </note>
 
-          <para>For DPDK mode, the user must set values for the following fields:</para>
+          <para>To add a DPDK interface under the management system, set
+          appropriate values for the following fields:</para>
 
           <itemizedlist>
             <listitem>
@@ -210,26 +583,27 @@
             </listitem>
 
             <listitem>
-              <para>Dpdk-type: the kernel module that allows user space access to the 
-                physical interface.</para>
+              <para>Dpdk-type: the kernel module that allows user space access
+              to the physical interface. Enea recommends using the
+              <literal>vfio-pci</literal> driver.</para>
             </listitem>
           </itemizedlist>
 
           <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>
+          the device that uses a DPDK interface type, 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>
 
           <para><emphasis role="bold">SR-IOV Interface Type</emphasis></para>
 
-          <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 technology allows for the creation of a number of
+          virtual functions on the host interface, which can be used by VNFs
+          running on the uCPE device.</para>
 
-          <para>For SR-IOV mode, the user must set values for the following fields:</para>
+          <para>For SR-IOV mode configuration, the user must set values for
+          the following fields:</para>
 
           <itemizedlist>
             <listitem>
@@ -254,176 +628,220 @@
             </listitem>
           </itemizedlist>
 
-          <para><emphasis role="bold">PCI Passthrough Interface
+          <para><emphasis role="bold">Standard Interface
           Type</emphasis></para>
 
-          <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>
+          <para>Some of the physical network interfaces available on a uCPE
+          device, including Ethernet interfaces, do not have DPDK or SR-IOV
+          support. Instead, the Linux kernel driver has to be used. Wi-Fi and
+          4G/LTE modems can also be configured and used for virtualization
+          infrastructure and VNFs.</para>
+
+          <para>To add Standard interfaces under the management system, the
+          user must set values for the following fields:</para>
+
+          <itemizedlist>
+            <listitem>
+              <para>Source: the name of physical interface.</para>
+            </listitem>
+
+            <listitem>
+              <para>Networking-type: standard</para>
+            </listitem>
+          </itemizedlist>
+
+          <para condition="hidden"><emphasis role="bold">PCI Passthrough
+          Interface Type</emphasis></para>
+
+          <para condition="hidden">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>
 
         <section id="configure_bridges">
           <title>Configuring Bridges</title>
 
-          <para><emphasis role="bold">In-band Management</emphasis></para>
-
-          <para>In-band Management refers to a model where both the data plane
-          and control plane flow over the same network path.</para>
+          <para>After networking interfaces have been added to the uCPE
+          Manager, the user can create the necessary OVS bridges.</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><emphasis role="bold">How to add OVS bridges in the uCPE
+          Manager</emphasis></para>
 
-          <para>The main requirement in order to use this solution is to have all
-          traffic pass through a defined WAN physical port.</para>
-
-          <para>Three types of traffic are mentioned hereafter:</para>
+          <orderedlist>
+            <listitem>
+              <para>Select the uCPE device.</para>
+            </listitem>
 
-          <itemizedlist>
             <listitem>
-              <para>Device management. Part of the device configuration done by the
-              uCPE Manager.</para>
+              <para>Select Configuration.</para>
             </listitem>
 
             <listitem>
-              <para>VNF(s) configuration. Enabling or disabling features of a
-              VNF. E.g. enabling/disabling the firewall or VPN setup.</para>
+              <para>Click OpenvSwitch.</para>
             </listitem>
 
             <listitem>
-              <para>Data-path. All other traffic that is not used in the
-              control plane and needs to reach a LAN network.</para>
+              <para>Select the Bridges option, then click Add.</para>
             </listitem>
-          </itemizedlist>
+          </orderedlist>
 
           <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>
+            <para>Depending on the settings in <literal>Configuration -&gt;
+            OpenVSwitch -&gt; DPDK</literal>, OVS bridges with or without DPDK
+            support will be used on the uCPE device.</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>
+          <para>There are three types of bridges which can be created, each
+          one fulfiling a different role:</para>
+
+          <para><emphasis role="bold">uCPE In-band Management
+          bridge</emphasis></para>
+
+          <para>In-band Management refers to a model where both the data plane
+          and control plane flow over the same network path. In some
+          situations (e.g. the uCPE device has only one routable IP address),
+          this 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 solution provided by Enea for in-band management is based
+          upon an OpenvSwitch bridge fielding all traffic passing through the
+          WAN physical port. As a prerequisite, the WAN physical port has to
+          be configured to get its IP through DHCP. Any standard or
+          DPDK-assigned network interface can be used for the In-Band
+          management bridge.</para>
 
           <note>
-            <para>Only one VNF must be connected to the In-band management WAN
-            bridge.</para>
+            <para>The In-Band Management bridge must be recreated each time
+            the uCPE Manager IP address is changed.</para>
           </note>
 
-          <table>
-            <title>Setup Prerequisites</title>
+          <para>To create the In-Band Management bridge, the user must set
+          values for the following fields:</para>
 
-            <tgroup cols="2">
-              <colspec align="left" colwidth="2*" />
+          <itemizedlist>
+            <listitem>
+              <para>name: name of the bridge.</para>
+            </listitem>
 
-              <colspec align="left" colwidth="4*" />
+            <listitem>
+              <para>ovs-bridge-type: inbandMgmt</para>
+            </listitem>
 
-              <tbody>
-                <row>
-                  <entry>WAN port</entry>
+            <listitem>
+              <para>mgmt-address: select IPv4 as the type and fill in the IP
+              address of the uCPE Manager.</para>
+            </listitem>
 
-                  <entry>The physical port supported by DPDK.</entry>
-                </row>
+            <listitem>
+              <para>mgmt-port: the NETCONF management port. Enea recommeneds
+              leaving this field unchanged.</para>
+            </listitem>
+          </itemizedlist>
 
-                <row>
-                  <entry>Dynamic IP on WAN port</entry>
+          <note>
+            <para>The first VNF instantiated on the uCPE device must be
+            connected to the In-Band Management bridge and its WAN interface
+            must be configured as the DHCP client.</para>
+          </note>
 
-                  <entry>The DHCP server configured to distribute the same IP address
-                  for the same MAC.</entry>
-                </row>
+          <para><emphasis role="bold">In-band Management bridge for
+          VNFs</emphasis></para>
 
-                <row>
-                  <entry>uCPE Manager</entry>
+          <para>If VNF management can be done over a dedicated virtual
+          interface, its possible to extend the networking infrastructure
+          configuration to also access the VNF's management interface over the
+          WAN port.</para>
 
-                  <entry>The uCPE Manager IP address must be public (accessible
-                  for the uCPE device) and static.</entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </table>
+          <para>For this setup, three types of traffic will pass over the WAN
+          physical interface:</para>
 
-          <para><emphasis role="bold">How to activate In-band Management from
-          the uCPE Manager</emphasis></para>
+          <itemizedlist>
+            <listitem>
+              <para>Device management. Part of the device configuration done
+              by the uCPE Manager.</para>
+            </listitem>
 
-          <orderedlist>
             <listitem>
-              <para>Select the uCPE device.</para>
+              <para>VNF(s) management. Enabling or disabling features of a
+              VNF. E.g. enabling/disabling the firewall or VPN setup.</para>
             </listitem>
 
             <listitem>
-              <para>Select Configuration.</para>
+              <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>To create a VNF In-Band Management bridge, the user must set
+          values for the following fields:</para>
 
+          <itemizedlist>
             <listitem>
-              <para>Click OpenvSwitch.</para>
+              <para>name: name of the bridge.</para>
             </listitem>
 
             <listitem>
-              <para>Select the Bridges option, then click Add.</para>
+              <para>ovs-bridge-type: vnfMgmt</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>
+            <listitem>
+              <para>vnf-mgmt-address: select IPv4 as the type and fill in the
+              IP address for management network, e.g 10.0.0.1.</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>
+          <note>
+            <para>VNF management interfaces must be configured in same network
+            as the <literal>vnf-mgmt-address</literal> of the bridge. For more
+            information, please see 4.4 <link linkend="vnf_management">VNF
+            Management</link>.</para>
+          </note>
 
-          <figure>
-            <title>Enea In-band Management solution</title>
+          <para><emphasis role="bold">Data-plane Bridge</emphasis> Data-plane
+          bridges are generic bridges used for the VNF data-plane. There are
+          two supported sub-types:</para>
 
-            <mediaobject>
-              <imageobject>
-                <imagedata align="center"
-                           fileref="images/In-bandManagement.png" scale="65" />
-              </imageobject>
-            </mediaobject>
-          </figure>
+          <itemizedlist>
+            <listitem>
+              <para>communication: allows for VNF communication towards
+              LAN/WAN networks. This bridge type has at least one physical
+              port attached to it.</para>
+            </listitem>
 
-          <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>
+            <listitem>
+              <para>integration: allows for VNF-to-VNF communication (usually
+              for service function chaining). This bridge type does not have
+              any physical port attached.</para>
+            </listitem>
+          </itemizedlist>
 
-          <note>
-            <para>The In-band management bridge must be recreated each time
-            the uCPE Manager IP is changed.</para>
-          </note>
+          <para>To create a Data-plane bridge, the user must set values for
+          the following fields:</para>
+
+          <itemizedlist>
+            <listitem>
+              <para>name: name of the bridge.</para>
+            </listitem>
+
+            <listitem>
+              <para>ovs-bridge-type: select <literal>communication</literal>
+              or <literal>integration</literal>, depending on intended usage.
+              For communication bridges, physical interfaces can be added to
+              the bridge.</para>
+            </listitem>
+          </itemizedlist>
         </section>
       </section>
 
       <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
+        <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
@@ -432,36 +850,40 @@
         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>
+        <para>An offline configuration is usually prepared in advance for the
+        uCPE Manager to setup the virtualization infrastructure on the uCPE
+        device, as soon as a device enrolls into the management system.</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>
+          a future point in time. 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>Alternatively, a wildcard can be used in the <literal>Device
+          ID</literal> field, which results in a configuration being pushed on
+          all uCPE devices upon their initial connection towards the uCPE
+          Manager.</para>
+
+          <para>To create an offline configuration, from the top toolbar menu
+          select <literal>Applications</literal> -&gt; <literal>Offline
+          Config</literal> -&gt; <literal>Add</literal>. Specify the value of
+          the <literal>Device ID</literal> in the required field or wildcard
+          if appropriate. 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>
+          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 manual configuration described in the previous
+          section.</para>
         </section>
       </section>
     </section>
@@ -509,8 +931,9 @@
           </listitem>
 
           <listitem>
-            <para>Get access to the VNF specific VNF Manager for day 1 and 2
-            configuration (in cloud or for local deployment).</para>
+            <para>Optionally, get access to the VNF specific VNF Manager for
+            day 1 and 2 configuration (in cloud or for local
+            deployment).</para>
           </listitem>
 
           <listitem>
@@ -548,18 +971,18 @@
 
               <listitem>
                 <para>Determine the amount of hardware resources needed for
-                the VNF (RAM, CPUs and Disk size).</para>
+                the VNF (RAM, number of CPUs and storage size).</para>
               </listitem>
 
               <listitem>
-                <para>Determine how many Network Interfaces the VNF will
-                use.</para>
+                <para>Determine how many Virtual Network Interfaces the VNF
+                will use.</para>
               </listitem>
             </itemizedlist>
           </listitem>
 
           <listitem>
-            <para>Determine the day zero configuration method from the VNF
+            <para>Determine the Day-0 configuration method from the VNF
             Getting Started guidelines.</para>
 
             <note>
@@ -596,14 +1019,14 @@
           <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>
+            is selected, it will trigger a popup menu window.</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 window 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
+        descriptor and add it to its VNF Catalog.</para>
 
         <figure>
           <title>Onboard a VNF</title>
@@ -634,7 +1057,7 @@
           <listitem>
             <para><emphasis role="bold">VNF Type Name</emphasis>. This is the
             name that will be used to identify this VNF. It will be shown in
-            the VNF tables.</para>
+            the VNFs list.</para>
           </listitem>
 
           <listitem>
@@ -741,8 +1164,8 @@
             <literal>Path</literal>. When a user uses the uCPE Manager to
             create an instance for multiple VNFs, they will be prompted to
             provide a data file for each entry in this table. Each type of VNF
-            will require different cloud-init files, e.g.: a license
-            file.</para>
+            will require different cloud-init files, e.g.: a license file.
+            </para>
           </listitem>
         </orderedlist>
 
@@ -760,8 +1183,40 @@
 
         <para><emphasis role="bold">Property Values</emphasis></para>
 
-        <para><literal>numHugePages</literal> defines the number of huge
-        memory pages the VNF uses (for DPDK).</para>
+        <itemizedlist>
+          <listitem>
+            <para><literal>numHugePages</literal> defines the number of huge
+            memory pages the VNF uses (for DPDK).</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>vnfMgmtIpAddress</literal>: the IP address of the
+            VNF's management interface, connected to a
+            <literal>vnfMgmt</literal> bridge (e.g. 10.0.0.2).</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>internalMgmtPort</literal>: the VNF's TCP/UDP port
+            used for management (e.g. 443).</para>
+          </listitem>
+
+          <listitem>
+            <para><literal>externalMgmtPort</literal>: the Management port
+            used for external access (e.g. 60001).</para>
+          </listitem>
+        </itemizedlist>
+
+        <note>
+          <para>The last three properties are useful in conjuction with the
+          <literal>vnfMgmt</literal> bridge type. They allow the user to map
+          the internal VNF management port to an external port, useful for VNF
+          configuration from WAN. </para>
+
+          <para>In the previous example, the internal TCP port 443 (HTTPS) was
+          mapped to the external port 60001, which allows the user to access
+          the VNF management port from a web browser e.g.
+          <literal>https://&lt;WAN_IP&gt;:60001</literal>.</para>
+        </note>
       </section>
     </section>
 
@@ -770,8 +1225,10 @@
 
       <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>
+      when the VNF is onboarded, serve as a template for instantiation.
+      </para>
+
+      <para>Follow the instructions below to instantiate a VNF:</para>
 
       <orderedlist>
         <listitem>
@@ -788,11 +1245,11 @@
 
           <itemizedlist spacing="compact">
             <listitem>
-              <para>Name (a descriptive name).</para>
+              <para>Name: a descriptive name.</para>
             </listitem>
 
             <listitem>
-              <para>Device (the uCPE device to instantiate the VNF on).</para>
+              <para>Device: the uCPE device to instantiate the VNF on.</para>
             </listitem>
 
             <listitem>
@@ -805,8 +1262,7 @@
                 </listitem>
 
                 <listitem>
-                  <para>Set up each NIC with a driver method (DPDK or
-                  e1000).</para>
+                  <para>Set up each NIC with a driver method.</para>
                 </listitem>
               </itemizedlist>
 
@@ -839,7 +1295,7 @@
     </section>
 
     <section id="enter_console">
-      <title>Entering the VNF Console</title>
+      <title>Accessing the VNF console</title>
 
       <para>Once the VNF is deployed, the VNF console can be entered using SSH
       and virsh commands. The VNF Console is a typical starting point for
@@ -872,4 +1328,4 @@
       </orderedlist>
     </section>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file