Removed the obsolete appendix files from the example usecase manual,

Updated the Automation UG,
Updated the Makefile build components.

USERDOCAP-733,USERDOCAP-740

Change-Id: I1c8d19a4cd496c10a982a9965793ffb19c12ab12
Signed-off-by: mrpa <miruna.paun@enea.com>

7 files changed, 116 insertions, 842 deletions

diff --git a/doc/book-enea-edge-automation-user-guide/doc/automation_framework_test_harness.xml b/doc/book-enea-edge-automation-user-guide/doc/automation_framework_test_harness.xml
index 5cc879d..4268582 100644
--- a/doc/book-enea-edge-automation-user-guide/doc/automation_framework_test_harness.xml
+++ b/doc/book-enea-edge-automation-user-guide/doc/automation_framework_test_harness.xml
@@ -240,14 +240,11 @@
       <emphasis role="bold">Example</emphasis>: for a more extended output,
       change the output from selective to debug.</para>
 
-      <para>The <literal>test_harness</literal> directory contains all the
-      implemented playbooks. This directory is structured in multiple
-      subdirectories, each subdirectory represents a functionality of the Enea
-      Edge Management application. Each implemented playbook from this
-      directory runs a method from a Python class from the
-      <literal>automation_framework</literal> directory. Each playbook is an
-      atomic operation, a basic operation that need to be tested. These
-      playbooks are used in complex test scenarios.</para>
+      <para>The <literal>test_harness</literal> directory contains the custom
+      Ansible modules, located in the modules directory, and the playbooks
+      mapping functionalities from the Enea Edge Management application. The
+      playbooks are atomic operations that can be used in complex test
+      scenarios.</para>
     </section>
 
     <section id="log_dir">
@@ -1299,41 +1296,81 @@ Parameters(not needed): --
     <literal>&lt;Automation-installerdir&gt;/test_harness</literal>
     directory.</para>
 
+    <para>The Ansible based Test Harness represents an example of structuring
+    the files needed for creating automated test cases using the Enea Edge
+    Automation, and provides a way to implement them.</para>
+
+    <para>The <filename>ansible.cfg</filename> file contains an example of the
+    Ansible default configuration. The default value for
+    <literal>stdout_callback</literal> is set to <literal>selective</literal>,
+    to print only certain tasks. It is recommended to switch to
+    <literal>debug</literal> when a test fails. By setting the parameter
+    <literal>any_errors_fatal</literal> to <literal>True</literal>, task
+    failures are considered fatal errors and the play execution stops.</para>
+
+    <para>All the Playbooks that execute Automation Framework Python modules
+    run on <literal>localhost</literal>. New entries have to be created for
+    direct communication over SSH with the boards.</para>
+
+    <para>The <filename>setup_env.sh</filename> script sets up the
+    <literal>testHarness</literal> test environment by creating the
+    <literal>testHarness-venv</literal> Python virtual environment, executing
+    requests needed by Automation Framework Python modules, and installing
+    Ansible. The Ansible package version is 2.9.6.</para>
+
+    <section id="ansible_mods">
+      <title>Ansible modules</title>
+
+      <para>The custom Ansible modules can be found in the
+      <literal>test_harness/modules/</literal> directory. The Ansible modules
+      are wrappers of Python Handlers from the
+      <literal>automation_framework/</literal> directory. Each Ansible module
+      has been designed to instantiate a Python handler and to run a method of
+      it with specific parameters.</para>
+
+      <para>The Ansible modules are used in Ansible playbooks as:</para>
+
+      <programlisting>&lt;name_of_the_module&gt;:
+  method: &lt;which method will be called&gt;
+  &lt;param1&gt;: &lt;value_of_param1&gt;
+  &lt;param2&gt;: &lt;value_of_param2&gt;
+  ...
+  &lt;paramx&gt;: &lt;value_of_paramx&gt;
+  chdir: &lt;the path where the Ansible playbook will be run&gt;</programlisting>
+
+      <para>The method is a mandatory argument for all Ansible modules, the
+      other arguments are optional. The method must exist in the
+      <literal>&lt;name_of_the_module&gt;</literal> Ansible module. The params
+      list (param1, param2... paramx) must have the same name as the
+      parameters of the method, otherwise an error will occur.</para>
+
+      <para>For example, for adding a uCPE Device into the Enea Edge
+      Management application from an Ansible playbook, the
+      <filename>uCPEDeviceModule</filename> should be used as:</para>
+
+      <programlisting>uCPEDeviceModule:
+  method: addDevice
+  device_name: &lt;name_of_the device&gt;
+  chdir: "{{ lookup('env','BASE_DIR') }}"</programlisting>
+
+      <para>This will call the <literal>addDevice</literal> method from the
+      <literal>uCPEDevice</literal> class that instantiates a
+      <literal>uCPEDeviceHandler</literal> object for the
+      <literal>device_name</literal> uCPE Device. Afterwards, the
+      <literal>addDevice</literal> method is called.</para>
+
+      <para>The list of possible parameters for all methods of an Ansible
+      module is saved in the <filename>module_args</filename> dictionary in
+      the Python script. The default value of all parameters is
+      <literal>None</literal>.</para>
+    </section>
+
     <section id="indiv_ansible_playbooks">
       <title>Individual Ansible Playbooks</title>
 
-      <para>The Ansible based Test Harness represents an example of
-      structuring the files needed for creating automated test cases using the
-      Enea Edge Automation, and provides a way to implement them.</para>
-
-      <para>The <filename>ansible.cfg</filename> file contains an example of
-      the Ansible default configuration. The default value for
-      <literal>stdout_callback</literal> is set to
-      <literal>selective</literal>, to print only certain tasks. It is
-      recommended to switch to <literal>debug</literal> when a test fails. By
-      setting the parameter <literal>any_errors_fatal</literal> to
-      <literal>True</literal>, task failures are considered fatal errors and
-      the play execution stops.</para>
-
-      <para>All the Playbooks that execute Automation Framework Python modules
-      run on <literal>localhost</literal>. New entries have to be created for
-      direct communication over SSH with the boards.</para>
-
-      <para>The <filename>setup_env.sh</filename> script sets up the
-      <literal>testHarness</literal> test environment by creating the
-      <literal>testHarness-venv</literal> Python virtual environment,
-      executing requests needed by Automation Framework Python modules, and
-      installing Ansible. The Ansible package version is 2.9.6.</para>
-
       <para>The <literal>test_harness</literal> directory contains all the
-      implemented Ansible Playbooks. This directory contains the
-      <filename>check_error.yml</filename> Playbook and many subdirectories,
-      each subdirectory representing an Enea Edge Management module.</para>
-
-      <para>The <filename>check_errors.yml</filename> Playbook checks the
-      Python output and returns success or fail results. This file is imported
-      in all playbooks from the <literal>test_harness</literal> directory and
-      it cannot be run standalone.</para>
+      implemented Ansible Playbooks and many subdirectories, each subdirectory
+      representing an Enea Edge Management module.</para>
 
       <para>According to their functionality, the Ansible Playbooks that refer
       to offline configuration are in the <literal>OfflineConfig</literal>
@@ -1360,61 +1397,46 @@ Parameters(not needed): --
 
       <para><emphasis role="bold">Example</emphasis>:</para>
 
-      <orderedlist>
-        <listitem>
-          <para>Display the help menu for
-          <filename>addDataPlaneOvsBridge.yml</filename>:</para>
-
-          <programlisting>ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml
-
-This playbook runs 'addDataPlaneOvsBridge' method from uCPEDeviceHandler module
-
-    The Python module will be run as:
-
-    Usage: uCPEDeviceHandler.py [OPTIONS] [PARAMETERS]...
-
-    Options:
-      -v, --verbose           Get info about the methods and parameters
-      -d, --device_name TEXT  The uCPE Device name
-      -m, --method TEXT       The atomic operation you want to run
-      -f, --config_file TEXT  The config file for NIC or bridges (optional
-                              argument)
-
-      -o, --display_output    Display output of the method
-      --help                  Show this message and exit.
-
-Usage:
-    ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml -e 
-    "device=&lt;device_name&gt; bridge_config_file=&lt;bridge_config_file&gt;"
-    ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml -e 
-    "device=&lt;device_name&gt; bridge_name=&lt;bridge_name&gt; bridge_type=integration"
-    ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml -e 
-    "device=&lt;device_name&gt; bridge_name=&lt;bridge_name&gt; bridge_type=communication"
-    ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml -e 
-    "device=&lt;device_name&gt; bridge_name=&lt;bridge_name&gt; bridge_type=communication 
-    interfaces=&lt;interfaces&gt;"</programlisting>
-        </listitem>
-
-        <listitem>
-          <para>Run the <filename>addDataPlaneOvsBridge.yml</filename>
-          playbook:</para>
-
-          <programlisting>ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml -e 
-"device=inteld1521-17 bridge_config_file=sfc_br.json"
-ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml -e 
-"device=inteld1521-17 bridge_config_file=lan_br.json"
-ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml -e 
-"device=inteld1521-17 bridge_name=sfc_br bridge_type=integration"
-ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml -e 
-"device=inteld1521-17 bridge_name=wap_br bridge_type=communication"
-ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml -e 
-"device=inteld1521-17 bridge_name=lan_br bridge_type=communication 
-interfaces=eno4"
-ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml -e 
-"device=inteld1521-17 bridge_name=lan_br bridge_type=communication 
-interfaces=eno4,eno5"</programlisting>
-        </listitem>
-      </orderedlist>
+      <para>Display the help menu for
+      <filename>addDataPlaneOvsBridge.yml</filename>:</para>
+
+      <programlisting>ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml
+.
+# fail *************************************************************
+  * localhost                  - FAILED!!! -------------------------
+    The 'device' and 'bridge_config_file' or 'bridge_name' and \
+'bridge_type' parameters are mandatory
+    Usage:
+      ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml \
+-e "device=&lt;device_name&gt; bridge_config_file=&lt;bridge_config_file&gt;"
+      ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml \
+-e "device=&lt;device_name&gt; bridge_name=&lt;bridge_name&gt; bridge_type=integration"
+      ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml \
+-e "device=&lt;device_name&gt; bridge_name=&lt;bridge_name&gt; bridge_type=communication"
+      ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml \
+-e "device=&lt;device_name&gt; bridge_name=&lt;bridge_name&gt; \
+bridge_type=communication interfaces=&lt;interfaces&gt;"
+
+    Example of usage:
+      ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml \
+-e "device=inteld1521-17 bridge_config_file=sfc_br.json"
+      ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml \
+-e "device=inteld1521-17 bridge_config_file=lan_br.json"
+      ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml \
+-e "device=inteld1521-17 bridge_name=sfc_br bridge_type=integration"
+      ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml \
+-e "device=inteld1521-17 bridge_name=wap_br bridge_type=communication"
+      ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml \
+-e "device=inteld1521-17 bridge_name=lan_br \
+bridge_type=communication interfaces=eno4"
+      ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml \
+-e "device=inteld1521-17 bridge_name=lan_br \
+bridge_type=communication interfaces=eno4,eno5"
+
+
+# STATS ************************************************************
+localhost    : ok=1     changed=0       failed=1        unreachable=0   \
+rescued=0       ignored=0</programlisting>
 
       <para>Each Ansible Playbook from the <literal>test_harness</literal>
       directory represents an atomic operation, a basic functionality that is
diff --git a/doc/book-enea-edge-example-usecases/doc/appendix_1.xml b/doc/book-enea-edge-example-usecases/doc/appendix_1.xml
deleted file mode 100644
index 8c76884..0000000
--- a/doc/book-enea-edge-example-usecases/doc/appendix_1.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<appendix id="appendix_one_cust">
-  <title>How to create a 128T cloud-init iso image (day-0
-  configuration)</title>
-
-  <para><emphasis role="bold">Prerequisites:</emphasis><itemizedlist>
-      <listitem>
-        <para>Development host with Linux shell.</para>
-      </listitem>
-
-      <listitem>
-        <para><literal>genisoimage</literal> tool installed.</para>
-      </listitem>
-    </itemizedlist></para>
-
-  <para>Unpack the <filename>128T/128t-cloud-init-example.tar.gz</filename>
-  archive and check the README file for more details:</para>
-
-  <programlisting>&gt;tar -zxf 128t-cloud-init-example.tar.gz
-&gt;cd 128T/cloud-init-example/
-&gt;ls ./
-README
-user-data
-meta-data
-t128-running.xml</programlisting>
-
-  <para>To generate the cloud-init iso image:</para>
-
-  <programlisting>&gt;genisoimage -output centos_128t_ci.iso -volid cidata -joliet \
--rock user-data meta-data t128-running.xml </programlisting>
-
-  <para><emphasis role="bold">Notes: </emphasis><itemizedlist>
-      <listitem>
-        <para><literal>user-data</literal> and <literal>meta-data</literal>
-        files must be kept unchanged.</para>
-      </listitem>
-
-      <listitem>
-        <para>To update the 128T configuration change the
-        <literal>t128-runing.xml</literal> file.</para>
-      </listitem>
-
-      <listitem>
-        <para>XML is the same file downloaded from 128T web access:
-        <literal>configuration -&gt; Import and Export Configuration -&gt;
-        Export Configuration -&gt; Download Configuration</literal>. The
-        configuration can be updated from a web interface, downloaded onto the
-        development host and used in generating a new cloud-init iso
-        image.</para>
-      </listitem>
-    </itemizedlist></para>
-
-  <para>By default, <literal>t128-running.xml</literal> is configured to pass
-  all traffic from the LAN to the WAN interface. There is only one change
-  required for the 128T VNF to work on the user's network:</para>
-
-  <programlisting>&lt;rt:next-hop&gt;172.24.15.254&lt;/rt:next-hop&gt;</programlisting>
-
-  <para>Please change &lt;172.24.15.254&gt; with the IP address of your
-  Gateway in the <filename>t128-running.xml</filename> file and generate a new
-  iso image as described above. For more details about configuring the 128T
-  VNF please contact 128 Technologies.</para>
-</appendix>
\ No newline at end of file
diff --git a/doc/book-enea-edge-example-usecases/doc/appendix_2.xml b/doc/book-enea-edge-example-usecases/doc/appendix_2.xml
deleted file mode 100644
index 7ef7c41..0000000
--- a/doc/book-enea-edge-example-usecases/doc/appendix_2.xml
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<appendix id="appendix_two_cust">
-  <title>How to create the 128T image for NFV Access</title>
-
-  <para>The following steps were used by Enea to generate the 128T qcow2 image
-  used as the VNF image on NFV Access.</para>
-
-  <note>
-    <para>Keep in mind a Virtual Machine was used instead of a physical
-    host.</para>
-  </note>
-
-  <para><emphasis role="bold">Prerequisites:</emphasis><itemizedlist>
-      <listitem>
-        <para><filename>128T-3.2.7-1.el7.centos.x86_64.iso</filename> provided
-        by 128 Technologies.</para>
-      </listitem>
-
-      <listitem>
-        <para>A Linux development host with internet access.</para>
-      </listitem>
-
-      <listitem>
-        <para>A least one of the TAP interfaces connected to a bridge with
-        Internet access.</para>
-      </listitem>
-    </itemizedlist><emphasis role="bold">How to create the 128T image for NFV
-  Access:</emphasis><orderedlist>
-      <listitem>
-        <programlisting>&gt;qemu-img create -f qcow2 128t.qcow2  128G
-&gt;qemu-system-x86_64 -enable-kvm -m 8G -cpu host -smp cores=3,sockets=1 \
--M q35 -nographic bios /usr/share/qemu/bios.bin -boot order=d,menu=on \
-cdrom 128T-3.2.7-1.el7.centos.x86_64.iso \
-hdb 128t.qcow2 \
-device e1000,netdev=net1,mac=52:52:01:02:03:01 \
-netdev tap,id=net1,ifname=tap1,script=no,downscript=no</programlisting>
-      </listitem>
-
-      <listitem>
-        <para>Press the &lt;ENTER&gt; key to begin the installation
-        process.</para>
-      </listitem>
-
-      <listitem>
-        <para>Wait for the distribution and the 128T to install:</para>
-
-        <programlisting>------------------------------
-128T Packages Installed       
-                              
-Please Remove Install Media,  
-                              
-then enter &lt;Yes&gt; to reboot and
-continue install process      
-                              
-      &lt;Yes&gt;          &lt;No&gt;     
-------------------------------</programlisting>
-
-        <para>Press Yes.</para>
-      </listitem>
-
-      <listitem>
-        <para>Wait to reboot and press <literal>CTR+ a+c</literal> to enter
-        the qemu monitor:</para>
-
-        <programlisting>(qemu) quit</programlisting>
-      </listitem>
-
-      <listitem>
-        <para>Start qemu only with the qcow2 image attached, no installer
-        image required:</para>
-
-        <programlisting>&gt;qemu-system-x86_64 -enable-kvm -m 8G -cpu host -smp cores=3,sockets=1 \ 
--M q35 -nographic bios /usr/share/qemu/bios.bin \
--boot order=c,menu=on \
--hda 128t.qcow2 \
--device e1000,netdev=net1,mac=52:52:01:02:03:01 \
--netdev tap,id=net1,ifname=tap1,script=no,downscript=no
-
-------------------------------------------------------------------------------
-Booting from Hard Disk...
-.
-
-      * CentOS Linux (3.10.0-514.2.2.el7.x86_64) 7 (Core)
-      CentOS Linux (0-rescue-4e73a369e89e466a888c9c77655a1d65) 7 (Core)
-
-
-      Use the ^ and v keys to change the selection.
-      Press 'e' to edit the selected item, or 'c' for a command prompt.
-------------------------------------------------------------------------------</programlisting>
-
-        <para>Select the first option.</para>
-      </listitem>
-
-      <listitem>
-        <programlisting>|-------------------128T Installer-------------------|
-|                                                    |
-|             Configure Linux Networking             |
-|                                                    |
-|                 Before 128T SetUp?                 |
-|                                                    |
-|                                                    |
-|                  &lt; Yes &gt;  &lt; No &gt;                   |
-|----------------------------------------------------|</programlisting>
-
-        <para>Select NO.</para>
-      </listitem>
-
-      <listitem>
-        <para><programlisting>|----------------------------------------------------|
-|       Please select a role for this node:          |
-|  |----------------------------------------------|  |
-|  |               (*) Router                     |  |
-|  |               ( ) Conductor                  |  |
-|  |----------------------------------------------|  |
-|                                                    |
-|----------------------------------------------------|
-|                  &lt; OK &gt; &lt; Back &gt;                   |
-|----------------------------------------------------|</programlisting>Select
-        Router and OK.</para>
-      </listitem>
-
-      <listitem>
-        <programlisting>|-------------------Conductor Info-------------------|
-|                                                    |
-|  |----------------------------------------------|  |
-|  |1st Conductor Address                         |  |
-|  |Conductor Address                             |  |
-|  |----------------------------------------------|  |
-|                                                    |
-|----------------------------------------------------|
-|       &lt; OK &gt;   &lt; Skip &gt;   &lt; Back &gt;   &lt; Help &gt;      |
-|----------------------------------------------------|</programlisting>
-
-        <para>Select SKIP.</para>
-      </listitem>
-
-      <listitem>
-        <para><programlisting>|----------------------HA Setup----------------------|
-|         What kind of Router node is this?          |
-|  |----------------------------------------------|  |
-|  |(*) Standalone   No HA peer                   |  |
-|  |( ) 1st HA Node  HA peer is not set up        |  |
-|  |( ) 2nd HA Node  HA peer is already set up    |  |
-|  |----------------------------------------------|  |
-|                                                    |
-|                                                    |
-|----------------------------------------------------|
-|               &lt; OK &gt;        &lt; Back &gt;               |
-|----------------------------------------------------|</programlisting>Select
-        Standalone and OK.</para>
-      </listitem>
-
-      <listitem>
-        <programlisting>|---------------------Node Info----------------------|
-|  |----------------------------------------------|  |
-|  |           Node Role      Router              |  |
-|  |           Node Name      128tNode            |  |
-|  |           Router Name    128tRouter          |  |
-|  |----------------------------------------------|  |
-|                                                    |
-|----------------------------------------------------|
-|     &lt; OK &gt;   &lt; Advanced &gt;   &lt; Back &gt;  &lt; Help &gt;     |
-|----------------------------------------------------|</programlisting>
-
-        <para>Enter a name for the router and node, press OK.</para>
-      </listitem>
-
-      <listitem>
-        <programlisting>|-------------------Password Setup-------------------|
-|   Enter the new password for the 128T 'admin'      |
-|   user:                                            |
-|  |----------------------------------------------|  |
-|  |     128Tadmin                                |  |
-|  |----------------------------------------------|  |
-|                                                 |  |
-|----------------------------------------------------|
-|              &lt; OK &gt;      &lt; Back &gt;                  |
-|----------------------------------------------------|</programlisting>
-
-        <para>Enter the password for web access: <literal>128Tadmin</literal>
-        and confirm the password.</para>
-      </listitem>
-
-      <listitem>
-        <programlisting>|--------------------------Anonymous Data Collection--------------------------|
-| The 128T Networking Platform comes packaged with a software process         |
-|("Roadrunner") that is used to proactively monitor the health and liveliness |
-|of the 128T Router and associated components. This watchdog process collects |
-|anonymous information from the router and sends it to 128 Technology for     |
-|storage and analysis. This information helps inform 128 Technology about     |
-|software usage, to aid in the support and improvement of the 128 Technology  |
-|Networking Platform.                                                         |
-|                                                                             |
-|Disabling this feature will prevent the sending of anonymous usage data to   |
-|128 Technology.                                                              |
-|                                                                             |
-|                                                                             |
-|                 &lt; Accept &gt;       &lt; Back &gt;       &lt; Disable &gt;                 |
-|-----------------------------------------------------------------------------|</programlisting>
-
-        <para>Select Accept.</para>
-      </listitem>
-
-      <listitem>
-        <programlisting>|-----128T Statistics Table Creator-----|
-|  Created table for metric 760/827     |
-|  Created table for metric 770/827     |
-|  Created table for metric 780/827     |
-|  Created table for metric 790/827     |
-|  Created table for metric 800/827     |
-|  Created table for metric 810/827     |
-|  Created table for metric 820/827     |
-|  Finished pre-creating stats tables   |
-|  Creating tables for audit events     |
-|  Finished creating audit event tables |
-|  Completed in 27.001386642456055 s    |
-|  Shutting down local Cassandra node   |
-|---------------------------------------|
-|                 &lt; OK &gt;                |
-|---------------------------------------|</programlisting>
-
-        <para>Select OK.</para>
-      </listitem>
-
-      <listitem>
-        <programlisting>|--------128T Installer Status----------|
-|                                       |
-|           Install SUCCESS             |
-|                                       |
-|           Start 128T Router           |
-|           before proceeding to        |
-|           login prompt?               |
-|---------------------------------------|
-|           &lt; Yes &gt;   &lt; No  &gt;           |
-|---------------------------------------|</programlisting>
-
-        <para>Select: Yes</para>
-      </listitem>
-
-      <listitem>
-        <programlisting>localhost login: root
-Password:</programlisting>
-
-        <para>The following user accounts and passwords are created during the
-        ISO installation process:</para>
-
-        <table>
-          <title>Accounts Created</title>
-
-          <tgroup cols="2">
-            <colspec align="left" />
-
-            <thead>
-              <row>
-                <entry align="center">User</entry>
-
-                <entry align="center">Password</entry>
-              </row>
-            </thead>
-
-            <tbody>
-              <row>
-                <entry>root</entry>
-
-                <entry>128tRoutes</entry>
-              </row>
-
-              <row>
-                <entry>t128</entry>
-
-                <entry>128tRoutes</entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-      </listitem>
-
-      <listitem>
-        <para>GUI login via HTTPS is enabled by default on port 443</para>
-
-        <programlisting>[root@localhost ~]# dhclient enp0s2
-[root@localhost ~]# echo "nameserver 8.8.8.8" &gt;&gt;/etc/resolv.conf
-[root@localhost ~]# yum -y install cloud-init
-[root@localhost ~]# reboot</programlisting>
-      </listitem>
-
-      <listitem>
-        <para>Wait to reboot and press CTR+ a+c to enter in qemu
-        monitor.</para>
-
-        <programlisting>(qemu) quit
-&gt; qemu-img info 128t.qcow2
-image: 128t.qcow2
-file format: qcow2
-virtual size: 128G (137438953472 bytes)
-disk size: 5.4G
-cluster_size: 65536
-Format specific information:
-    compat: 1.1
-    lazy refcounts: false
-    refcount bits: 16
-    corrupt: false</programlisting>
-      </listitem>
-
-      <listitem>
-        <para>Compress the generated <filename>128t.qcow2</filename> image to
-        decrease the size of VNF image:</para>
-
-        <programlisting>qemu-img convert -O qcow2 -c 128t.qcow2 centos_128t_compressed.qcow2
-
-&gt; qemu-img info centos_128t_compressed.qcow2
-image: centos_128t_compressed.qcow2
-file format: qcow2
-virtual size: 128G (137438953472 bytes)
-disk size: 1.2G
-cluster_size: 65536
-Format specific information:
-    compat: 1.1
-    lazy refcounts: false
-    refcount bits: 16
-    corrupt: false
-
-centos_128t_compressed.qcow2 - Resulted image can be used in NFV Access.</programlisting>
-      </listitem>
-    </orderedlist></para>
-</appendix>
\ No newline at end of file
diff --git a/doc/book-enea-edge-example-usecases/doc/appendix_3.xml b/doc/book-enea-edge-example-usecases/doc/appendix_3.xml
deleted file mode 100644
index 063483a..0000000
--- a/doc/book-enea-edge-example-usecases/doc/appendix_3.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<appendix id="appendix_three_cust">
-  <title>How to configure Fortigate VNF (day-0 configuration)</title>
-
-  <para>Please check the README file from Fortigate folder for more
-  details.</para>
-</appendix>
\ No newline at end of file
diff --git a/doc/book-enea-edge-example-usecases/doc/appendix_4.xml b/doc/book-enea-edge-example-usecases/doc/appendix_4.xml
deleted file mode 100644
index f554b37..0000000
--- a/doc/book-enea-edge-example-usecases/doc/appendix_4.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<appendix id="appendix_four_cust">
-  <title>Running Enea Edge Automation Framework and Test Harness</title>
-
-  <para>For more detailed information regarding the Enea Edge Automation
-  Framework and Test Harness please see the <xi:include
-  href="../../s_docbuild/olinkdb/pardoc-common.xml"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(book_enea_edge_auto_fw_th_user_guide/1)" />.</para>
-
-  <para>The most relevant information from the Enea Edge Automation Framework
-  and Test Harness structure is presented below:</para>
-
-  <programlisting>|---automation_framework
-|  |---unittestSuite
-|  |  |---128tCleanup.json             - Use case 1 - clean up - test.
-|  |  |---128tDeploy.json              - Use case 1 - test.
-|  |  |---128t_FG_SFCCleanup.json      - Use case 2 - clean up - test.
-|  |  |---128t_FG_SFCDeploy.json       - Use case 2 - test.
-|  |  |---config
-|  |  |  |---cust  
-            - Folder containing the configuration files used by tests.
-|  |  |---unittestLoader.py
-|  |  |---unittestSuite.py
-|---lab_config
-|  |---trgt-1 
-|  |  |---ibm_br.json                  - In-band management definition.
-|  |  |---lan_br.json                  - Lan bridge definition.
-|  |  |---target.json      
-            - Target definition - the "address", "deviceId", "name" and \
-              "version" must be updated.
-|  |  |---sfc_br.json                  - Service chain bridge definition.
-|  |  |---vnf_mgmt_br.json             - VNF management bridge definition.
-|  |  |---lan_nic.json                 - NIC definition.
-|---vnf_config
-|  |---128t
-|  |  |---128tInstance.json            - 128T instantiation - used in use case 1.
-|  |  |---128t.json                    - 128T onboarding.
-|  |  |---128tSFCInstance.json         - 128T instantiation - used in use case 2.
-|  |  |---centos_128t_internet_ci.iso  - 128T cloud init (day-0) iso image.
-|  |---fortigate
-|  |  |---fg_basic_fw.conf             - Fortigate day-0 configuration.
-|  |  |---fortigateInstance.json       - Fortigate instantiation.
-|  |  |---fortigate.json               - Fortigate onboarding.
-|  |  |---fortigateLicense.lic
-            - Fortigate license - contact Fortinet to get a VNF image and license file.
-|---vnf_image
-|  |---centos_128t_with_ci.qcow2       - Contact 128 Technology to get a \
-                                         VNF image and its license file.
-|  |---fortios.qcow2                   - Contact Fortinet to get a VNF image \
-                                         and its license file.</programlisting>
-
-  <para>Make sure to update the relevant configuration file for your setup.
-  The essential files to consider are the uCPE Device configuration
-  (<filename>target.json</filename>), the license for the Fortigate VNF, and
-  the 128T cloud-init iso image matching your network.</para>
-
-  <para>For uCPE Device configuration (<filename>target.json</filename>)
-  please change the following information, if needed, in the JSON file:</para>
-
-  <itemizedlist spacing="compact">
-    <listitem>
-      <para><literal>address</literal> - The IP address of uCPE Device.</para>
-    </listitem>
-
-    <listitem>
-      <para><literal>version</literal> - The Enea Edge Runtime version.</para>
-    </listitem>
-
-    <listitem>
-      <para><literal>deviceId</literal> - The device ID of uCPE Device.</para>
-    </listitem>
-
-    <listitem>
-      <para><literal>name</literal> - The name of uCPE Device.</para>
-    </listitem>
-  </itemizedlist>
-
-  <note>
-    <para>Before starting the two use-cases detailed in the following appendix,
-    the uCPE Device needs to be added into the Enea Edge Management
-    application.</para>
-  </note>
-
-  <para>To properly set up the Enea Edge Automation Framework and Test Harness
-  please see <olink targetdoc="book_enea_edge_auto_fw_th_user_guide"
-  targetptr="initial_setup">Installation and Initial Setup in the <xi:include
-  href="../../s_docbuild/olinkdb/pardoc-names.xml"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(book_enea_edge_auto_fw_th_user_guide/1)" /></olink> for
-  more details.</para>
-
-  <para>To run a test:</para>
-
-  <programlisting>&gt; cd automation_framework/unittestSuite/
-&gt; python unittestSuite.py -u admin -p admin -H &lt;EneaEdgeManagement IP address&gt; -n \
-&lt;uCPE Device name&gt; -s &lt;Test suite&gt; -d &lt;description&gt;</programlisting>
-
-  <para>The <literal>Test suite</literal> must be one from any of the
-  following: <filename>128tDeploy.json</filename>,
-  <filename>128tCleanup.json</filename>,
-  <filename>128t_FG_SFCDeploy.json</filename>, or
-  <filename>128t_FG_SFCCleanup.json</filename>.</para>
-</appendix>
\ No newline at end of file
diff --git a/doc/book-enea-edge-example-usecases/doc/appendix_5.xml b/doc/book-enea-edge-example-usecases/doc/appendix_5.xml
deleted file mode 100644
index ac09bda..0000000
--- a/doc/book-enea-edge-example-usecases/doc/appendix_5.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<appendix id="appendix_five_cust">
-  <title>Example Tests Results using the Automation Framework and Test
-  Harness</title>
-
-  <para>In order to run the following example use-cases, certain configuration
-  file entries need to be modified according to the network setup that it will
-  be used, for more details see the previous appendix:</para>
-
-  <itemizedlist spacing="compact">
-    <listitem>
-      <para>uCPE Device name: inteld1521-17</para>
-    </listitem>
-
-    <listitem>
-      <para>address: 172.24.8.62</para>
-    </listitem>
-
-    <listitem>
-      <para>version: 2.2.3</para>
-    </listitem>
-
-    <listitem>
-      <para>deviceId: inteld1521-17</para>
-    </listitem>
-  </itemizedlist>
-
-  <para><programlisting>&gt; cat lab_config/trgt-1/target.json
-{
-    "name": "inteld1521-17",
-    "deviceGroupingTags": " ",
-    "description": "trgt",
-    "address": "172.24.8.62",
-    "port": "830",
-    "username": "root",
-    "password": "",
-    "certificate": null,
-    "passphrase": null,
-    "callHome": "false",
-    "maintMode": "false",
-    "version": "2.2.3",
-    "deviceId": "inteld1521-17"
-}</programlisting>The IP address of Enea Edge Management application that will
-  be used in these examples is <literal>172.24.3.92</literal>.</para>
-
-  <para>The FortiGate and 128T VNF images need to be copied into the
-  <literal>vnf_image</literal> directory. The names should be the same as
-  those described in the previous appendix.</para>
-
-  <para>The FortiGate valid license file needs to be copied into the
-  <literal>vnf_config/fortigate/</literal> directory. The name should be the
-  same as that described in the previous appendix.</para>
-
-  <para>The cloud init files that match the network, need to be copied into
-  the <literal>vnf_config/fortigate/</literal> and the
-  <literal>vnf_config/128t/</literal> directories respectively. The names
-  should be the same as those described in the previous appendix.</para>
-
-  <section id="ap_d_uc1">
-    <title>Use-case 1: 128T VNF Router Example Use-case</title>
-
-    <programlisting>&gt; cd automation_framework/unittestSuite/
-&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.92 -n inteld1521-17 \
--s 128tDeploy.json -d "128T Deployment"
-
-Running 128T Deployment...
-
-test 001: Wait VCPE Agent device be up (__main__.UnittestSuite) ...
-2020-08-26 10:10:05,517 - INFO: Wait uCPE device
-2020-08-26 10:10:36,650 - INFO: Status: Connected
-2020-08-26 10:10:36,651 - INFO: Done
-ok
-test 002: Bind NIC to DPDK for LAN connection (__main__.UnittestSuite) ...
-2020-08-26 10:10:36,686 - INFO: Bind NIC
-2020-08-26 10:10:37,788 - INFO: Done
-ok
-test 003: Creating ibm bridge  (__main__.UnittestSuite) ...
-2020-08-26 10:10:37,818 - INFO: New OVS network bridge
-2020-08-26 10:10:58,762 - INFO: Done
-ok
-test 004: Creating VNF Management bridge  (__main__.UnittestSuite) ...
-2020-08-26 10:10:58,794 - INFO: New OVS network bridge
-2020-08-26 10:10:58,977 - INFO: Done
-ok
-test 005: Creating LAN bridge and attaching lan interface to the bridge  \
-(__main__.UnittestSuite) ...
-2020-08-26 10:10:59,003 - INFO: New OVS network bridge
-2020-08-26 10:10:59,334 - INFO: Done
-ok
-test 006: Onboarding 128T VNF (wizard API) (__main__.UnittestSuite) ...
-2020-08-26 10:10:59,370 - INFO: Onboard wizard
-2020-08-26 10:13:55,775 - INFO: Done
-ok
-test 007: Instantiate 128T VNF   (__main__.UnittestSuite) ...
-2020-08-26 10:13:55,813 - INFO: Instantiate VNF
-2020-08-26 10:14:56,583 - INFO: Done
-ok
-
-----------------------------------------------------------------------
-Ran 7 tests in 291.103s
-
-OK
-
-&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.92 -n inteld1521-17 \
--s 128tCleanup.json -d "128T Cleanup"
-
-Running 128T Cleanup...
-
-test 001: Destroying 128T VNF     (__main__.UnittestSuite) ...
-2020-08-26 10:15:28,395 - INFO: Destroy VNF
-2020-08-26 10:15:29,452 - INFO: Done
-ok
-test 002: Deleting network bridge LAN  (__main__.UnittestSuite) ...
-2020-08-26 10:15:29,493 - INFO: Delete OVS network bridge
-2020-08-26 10:15:29,734 - INFO: Done
-ok
-test 003: Deleting VNF management bridge  (__main__.UnittestSuite) ...
-2020-08-26 10:15:29,765 - INFO: Delete OVS network bridge
-2020-08-26 10:15:30,080 - INFO: Done
-ok
-test 004: Deleting ibm(In Band Management) bridge  (__main__.UnittestSuite) ...
-2020-08-26 10:15:30,110 - INFO: Delete OVS network bridge
-2020-08-26 10:15:46,907 - INFO: Done
-ok
-test 005: Unbind LAN NIC from DPDK target (__main__.UnittestSuite) ...
-2020-08-26 10:15:46,967 - INFO: Unbind NIC
-2020-08-26 10:15:48,489 - INFO: Done
-ok
-test 006: Offboarding 128t VNF    (__main__.UnittestSuite) ...
-2020-08-26 10:15:48,531 - INFO: Offboard VNF
-2020-08-26 10:15:49,171 - INFO: Done
-ok
-
-----------------------------------------------------------------------
-Ran 6 tests in 20.808s
-
-OK</programlisting>
-  </section>
-
-  <section id="ap_d_uc2">
-    <title>Use-case 2: Service Chaining 128T - Fortigate Example
-    Use-case</title>
-
-    <programlisting>&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.92 -n inteld1521-17 \
--s 128t_FG_SFCDeploy.json -d "128T - Fortigate SFC Deployment"
-
-Running 128T - Fortigate SFC Deployment...
-
-test 001: Wait VCPE Agent device be up (__main__.UnittestSuite) ...
-2020-08-26 10:17:29,361 - INFO: Wait uCPE device
-2020-08-26 10:18:00,473 - INFO: Status: Connected
-2020-08-26 10:18:00,474 - INFO: Done
-ok
-test 002: Bind NIC to DPDK for LAN connection (__main__.UnittestSuite) ...
-2020-08-26 10:18:00,634 - INFO: Bind NIC
-2020-08-26 10:18:01,805 - INFO: Done
-ok
-test 003: Creating ibm bridge  (__main__.UnittestSuite) ...
-2020-08-26 10:18:01,863 - INFO: New OVS network bridge
-2020-08-26 10:18:30,640 - INFO: Done
-ok
-test 004: Creating VNF Management bridge  (__main__.UnittestSuite) ...
-2020-08-26 10:18:30,670 - INFO: New OVS network bridge
-2020-08-26 10:18:30,876 - INFO: Done
-ok
-test 005: Creating LAN bridge and attaching lan interface to the bridge  \
-(__main__.UnittestSuite) ...
-2020-08-26 10:18:30,908 - INFO: New OVS network bridge
-2020-08-26 10:18:31,243 - INFO: Done
-ok
-test 006: Creating SFC(service function chaining) bridge  (__main__.UnittestSuite) ...
-2020-08-26 10:18:31,273 - INFO: New OVS network bridge
-2020-08-26 10:18:31,416 - INFO: Done
-ok
-test 007: Onboarding 128T VNF (wizard API) (__main__.UnittestSuite) ...
-2020-08-26 10:18:31,448 - INFO: Onboard wizard
-2020-08-26 10:21:21,569 - INFO: Done
-ok
-test 008: Onboarding Fortigate VNF (wizard API) (__main__.UnittestSuite) ...
-2020-08-26 10:21:21,608 - INFO: Onboard wizard
-2020-08-26 10:21:27,199 - INFO: Done
-ok
-test 009: Instantiate 128T VNF   (__main__.UnittestSuite) ...
-2020-08-26 10:21:27,226 - INFO: Instantiate VNF
-2020-08-26 10:22:27,067 - INFO: Done
-ok
-test 010: Instantiate Fortigate VNF    (__main__.UnittestSuite) ...
-2020-08-26 10:22:27,121 - INFO: Instantiate VNF
-2020-08-26 10:22:31,310 - INFO: Done
-ok
-
-----------------------------------------------------------------------
-Ran 10 tests in 301.989s
-
-OK
-
-&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.92 -n inteld1521-17 \
--s 128t_FG_SFCCleanup.json -d "128T - Fortigate SFC Cleanup"
-
-Running 128T - Fortigate SFC Cleanup...
-
-test 001: Destroying Fortigate VNF     (__main__.UnittestSuite) ...
-2020-08-26 10:23:29,308 - INFO: Destroy VNF
-2020-08-26 10:23:30,026 - INFO: Done
-ok
-test 002: Destroying 128T VNF     (__main__.UnittestSuite) ...
-2020-08-26 10:23:30,065 - INFO: Destroy VNF
-2020-08-26 10:23:30,917 - INFO: Done
-ok
-test 003: Deleting network bridge SFC  (__main__.UnittestSuite) ...
-2020-08-26 10:23:30,960 - INFO: Delete OVS network bridge
-2020-08-26 10:23:31,123 - INFO: Done
-ok
-test 004: Deleting network bridge LAN  (__main__.UnittestSuite) ...
-2020-08-26 10:23:31,156 - INFO: Delete OVS network bridge
-2020-08-26 10:23:31,381 - INFO: Done
-ok
-test 005: Deleting VNF management bridge  (__main__.UnittestSuite) ...
-2020-08-26 10:23:31,412 - INFO: Delete OVS network bridge
-2020-08-26 10:23:31,596 - INFO: Done
-ok
-test 006: Deleting ibm(In Band Management) bridge  (__main__.UnittestSuite) ...
-2020-08-26 10:23:31,621 - INFO: Delete OVS network bridge
-2020-08-26 10:23:47,980 - INFO: Done
-ok
-test 007: Unbind LAN NIC from DPDK target (__main__.UnittestSuite) ...
-2020-08-26 10:23:48,019 - INFO: Unbind NIC
-2020-08-26 10:23:49,547 - INFO: Done
-ok
-test 008: Offboarding 128t VNF    (__main__.UnittestSuite) ...
-2020-08-26 10:23:49,575 - INFO: Offboard VNF
-2020-08-26 10:23:50,252 - INFO: Done
-ok
-test 009: Offboarding Fortigate VNF    (__main__.UnittestSuite) ...
-2020-08-26 10:23:50,295 - INFO: Offboard VNF
-2020-08-26 10:23:50,589 - INFO: Done
-ok
-
-----------------------------------------------------------------------
-Ran 9 tests in 21.326s
-
-OK</programlisting>
-  </section>
-</appendix>
\ No newline at end of file
diff --git a/doc/book-enea-edge-example-usecases/doc/book.xml b/doc/book-enea-edge-example-usecases/doc/book.xml
index e872c95..5e7a3f4 100644
--- a/doc/book-enea-edge-example-usecases/doc/book.xml
+++ b/doc/book-enea-edge-example-usecases/doc/book.xml
@@ -37,8 +37,4 @@
 
   <xi:include href="service_chaining_128t_fortigate.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-  <xi:include href="appendix_4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-  <xi:include href="appendix_5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </book>
\ No newline at end of file