Updates and clarification of AF-TH manual.

Change-Id: I8d59b9eacf0b652ff6cf4075406ce036f79fd6be

5 files changed, 542 insertions, 412 deletions

diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
index d7771bc..2aea23d 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
@@ -147,8 +147,8 @@
     Python script for running the test case.</para>
 
     <para>The <literal>/vnf</literal> folder contains Python scripts for
-    onboarding and offboarding a VNF bundle or image, instantiating a VNF,
-    controlling a VNF instance or destroying an existing one.</para>
+    onboarding and offboarding a VNF image, instantiating a VNF, controlling a
+    VNF instance or destroying an existing one.</para>
 
     <para>The <filename>eneaUcpeMgr.py</filename> file acts as a library for
     the (Python) Automation Framework scripts. It contains common functions
@@ -159,14 +159,16 @@
 
       <para>The Python unit-test class defined in the
       <filename>unittestSuite.py</filename> script provides a way to automate
-      the execution of specific test cases for each supported Python script.
-      This class requires a test suite configuration JSON file that contains a
-      dictionary list of the Python scripts to be processed. Each dictionary
-      must contain the path of the Python script to be loaded and the path to
-      the file describing the test cases to be performed against the
-      designated script.</para>
-
-      <para>Steps for running the Python unit-test suite onto the uCPE Manager
+      the execution of specific test cases for each supported Python
+      script.</para>
+
+      <para>This class requires a test suite configuration JSON file that
+      contains a dictionary list of the Python scripts to be processed. Each
+      dictionary must contain the path of the Python script to be loaded and
+      the path to the file describing the test cases to be performed against
+      the designated script.</para>
+
+      <para>Steps for running the Python unit-test suite on the uCPE Manager
       are provided below.</para>
 
       <section id="script_opts">
@@ -197,16 +199,16 @@ Options:
       </section>
 
       <section id="config_ut_json">
-        <title>Configuring Unit-Test JSON File<remark>Starting from this
-        section onward NOTHING has been proofed</remark></title>
+        <title>Configuring Unit-Test JSON File</title>
 
-        <para>The unit-test suite JSON configuration file contains a list of
-        dictionaries, each dictionary indicating the path of the Python module
-        to load and the test cases configuration file to be executed against
+        <para>The Unit-Test suite JSON configuration file contains a list of
+        dictionaries. Each dictionary indicates the path of the Python module
+        to load and the test case's configuration file to be executed against
         the loaded module.</para>
 
-        <para>Sample unit-test configuration file describing the Fortigate
-        deployment scenario, fortigateDeploy.json:</para>
+        <para>Below is a sample unit-test configuration file, describing the
+        Fortigate <emphasis role="bold">deployment</emphasis> scenario
+        <filename>fortigateDeploy.json</filename>:</para>
 
         <para><programlisting>[
  {
@@ -237,8 +239,11 @@ Options:
  "config": "config/controlVNFI.json",
  "module": "../vnf/controlVNFI.py"
  }
-]</programlisting>Sample unit-test configuration file describing the Fortigate
-        cleanup scenario, fortigateCleanup.json:</para>
+]</programlisting></para>
+
+        <para>Below is a sample unit-test configuration file, describing the
+        Fortigate <emphasis role="bold">cleanup</emphasis> scenario
+        <filename>fortigateCleanup.json</filename>:</para>
 
         <programlisting>[
  {
@@ -263,19 +268,19 @@ Options:
  }
 ]</programlisting>
 
-        <para>"config" key contains the path to the test cases configuration
-        file.</para>
+        <para>The <literal>config</literal> key contains the path to the test
+        case's configuration file.</para>
 
-        <para>"module" key contains the path to the Python script to be
-        executed.</para>
+        <para>The <literal>module</literal> key contains the path to the
+        Python script to be executed.</para>
       </section>
 
       <section id="ut_config_opts">
         <title>Unit-Test Configuration Options</title>
 
-        <para>The unit-test behavior can be tweaked in a number of ways
-        through the following options set through the eneaUcpeMgr.py
-        file:<programlisting># Defaults for the framework
+        <para>Unit-test behavior can be tweaked through setting any of the
+        following options. This is done through the
+        <filename>eneaUcpeMgr.py</filename> file:<programlisting># Defaults for the framework
 username = "admin"
 password = "admin"
 host = None
@@ -296,47 +301,116 @@ failfast = True
 # DEBUG 10
 # NOTSET 0
 fileLoggingLevel = logging.DEBUG
-consoleLoggingLevel = logging.INFO</programlisting>username - user to be used
-        when authenticating to uCPE Manager; this can be overwritten by
-        setting the Python unit-test suite command line option -u.</para>
+consoleLoggingLevel = logging.INFO</programlisting></para>
+
+        <para><table>
+            <title>eneaUcpeMgr.py Options</title>
+
+            <tgroup cols="2">
+              <colspec align="left" />
+
+              <colspec colwidth="2*" />
+
+              <colspec colwidth="5*" />
+
+              <thead>
+                <row>
+                  <entry align="center">Option</entry>
+
+                  <entry align="center">Description</entry>
+                </row>
+              </thead>
+
+              <tbody>
+                <row>
+                  <entry><literal>username</literal></entry>
+
+                  <entry>The user authentication used to log into the uCPE
+                  Manager. This can be overwritten by setting the Python
+                  unit-test suite command line option
+                  <literal>-u</literal>.</entry>
+                </row>
+
+                <row>
+                  <entry><literal>password</literal></entry>
+
+                  <entry>The password used to log into the uCPE Manager. This
+                  can be overwritten by setting the Python unit-test suite
+                  command line option <literal>-p</literal>.</entry>
+                </row>
+
+                <row>
+                  <entry><literal>host</literal></entry>
+
+                  <entry>The IP address of the uCPE Manager host. This can be
+                  overwritten by setting the Python unit-test suite command
+                  line option <literal>-H</literal>.</entry>
+                </row>
+
+                <row>
+                  <entry><literal>devicename</literal></entry>
 
-        <para>password - password to be used when authenticating to uCPE
-        Manager; this can be overwritten by setting the Python unit-test suite
-        command line option -p.</para>
+                  <entry>The name of the vCPE agent against which tests will
+                  be performed. This can be overwritten by setting the Python
+                  unit-test suite command line option
+                  <literal>-n</literal>.</entry>
+                </row>
 
-        <para>host - IP address of the uCPE Manager host; this can be
-        overwritten by setting the Python unit-test suite command line option
-        -H.</para>
+                <row>
+                  <entry><literal>ftpUsername</literal></entry>
 
-        <para>devicename - name of the VCPE agent to perform the tests
-        against; this can be overwritten by setting the Python unit-test suite
-        command line option -n.</para>
+                  <entry>The user authentication used for the FTP connection
+                  when onboarding a VNF image. This can be overwritten by
+                  setting the Python script command line option
+                  <literal>-f</literal>.</entry>
+                </row>
 
-        <para>ftpUsername - user to be used for the FTP connection when
-        onboarding a VNF bundle/image; this can be overwritten by setting the
-        Python script command line option -f.</para>
+                <row>
+                  <entry><literal>ftpPassword</literal></entry>
 
-        <para>ftpPassword - password to be used for the FTP connection when
-        onboarding a VNF bundle/image; this can be overwritten by setting the
-        Python script command line option -w.</para>
+                  <entry>The password used for the FTP connection when
+                  onboarding a VNF image. This can be overwritten by setting
+                  the Python script command line option
+                  <literal><literal>-w</literal></literal>.</entry>
+                </row>
 
-        <para>ftpPort - port to be used for the FTP connection when onboarding
-        a VNF bundle/image; this can be overwritten by setting the Python
-        script command line option -P.</para>
+                <row>
+                  <entry><literal>ftpPort</literal></entry>
 
-        <para>failfast - describes the unit-test execution behavior on the
-        first error or failure encountered.</para>
+                  <entry>The port used for the FTP connection when onboarding
+                  a VNF image. This can be overwritten by setting the Python
+                  script command line option <literal>-P</literal>.</entry>
+                </row>
 
-        <para>fileLoggingLevel - sets the file logging level.</para>
+                <row>
+                  <entry><literal>failfast</literal></entry>
 
-        <para>consoleLoggingLevel - sets the console logging level.</para>
+                  <entry>Describes the unit-test execution behavior on the
+                  first error or failure encountered.</entry>
+                </row>
+
+                <row>
+                  <entry><literal>fileLoggingLevel</literal></entry>
+
+                  <entry>Sets the file logging level.</entry>
+                </row>
+
+                <row>
+                  <entry><literal>consoleLoggingLevel</literal></entry>
+
+                  <entry>Sets the console logging level.</entry>
+                </row>
+              </tbody>
+            </tgroup>
+          </table></para>
       </section>
 
       <section id="ut_suite_log">
         <title>Python Unit-Test Suite Logging</title>
 
         <para>Logging messages are displayed in the console and also saved to
-        the specified log file depending on the chosen logging level.</para>
+        the specified log file. They are shown depending on the chosen logging
+        level.</para>
 
         <para>Logging messages are ranked by their severity
         level:<programlisting>CRITICAL 50
@@ -344,24 +418,29 @@ ERROR 40
 WARNING 30
 INFO 20
 DEBUG 10
-NOTSET 0</programlisting>Logging messages which are less severe than the
-        logging level set will be ignored.</para>
+NOTSET 0</programlisting></para>
 
-        <para>Setting console logging level to INFO is done through the
-        consoleLoggingLevel option:<programlisting>consoleLoggingLevel = logging.INFO</programlisting>Setting
-        file logging level to DEBUG is done through the fileLoggingLevel
-        option:<programlisting>fileLoggingLevel = logging.DEBUG</programlisting></para>
+        <note>
+          <para>Logging messages less severe than the set logging level will
+          be ignored.</para>
+        </note>
+
+        <para>Setting the console logging level to INFO is done through the
+        <literal>consoleLoggingLevel</literal> option:<programlisting>consoleLoggingLevel = logging.INFO</programlisting>Setting
+        the file logging level to DEBUG is done through the
+        <literal>fileLoggingLevel</literal> option:<programlisting>fileLoggingLevel = logging.DEBUG</programlisting></para>
       </section>
 
       <section id="run_ut_suite">
         <title>Running Python Unit-Test Suite</title>
 
-        <para>Sample unit-test command line options for running the Fortigate
-        deployment scenario:</para>
+        <para>Below you'll find sample unit-test command line options for
+        running the Fortigate <emphasis role="bold">deployment</emphasis>
+        scenario:</para>
 
         <para><programlisting>$ python unittestSuite.py -u admin -p admin -H localhost -n intelc3850-2 -s
 fortigateDeploy.json -d "Fortigate deployment scenario"</programlisting>Setting
-        console logging level to DEBUG:<programlisting>consoleLoggingLevel = logging.DEBUG</programlisting><emphasis
+        the console logging level to DEBUG:<programlisting>consoleLoggingLevel = logging.DEBUG</programlisting><emphasis
         role="bold">Expected Output:</emphasis><programlisting>2019-03-07 18:03:20,791 - DEBUG: Started logging
 
 Running Fortigate deployment scenario...
@@ -493,11 +572,12 @@ Ran 12 tests in 33.328s
 
 OK</programlisting></para>
 
-        <para>Sample unit-test command line options for running the Fortigate
-        cleanup scenario:<programlisting>$ python unittestSuite.py -u admin -p admin -H localhost -n intelc3850-2 -s
+        <para>Below you'll find sample unit-test command line options for
+        running the Fortigate <emphasis role="bold">cleanup</emphasis>
+        scenario:<programlisting>$ python unittestSuite.py -u admin -p admin -H localhost -n intelc3850-2 -s
 fortigateCleanup.json -d "Fortigate cleanup scenario"</programlisting></para>
 
-        <para>Setting console logging level to INFO: <programlisting>consoleLoggingLevel = logging.INFO</programlisting></para>
+        <para>Setting the console logging level to INFO: <programlisting>consoleLoggingLevel = logging.INFO</programlisting></para>
 
         <para><emphasis role="bold">Expected
         Output:</emphasis><programlisting>Running Fortigate cleanup scenario...
@@ -540,7 +620,8 @@ OK</programlisting></para>
     <section id="add_ucpe_device">
       <title>Adding a uCPE Device</title>
 
-      <para>Adds a uCPE device to the uCPE manager.</para>
+      <para>Steps for adding, configuring and running a uCPE device onto the
+      uCPE manager are described below .</para>
 
       <section id="opts_add_device">
         <title>Script Options</title>
@@ -548,7 +629,7 @@ OK</programlisting></para>
         <programlisting>$ python addDevice.py -h
 Usage: addDevice.py [options]
 
-Add a uCPE in Enea uCPE Manager.
+Add a uCPE device in Enea uCPE Manager.
 
 Options:
  --version show program's version number and exit
@@ -568,10 +649,10 @@ Options:
       <section id="config_json_adddev">
         <title>Configuring the JSON File</title>
 
-        <para>The add device suite JSON configuration file should contain a
-        list of dictionaries, each dictionary indicating the test case name
-        and the test case arguments passed to the addDevice Python
-        module.</para>
+        <para>The JSON configuration file needed for adding a uCPE device
+        should contain a list of dictionaries. Each dictionary indicates the
+        test case name and the arguments passed to the
+        <literal>addDevice</literal> Python module.</para>
 
         <para><emphasis role="bold">Sample configuration file in JSON
         format:</emphasis></para>
@@ -583,7 +664,8 @@ Options:
  }
 ]</programlisting>
 
-        <para><emphasis role="bold">Sample intelc3850-2.json configuration
+        <para><emphasis role="bold">Sample
+        <filename>intelc3850-2.json</filename> configuration
         file:</emphasis></para>
 
         <programlisting>{
@@ -602,8 +684,8 @@ Options:
       <section id="run_py_mod">
         <title>Running the Python Module</title>
 
-        <para>The addDevice Python module can be executed individually by
-        running the following command line:</para>
+        <para>The <filename>addDevice</filename> Python module can be executed
+        independently by running the following command:</para>
 
         <programlisting>$ python addDevice.py -u admin -p admin -H localhost -f config/device.json
 2019-03-07 17:33:10,755 - DEBUG: Started logging
@@ -619,7 +701,8 @@ Options:
     <section id="remove_ucpe_device">
       <title>Removing a uCPE Device</title>
 
-      <para>Removes a uCPE device from uCPE manager.</para>
+      <para>Steps for removing a uCPE device from the uCPE manager are
+      described below.</para>
 
       <section id="rem_script_opts">
         <title>Script Options</title>
@@ -647,10 +730,10 @@ Options:
       <section id="config_json_rem">
         <title>Configuring the JSON File</title>
 
-        <para>The remove device suite JSON configuration file should contain a
-        list of dictionaries, each dictionary indicating the test case name
-        and the test case arguments passed to the removeDevice Python
-        module.</para>
+        <para>The JSON configuration file needed to remove a uCPE device
+        should contain a list of dictionaries. Each dictionary indicates the
+        test case name and the arguments passed to the
+        <filename>removeDevice</filename> Python module.</para>
 
         <para><emphasis role="bold">Sample unit-test JSON file
         format:</emphasis></para>
@@ -662,7 +745,8 @@ Options:
  }
 ]</programlisting>
 
-        <para><emphasis role="bold">Sample intelc3850-2.json configuration
+        <para><emphasis role="bold">Sample
+        <filename>intelc3850-2.json</filename> configuration
         file:</emphasis></para>
 
         <programlisting>{
@@ -673,8 +757,8 @@ Options:
       <section id="Run_py_mod_rem">
         <title>Running the Python Module</title>
 
-        <para>The removeDevice Python module can be executed individually by
-        running the following command line:</para>
+        <para>The <filename>removeDevice</filename> Python module can be
+        executed individually by running the following command:</para>
 
         <programlisting>$ python removeDevice.py -u admin -p admin -H localhost -f
 ../../lab_config/intelc3850-2/intelc3850-2.json
@@ -693,8 +777,8 @@ host
     <section id="wait_ucpe_device">
       <title>Waiting a uCPE Device</title>
 
-      <para>Wait for uCPE to connect to the Enea uCPE Manager after
-      installation.</para>
+      <para>Steps and details for how to Wait a uCPE device to connect to the
+      uCPE Manager after installation, are described below.</para>
 
       <section id="wait_script_opts">
         <title>Script Options</title>
@@ -725,10 +809,10 @@ Options:
       <section id="config_json_wait">
         <title>Configuring the JSON File</title>
 
-        <para>The wait device suite JSON configuration file should contain a
-        list of dictionaries, each dictionary indicating the test case name
-        and the test case arguments passed to the waitDeviceUp Python
-        module.</para>
+        <para>The JSON configuration file needed to wait a uCPE device should
+        contain a list of dictionaries. Each dictionary indicates the test
+        case name and the test case arguments passed to the
+        <filename>waitDeviceUp</filename> Python module.</para>
 
         <para><emphasis role="bold">Sample unit-test JSON file
         format:</emphasis></para>
@@ -740,7 +824,8 @@ Options:
  }
 ]</programlisting>
 
-        <para><emphasis role="bold">Sample intelc3850-2.json configuration
+        <para><emphasis role="bold">Sample
+        <filename>intelc3850-2.json</filename> configuration
         file:</emphasis></para>
 
         <programlisting>{
@@ -751,8 +836,9 @@ Options:
       <section id="runpy_mod_wait">
         <title>Running the Python Module</title>
 
-        <para>The waitDeviceUp Python module can be executed individually by
-        running the following command line:<programlisting>$ python waitDeviceUp.py -u admin -p admin -H localhost -t 60 -f
+        <para>The <filename>waitDeviceUp</filename> Python module can be
+        executed individually by running the following command
+        line:<programlisting>$ python waitDeviceUp.py -u admin -p admin -H localhost -t 60 -f
 ../../lab_config/intelc3850-2/intelc3850-2.json
 2019-03-07 18:03:21,132 - DEBUG: Started logging
 2019-03-07 18:03:21,133 - INFO: Wait uCPE device
@@ -766,16 +852,16 @@ Options:
       </section>
     </section>
 
-        <section id="print_ucpe_log">
-          <title>Printing the uCPE Device log</title>
+    <section id="print_ucpe_log">
+      <title>Printing the uCPE Device Log</title>
 
-          <para>Print the events log for a specific uCPE device installed in Enea uCPE Manager.</para>
+      <para>Steps and details on how to Print the events log for a specific
+      uCPE device installed in the uCPE Manager, are explained below.</para>
 
-          <section id="print_script_opts">
-            <title>Script Options</title>
+      <section id="print_script_opts">
+        <title>Script Options</title>
 
-            <programlisting>
-$ python getEventsForUcpe.py -h
+        <programlisting>$ python getEventsForUcpe.py -h
 Usage: getEventsForUcpe.py [options]
 
 Print the events log for a specific uCPE installed in Enea uCPE Manager.
@@ -790,17 +876,17 @@ Options:
 -s SEVERITY, --severity=SEVERITY   Event severity level (Critical|Major|Minor)
 
 Mandatory options:
--H/--host, -f/--file
-            </programlisting>
-            </section>
-          
-            <section id="config_json_log">
-              <title>Configuring the JSON File</title>
-              
-              <para><emphasis role="bold">Sample <filename>intelc3850-2.json</filename> 
-                configuration file:</emphasis></para>
-              
-              <programlisting>{
+-H/--host, -f/--file            </programlisting>
+      </section>
+
+      <section id="config_json_log">
+        <title>Configuring the JSON File</title>
+
+        <para><emphasis role="bold">Sample
+        <filename>intelc3850-2.json</filename> configuration
+        file:</emphasis></para>
+
+        <programlisting>{
 "name": "intelc3850-2",
 "description": "",
 "address": "172.24.12.114",
@@ -811,14 +897,15 @@ Mandatory options:
 "passphrase": null,
 "maintMode": "false"
               }</programlisting>
-            </section>
-          
-            <section id="runpy_mod_log">
-              <title>Running the Python Module</title>
-              
-              <para>The <literal>getEventsForUcpe</literal> Python module can be executed 
-                individually by running the following command:</para>
-                <programlisting>
+      </section>
+
+      <section id="runpy_mod_log">
+        <title>Running the Python Module</title>
+
+        <para>The <literal>getEventsForUcpe</literal> Python module can be
+        executed individually by running the following command:</para>
+
+        <programlisting>
 $ python getEventsForUcpe.py -H localhost -f \
 ../../lab_config/intelc3850-2/intelc3850-2.json
 
@@ -836,15 +923,14 @@ Events on device: intelc3850-2 and severity: 1000
 2019-07-04 13:48:31,469 - INFO: Done
 2019-07-04 13:48:31,488 - DEBUG: Logging out and exiting...
               </programlisting>
-            </section>
-
-        </section>
+      </section>
+    </section>
 
     <section id="bind_ucpe_device">
-      <title>Binding a network interface</title>
+      <title>Binding a Network Interface</title>
 
-      <para>Binds a physical network interface to a DPDK or SR-IOV.
-      </para>
+      <para>How to Bind a physical network interface to a DPDK or SR-IOV is
+      detailed below.</para>
 
       <section id="script_opts_bind">
         <title>Script Options</title>
@@ -875,10 +961,10 @@ format
       <section id="bind_config">
         <title>Configuring the JSON File</title>
 
-        <para>The bind network interface suite JSON configuration file should
-        contain a list of dictionaries, each dictionary indicating the test
-        case name and the test case arguments passed to the
-        bindNetworkInterface Python module.</para>
+        <para>The JSON configuration file needed to bind a physical network
+        interface should contain a list of dictionaries. Each dictionary
+        indicates the test case name and the test case arguments passed to the
+        <filename>bindNetworkInterface</filename> Python module.</para>
 
         <para><emphasis role="bold">Sample unit-test JSON file
         format:</emphasis><programlisting>[
@@ -890,12 +976,14 @@ format
  "name": "Bind wan NIC to DPDK ",
  "args": "-f ../../lab_config/intelc3850-2/wan_nic.json"
  }
-]</programlisting><emphasis role="bold">Sample lan_nic.json configuration
+]</programlisting><emphasis role="bold">Sample
+        <filename>lan_nic.json</filename> configuration
         file:</emphasis><programlisting>{
  "name": "0000:01:00.1",
  "type": "dpdk",
  "subType": "igb_uio"
-}</programlisting><emphasis role="bold">Sample wan_nic.json configuration
+}</programlisting><emphasis role="bold">Sample
+        <filename>wan_nic.json</filename> configuration
         file:</emphasis><programlisting>{
  "name": "0000:03:00.2",
  "type": "dpdk",
@@ -906,8 +994,8 @@ format
       <section id="runpy_bind">
         <title>Running the Python Module</title>
 
-        <para>The <literal>bindNetworkInterface</literal> Python module can be executed
-        individually by running the following command line:</para>
+        <para>The <literal>bindNetworkInterface</literal> Python module can be
+        executed individually by running the following command line:</para>
 
         <programlisting>$ python bindNetworkInterface.py -u admin -p admin -H localhost -f
 ../../lab_config/intelc3850-2/lan_nic.json -n intelc3850-2
@@ -925,7 +1013,8 @@ format
     <section id="unbind_ucpe_device">
       <title>Unbinding a Network Interface</title>
 
-      <para>Unbinds a physical network interface from DPDK or SR-IOV.</para>
+      <para>How to Unbind a physical network interface from a DPDK or SR-IOV
+      is described below.</para>
 
       <section id="script_opts_unbind">
         <title>Script Options</title>
@@ -956,10 +1045,10 @@ Options:
       <section id="json_unbind">
         <title>Configuring the JSON File</title>
 
-        <para>The unbind network interface suite JSON configuration file
-        should contain a list of dictionaries, each dictionary indicating the
+        <para>The JSON configuration file needed to unbind a network interface
+        should contain a list of dictionaries. Each dictionary indicates the
         test case name and the test case arguments passed to the
-        unbindNetworkInterface Python module.</para>
+        <filename>unbindNetworkInterface</filename> Python module.</para>
 
         <para><emphasis role="bold">Sample unit-test JSON file
         format:</emphasis><programlisting>[
@@ -974,16 +1063,16 @@ Unbinds a physical interface to the DPDK or SR-IOV
  }
 ]</programlisting></para>
 
-        <para><emphasis role="bold">Sample lan_nic.json configuration
-        file:</emphasis></para>
+        <para><emphasis role="bold">Sample <filename>lan_nic.json</filename>
+        configuration file:</emphasis></para>
 
         <programlisting>{
  "name": "0000:01:00.1",
  "type": "dpdk"
 }</programlisting>
 
-        <para><emphasis role="bold">Sample wan_nic.json configuration
-        file:</emphasis></para>
+        <para><emphasis role="bold">Sample <filename>wan_nic.json</filename>
+        configuration file:</emphasis></para>
 
         <programlisting>{
  "name": "0000:03:00.2",
@@ -995,8 +1084,9 @@ Unbinds a physical interface to the DPDK or SR-IOV
       <section id="pymod_unbind">
         <title>Running the Python Module</title>
 
-        <para>The unbindNetworkInterface Python module can be executed
-        individually by running the following command line:</para>
+        <para>The <filename>unbindNetworkInterface</filename> Python module
+        can be executed individually by running the following command
+        line:</para>
 
         <programlisting>$ python unbindNetworkInterface.py -u admin -p admin -H localhost -f
 ../../lab_config/intelc3850-2/lan_nic.json -n intelc3850-2
@@ -1013,13 +1103,14 @@ Unbinds a physical interface to the DPDK or SR-IOV
 
     <section id="get_network_interface">
       <title>Getting a Network Interface</title>
-      
-      <para>List the network interfaces for a device.</para>
 
-    <section id="script_opts_interface">
-      <title>Script Options</title>
-      <programlisting>
-$ python getNetworkInterfaces.py -h
+      <para>Details and steps on how to List the network interfaces for a
+      device, are described below.</para>
+
+      <section id="script_opts_interface">
+        <title>Script Options</title>
+
+        <programlisting>$ python getNetworkInterfaces.py -h
 2019-07-04 16:35:50,496 - DEBUG: Started logging
 2019-07-04 16:35:50,496 - INFO: Dump NICs
 Usage: getNetworkInterfaces.py [options]
@@ -1030,19 +1121,20 @@ Options:
   -u USERNAME, --username=USERNAME        Enea uCPE Manager login username
   -p PASSWORD, --password=PASSWORD        Enea uCPE Manager login password
   -H HOST, --host=HOST                    Enea uCPE Manager host name or IP address
-  -n DEVICENAME, --device-name=DEVICENAME Name of the uCPE to get network interfaces from
+  -n DEVICENAME, --device-name=DEVICENAME Name of the uCPE to get network /
+                                          interfaces from
 
   Mandatory options:
-    -H/--host, -n/--device-name
-      </programlisting>
-  </section>
+    -H/--host, -n/--device-name</programlisting>
+      </section>
+
+      <section id="runpy_net_interface">
+        <title>Running the Python Module</title>
+
+        <para>The <literal>getNetworkInterfaces</literal> Python module can be
+        executed individually by running the following command:</para>
 
-    <section id="runpy_net_interface">
-      <title>Running the Python Module</title>
-      <para>The <literal>getNetworkInterfaces</literal> Python module can be executed individually 
-        by running the following command:</para>
-      <programlisting>
-$ python getNetworkInterfaces.py -H localhost -n intelc3850-2
+        <programlisting>$ python getNetworkInterfaces.py -H localhost -n intelc3850-2
 2019-07-04 16:03:47,580 - DEBUG: Started logging
 2019-07-04 16:03:47,580 - INFO: Dump NICs
 2019-07-04 16:03:47,609 - DEBUG: Login successful on host 'localhost'
@@ -1086,15 +1178,14 @@ $ python getNetworkInterfaces.py -H localhost -n intelc3850-2
 2019-07-04 16:03:48,013 - DEBUG:
 2019-07-04 16:03:48,013 - INFO: Done
 2019-07-04 16:03:48,029 - DEBUG: Logging out and exiting...</programlisting>
-
+      </section>
     </section>
 
-</section>
-
     <section id="create_ovs_net_bridge">
       <title>Create an OVS Network Bridge</title>
 
-      <para>Create an OVS Bridge on a device.</para>
+      <para>Instructions on how to Create an OVS Bridge on a device are
+      detailed below.</para>
 
       <section id="script_opts_creovs">
         <title>Script Options</title>
@@ -1124,10 +1215,10 @@ Options:
       <section id="json_creovs">
         <title>Configuring the JSON File</title>
 
-        <para>The new network bridge suite JSON configuration file should
-        contain a list of dictionaries, each dictionary indicating the test
-        case name and the test case arguments passed to the newNetworkBridge
-        Python module.</para>
+        <para>The JSON configuration file needed to create a new network
+        bridge should contain a list of dictionaries. Each dictionary
+        indicates the test case name and the test case arguments passed to the
+        <literal>newNetworkBridge</literal> Python module.</para>
 
         <para><emphasis role="bold">Sample unit-test JSON file
         format:</emphasis></para>
@@ -1143,16 +1234,16 @@ Options:
  }
 ]</programlisting>
 
-        <para><emphasis role="bold">Sample lan_br.json configuration
-        file:</emphasis></para>
+        <para><emphasis role="bold">Sample <filename>lan_br.json</filename>
+        configuration file:</emphasis></para>
 
         <programlisting>{
  "name": "lan_br",
  "interfaces": ["0000:01:00.1"]
 }</programlisting>
 
-        <para><emphasis role="bold">Sample wan_br.json configuration
-        file:</emphasis></para>
+        <para><emphasis role="bold">Sample <filename>wan_br.json</filename>
+        configuration file:</emphasis></para>
 
         <programlisting>{
  "name": "wan_br",
@@ -1163,8 +1254,8 @@ Options:
       <section id="pymod_creovs">
         <title>Running the Python Module</title>
 
-        <para>The newNetworkBridge Python module can be executed individually
-        by running the following command line:</para>
+        <para>The <filename>newNetworkBridge</filename> Python module can be
+        executed individually by running the following command line:</para>
 
         <programlisting>$ python newNetworkBridge.py -u admin -p admin -H localhost -f
 ../../lab_config/intelc3850-2/lan_br.json -n intelc3850-2
@@ -1182,7 +1273,8 @@ Options:
     <section id="delete_ovs_net_bridge">
       <title>Delete an OVS Network Bridge</title>
 
-      <para>Delete an OVS Bridge from a device.</para>
+      <para>How to Delete an OVS Bridge from a device is detailed in the
+      following.</para>
 
       <section id="script_opts_delovs">
         <title>Script Options</title>
@@ -1212,10 +1304,10 @@ Options:
       <section id="json_delovs">
         <title>Configuring the JSON File</title>
 
-        <para>The delete network bridge suite JSON configuration file should
-        contain a list of dictionaries, each dictionary indicating the test
-        case name and the test case arguments passed to the delNetworkBridge
-        Python module.</para>
+        <para>The JSON configuration file needed to delete a network bridge
+        should contain a list of dictionaries. Each dictionary indicates the
+        test case name and the test case arguments passed to the
+        <filename>delNetworkBridge</filename> Python module.</para>
 
         <para><emphasis role="bold">Sample unit-test JSON file
         format:</emphasis></para>
@@ -1231,15 +1323,15 @@ Options:
  }
 ]</programlisting>
 
-        <para><emphasis role="bold">Sample lan_br.json configuration
-        file:</emphasis></para>
+        <para><emphasis role="bold">Sample <filename>lan_br.json</filename>
+        configuration file:</emphasis></para>
 
         <programlisting>{
  "name" : "lan_br"
 }</programlisting>
 
-        <para><emphasis role="bold">Sample wan_br.json configuration
-        file:</emphasis></para>
+        <para><emphasis role="bold">Sample <filename>wan_br.json</filename>
+        configuration file:</emphasis></para>
 
         <programlisting>{
  "name" : "wan_br"
@@ -1249,8 +1341,8 @@ Options:
       <section id="pymod_delovs">
         <title>Running the Python Module</title>
 
-        <para>The delNetworkBridge Python module can be executed individually
-        by running the following command line:</para>
+        <para>The <filename>delNetworkBridge</filename> Python module can be
+        executed individually by running the following command line:</para>
 
         <programlisting>$ python delNetworkBridge.py -u admin -p admin -H localhost -f
 ../../lab_config/intelc3850-2/lan_br.json -n intelc3850-2
@@ -1266,9 +1358,10 @@ Options:
     </section>
 
     <section id="onboard_vnf_bundle">
-      <title>Onboard a VNF Bundle</title>
+      <title>Onboard a VNF Image</title>
 
-      <para>Onboard a VNF to Enea uCPE Manager.</para>
+      <para>The specifics of how to Onboard a VNF image onto the Enea uCPE
+      Manager is detailed below.</para>
 
       <section id="script_opts_onbvnf">
         <title>Script Options</title>
@@ -1302,10 +1395,10 @@ Options:
       <section id="json_onbvnf">
         <title>Configuring the JSON File</title>
 
-        <para>The onboard VNF suite JSON configuration file should contain a
-        list of dictionaries, each dictionary indicating the test case name
-        and the test case arguments passed to the onboardVNF Python
-        module.</para>
+        <para>The JSON configuration file needed to onboard a VNF image should
+        contain a list of dictionaries. Each dictionary indicates the test
+        case name and the test case arguments passed to the
+        <filename>onboardVNF</filename> Python module.</para>
 
         <para><emphasis role="bold">Sample unit-test JSON file
         format:</emphasis><programlisting>[
@@ -1319,8 +1412,8 @@ Options:
       <section id="pymod_onbvnf">
         <title>Running the Python Module</title>
 
-        <para>The onboardVNF Python module can be executed individually by
-        running the following command line:</para>
+        <para>The <filename>onboardVNF</filename> Python module can be
+        executed individually by running the following command line:</para>
 
         <programlisting>$ python onboardVNF.py -u admin -p admin -f ftp -w ftp -H localhost -b
 ../../vnf_images/Fortigate.zip
@@ -1337,10 +1430,10 @@ Options:
     </section>
 
     <section id="onboard_vnf_image">
-      <title>Onboard a VNF Image</title>
+      <title>Onboard a VNF Image Raw</title>
 
-      <para>Onboard a VNF image in Enea uCPE Manager based upon its raw
-      constituents.</para>
+      <para>How to Onboard a VNF image in the uCPE Manager based upon its raw
+      constituents, is detailed in depth below.</para>
 
       <section id="script_opts_image">
         <title>Script Options</title>
@@ -1365,21 +1458,21 @@ Options:
  -P FTPPORT, --ftpPort=FTPPORT
  FTP port
  -i IMAGEPATH, --imagePath=IMAGEPATH
- VNF image path
- -b IMAGEINFO, --imageInfo=IMAGEINFO
- File name of VNF image information in JSON format
+ VNF bundle image path
+ -b BUNDLEINFO, --bundleInfo=BUNDLEINFO
+ File name of VNF bundle information in JSON format
 
  Mandatory options:
- -H/--host, -b/--imageInfo, -i/--imagePath</programlisting>
+ -H/--host, -b/--bundleInfo, -i/--imagePath</programlisting>
       </section>
 
       <section id="json_image">
         <title>Configuring the JSON File</title>
 
-        <para>The onboard VNF image suite JSON configuration file should
-        contain a list of dictionaries, each dictionary indicating the test
-        case name and the test case arguments passed to the onboardVNFRaw
-        Python module.</para>
+        <para>The JSON configuration file needed to onboard a VNF image Raw
+        should contain a list of dictionaries. Each dictionary indicates the
+        test case name and the test case arguments passed to the
+        <filename>onboardVNFRaw</filename> Python module.</para>
 
         <para><emphasis role="bold">Sample unit-test JSON file
         format:</emphasis></para>
@@ -1392,7 +1485,8 @@ Options:
  }
 ]</programlisting>
 
-        <para><emphasis role="bold">Sample fortigateImage.json configuration
+        <para><emphasis role="bold">Sample
+        <filename>fortigateImage.json</filename> configuration
         file:</emphasis><programlisting>{
  "name" : "fortigateImage",
  "version" : "1.0",
@@ -1434,8 +1528,8 @@ Options:
       <section id="pymod_image">
         <title>Running the Python Module</title>
 
-        <para>The onboardVNFRaw Python module can be executed individually by
-        running the following command line:</para>
+        <para>The <filename>onboardVNFRaw</filename> Python module can be
+        executed individually by running the following command line:</para>
 
         <programlisting>$ python onboardVNFRaw.py -u admin -p admin -f ftp -w ftp -H localhost -b b
 ../../vnf_config/fortigateImage/fortigateImage.json -i
@@ -1455,7 +1549,8 @@ Options:
     <section id="offboard_vnf">
       <title>Offboard a VNF</title>
 
-      <para>Offboard a VNF from Enea uCPE Manager.</para>
+      <para>Steps on how to Offboard a VNF from the uCPE Manager are detailed
+      below.</para>
 
       <section id="script_opts_offimage">
         <title>Script Options</title>
@@ -1483,10 +1578,10 @@ Options:
       <section id="json_offimage">
         <title>Configuring the JSON File</title>
 
-        <para>The offboard VNF suite JSON configuration file should contain a
-        list of dictionaries, each dictionary indicating the test case name
-        and the test case arguments passed to the offboardVNF Python
-        module.</para>
+        <para>The JSON configuration file needed to offboard a VNF should
+        contain a list of dictionaries. Each dictionary indicates the test
+        case name and the test case arguments passed to the
+        <filename>offboardVNF</filename> Python module.</para>
 
         <para><emphasis role="bold">Sample unit-test JSON file
         format:</emphasis></para>
@@ -1502,8 +1597,8 @@ Options:
       <section id="pymod_offimage">
         <title>Running the Python Module</title>
 
-        <para>The offboardVNF Python module can be executed individually by
-        running the following command line:</para>
+        <para>The <filename>offboardVNF</filename> Python module can be
+        executed individually by running the following command line:</para>
 
         <programlisting>$ python offboardVNF.py -u admin -p admin -H localhost -n fortigateImage
 2019-03-07 17:33:56,523 - DEBUG: Started logging
@@ -1520,7 +1615,7 @@ Options:
     <section id="instantiate_vnf">
       <title>Instantiate a VNF</title>
 
-      <para>Instantiate a VNF via Enea uCPE Manager.</para>
+      <para>Instantiating a VNF via the uCPE Manager is detailed below.</para>
 
       <section id="script_opts_inst">
         <title>Script Options</title>
@@ -1552,10 +1647,10 @@ Options:
       <section id="json_inst">
         <title>Configuring the JSON File</title>
 
-        <para>The instantiate VNF suite JSON configuration file should contain
-        a list of dictionaries, each dictionary indicating the test case name
-        and the test case arguments passed to the instantiateVNFI Python
-        module.</para>
+        <para>The JSON configuration file needed to instantiate a VNF should
+        contain a list of dictionaries. Each dictionary indicates the test
+        case name and the test case arguments passed to the
+        <filename>instantiateVNFI</filename> Python module.</para>
 
         <para><emphasis role="bold">Sample unit-test JSON file
         format:</emphasis></para>
@@ -1575,8 +1670,8 @@ Options:
       <section id="pymod_inst">
         <title>Running the Python Module</title>
 
-        <para>The instantiateVNFI Python module can be executed individually
-        by running the following command line:</para>
+        <para>The <filename>instantiateVNFI</filename> Python module can be
+        executed individually by running the following command line:</para>
 
         <programlisting>$ python instantiateVNFI.py -u admin -p admin -H localhost -n intelc3850-2 -t
 fortigateImage -f ../../vnf_config/fortigateImage/fortigateFWInstance.json
@@ -1599,7 +1694,8 @@ License("vnf_config/fortigateImage/fortigateLicense.lic")
     <section id="control_vnf_inst">
       <title>Control a VNF Instance</title>
 
-      <para>Controls a VNF instance from Enea uCPE Manager.</para>
+      <para>How to Control a VNF instance from the Enea uCPE Manager is
+      detailed below.</para>
 
       <section id="script_opts_control">
         <title>Script Options</title>
@@ -1631,10 +1727,10 @@ Options:
       <section id="json_control">
         <title>Configuring the JSON File</title>
 
-        <para>The control VNF instance suite JSON configuration file should
-        contain a list of dictionaries, each dictionary indicating the test
-        case name and the test case arguments passed to the controlVNFI Python
-        module.</para>
+        <para>The JSON configuration file needed to control a VNF instance
+        should contain a list of dictionaries. Each dictionary indicates the
+        test case name and the test case arguments passed to the
+        <filename>controlVNFI</filename> Python module.</para>
 
         <para><emphasis role="bold">Sample unit-test JSON file
         format:</emphasis></para>
@@ -1662,8 +1758,8 @@ Options:
       <section id="pymod_control">
         <title>Running the Python Module</title>
 
-        <para>The controlVNFI Python module can be executed individually by
-        running the following command line:</para>
+        <para>The <filename>controlVNFI</filename> Python module can be
+        executed individually by running the following command line:</para>
 
         <programlisting>$ python controlVNFI.py -u admin -p admin -H localhost -n intelc3850-2 -i
 fortigateFWInstance -c stop
@@ -1682,7 +1778,8 @@ fortigateFWInstance -c stop
     <section id="destroy_vnf_inst">
       <title>Destroy a VNF Instance</title>
 
-      <para>Destroys a VNF instance from Enea uCPE Manager.</para>
+      <para>Steps and options on how to Destroy a VNF instance from the Enea
+      uCPE Manager are described below.</para>
 
       <section id="script_opts_destroy">
         <title>Script Options</title>
@@ -1712,10 +1809,10 @@ Options:
       <section id="json_destroy">
         <title>Configuring the JSON File</title>
 
-        <para>The destroy VNF instance suite JSON configuration file should
-        contain a list of dictionaries, each dictionary indicating the test
-        case name and the test case arguments passed to the destroyVNFI Python
-        module.</para>
+        <para>The JSON configuration file needed to destroy a VNF instance
+        should contain a list of dictionaries. Each dictionary indicates the
+        test case name and the test case arguments passed to the
+        <filename>destroyVNFI</filename> Python module.</para>
 
         <para><emphasis role="bold">Sample unit-test JSON file
         format:</emphasis><programlisting>[
@@ -1729,8 +1826,8 @@ Options:
       <section id="pymod_destory">
         <title>Running the Python Module</title>
 
-        <para>The destroyVNFI Python module can be executed individually by
-        running the following command line:</para>
+        <para>The <filename>destroyVNFI</filename> Python module can be
+        executed individually by running the following command line:</para>
 
         <programlisting>$ python destroyVNFI.py -u admin -p admin -H localhost -n intelc3850-2 -i
 fortigateFWInstance
@@ -1750,72 +1847,87 @@ fortigateFWInstance
   <section id="test_harness">
     <title>Test Harness</title>
 
-    <para>All Test Harness sources are under &lt;AF-TH-install-dir&gt;
-    directory, except under the automation_framework sub-directory. See
-    chapter 4 for a complete tree listing.</para>
+    <para>All Test Harness sources are under the
+    <literal>&lt;AF-TH-install-dir&gt;</literal> directory and the host file
+    is the Ansible inventory file. See the complete tree listing at the
+    beginning of this chapter for details.</para>
 
     <para>The Ansible based Test Harness represents an example of how to
     structure all the files needed for creating automated test cases using the
-    AF and provides a way to implement them. The ansible.cfg file contains an
-    example of the Ansible default configuration. It offers the possibility to
-    display the Ansible console output in different ways, by setting the
-    stdout_callback to selective or debug. Default is set to selective to
-    print only certain tasks. It is recommended to switch on debug when a test
-    fails. By setting any_errors_fatal to True, task failures will be
-    considered fatal errors (the play execution will stop). The hosts file is
-    the Ansible inventory file.</para>
-
-    <para>All the Playbooks that are executing AF python modules are run on
-    localhost. New entries have to be created for direct communication over
-    SSH with the boards, like [fortigateFW] example. The setup_env.sh script
-    sets up the "testHarness" test environment by creating testHarness-venv
-    python virtualenv, installing requests needed by Automation Framework
-    python modules and installing Ansible. The playbooks directory contains
-    all the implemented Ansible Playbooks. For details please refer to chapter
-    "Sample Test Cases" from the Enea NFV Access System Test Specification
-    document.</para>
-
-    <para>The uCPEM_config directory stores JSON configuration files needed
-    for the setup of the uCPE Manager used by TH. One configuration file is
-    needed per uCPE Manager installation to be used in the TH. The vnf_image
-    directory stores the VNF Images needed by the Ansible Playbooks (i.e. the
-    sample test cases).</para>
-
-    <para>The lab_config directory stores the JSON configuration files related
-    to a device (devices, NICs and bridges). Each subfolder should be named
-    exactly like the device name and should contain all the related
-    configuration files needed for the test cases to be run on it.</para>
-
-    <para>The vnf_config directory stores the configuration files related to a
-    VNF Descriptor. Typically these include a VNF Image JSON, VNF Instance
-    JSON, VNF license and any other files required by the type of the VNF.
-    Each subfolder should be named exactly like the name of the VNF Descriptor
-    and should contain all the related configuration files needed for test
-    cases to be run using this VNF.</para>
-
-    <para>The log directory is created when the setup_env.sh is run. When test
-    cases are ran, the Ansible and the Python logs are stored in ansible.log
-    and debug.log files, respectively.</para>
+    AF and provides a way to implement them. The
+    <filename>ansible.cfg</filename> file contains an example of the Ansible
+    default configuration. It offers the possibility to display the Ansible
+    console output in different ways, by setting the
+    <literal>stdout_callback</literal> option to <literal>selective</literal>
+    or <literal>debug</literal>. The default value for this option 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 will be considered fatal errors
+    (the play execution will stop). <remark>and why would this stop of play
+    execution help in this debugging scenario</remark></para>
+
+    <para>All Playbooks that execute AF python modules run on
+    <literal>localhost</literal>. New entries have to be created for direct
+    communication over SSH with the boards, as done in the
+    <literal>[fortigateFW]</literal> example.</para>
+
+    <para>The <filename>setup_env.sh</filename> script sets up the
+    <literal>testHarness</literal> test environment by creating
+    <literal>testHarness-venv python virtualenv</literal>, executing requests
+    needed by Automation Framework python modules and installing Ansible. The
+    playbooks directory contains all the implemented Ansible Playbooks. For
+    more details please refer to chapter "Sample Test Cases" from the Enea NFV
+    Access System Test Specification document <remark>need an olink to that
+    chapter here.</remark>.</para>
+
+    <para>The <literal>uCPEM_config</literal> directory stores JSON
+    configuration files needed for the setup of the uCPE Manager used by TH.
+    One configuration file is needed per uCPE Manager installation, to be used
+    in the TH. The <literal>vnf_image</literal> directory stores the VNF
+    Images needed by the Ansible Playbooks (i.e. the sample test
+    cases).</para>
+
+    <para>The <literal>lab_config</literal> directory stores the JSON
+    configuration files related to a device (devices<remark>clarify this
+    please, what devices do you mean?</remark>, NICs and bridges). Each
+    subfolder should be named exactly like the device name and should contain
+    all the related configuration files needed for the test cases to be run on
+    it.</para>
+
+    <para>The <literal>vnf_config</literal> directory stores the configuration
+    files related to a VNF Descriptor. Typically these include a VNF Image
+    JSON, VNF Instance JSON, VNF license and any other files required by the
+    type of the VNF. Each subfolder should be named exactly like the name of
+    the VNF Descriptor and should contain all the related configuration files
+    needed for test cases to be run using this VNF.</para>
+
+    <para>The log directory is created when the
+    <literal>setup_env.sh</literal> is run. When test cases are run, the
+    Ansible and the Python logs are stored in the
+    <filename>ansible.log</filename> and <filename>debug.log</filename> files,
+    respectively.</para>
 
     <section id="test_suites">
       <title>Extending functionality - Test Suites</title>
 
-      <para>To extend the functionality of the Test Harness it is typically
-      needed that the functionlity of the Automation Framework be also
+      <para>Extending the functionality of the Test Harness, typically
+      requires the functionality of the Automation Framework to also be
       extended to cover additional uCPE Manager REST Northbound APIs. The
       extension of the Automation Framework will result in new Python modules
       that have to be created.</para>
 
       <para>Additional Python modules, that are not related to the
       functionality of the Automation Framework, could be easily integrated
-      into Test Harness to aid in the creation of more complex test cases.
-      Using the TH one can implement test cases that are run directly on the
+      into the Test Harness to aid in the creation of more complex test cases.
+      Using the TH, test cases can be implemented that run directly on the
       boards with Enea NFV Access, over SSH.</para>
 
       <para>For a better understanding of the Test Harness functionality and
       how to extend the test suites, please refer to the chapter "Sample Test
-      Cases" from the Enea NFV Access System Test Specification document and
-      the TH code source.</para>
+      Cases" from the Enea NFV Access System Test Specification document
+      <remark>olink to the chapter needed here.</remark>and the TH code
+      source.</para>
     </section>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/components.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/components.xml
index 2fecf5b..28abdd3 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/components.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/components.xml
@@ -20,8 +20,8 @@
   <section id="enfva_runtime_plt">
     <title>Enea NFV Access</title>
 
-    <para>The Enea NFV Access is comprised of the Enea NFV Access Run time
-    Platform and the Enea uCPE Manager.</para>
+    <para>Enea NFV Access is comprised of the Enea uCPE Manager and the Enea
+    NFV Access Run Time Platform.</para>
 
     <section id="eucpe_manager">
       <title>Enea uCPE Manager</title>
@@ -32,25 +32,29 @@
       used in testing.</para>
 
       <para>For more on Enea uCPE Manager installation instructions, please
-      refer to chapter "Getting Started with Enea uCPE Manager" from the Enea
-      NFV Access Getting Started manual.</para>
+      refer to the section on how to <olink
+      targetdoc="book_enea_nfv_access_getting_started"
+      targetptr="install_ucpe_manager">Install the Enea uCPE Manager in
+      <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>.</para>
     </section>
 
     <section id="ena_plat">
-      <title>Enea NFV Access Run time Platform</title>
+      <title>Enea NFV Access Run Time Platform</title>
 
-      <para>One or more uCPE devices running the NFV Access Run Time Platform
-      are required as hosts running the VNF(s). The uCPE device is known to
-      the uCPE Manager as the "VcpeAgent" device module.</para>
+      <para>One or more uCPE devices running the Enea NFV Access Run Time
+      Platform are required as hosts to run the VNF(s). The uCPE device is
+      known to the uCPE Manager as the "VcpeAgent" device module.</para>
 
-      <para>Adding a VcpeAgent device can be done via one of two
-      methods:</para>
+      <para>Adding a VcpeAgent device can be done via two methods:</para>
 
       <itemizedlist>
         <listitem>
           <para>Through the uCPE Manager GUI. Add the device using the
-          appropriate parameters by launching the UI under Devices -&gt;
-          Manage in the main screen.</para>
+          appropriate parameters by launching the UI under
+          <literal>Devices</literal> -&gt; <literal>Manage</literal> in the
+          main screen.</para>
         </listitem>
 
         <listitem>
@@ -60,8 +64,11 @@
       </itemizedlist>
 
       <para>For more on Enea NFV Access installation instructions, please
-      refer to chapter "Getting Started with Enea NFV Access" from the Enea
-      NFV Access Getting Started manual.</para>
+      refer to chapter <olink targetdoc="book_enea_nfv_access_getting_started"
+      targetptr="access_installer">Getting Started with Enea NFV Access in
+      <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>.</para>
     </section>
   </section>
 
@@ -74,9 +81,9 @@
     unit-test suite that is able to automatically run test-cases defined for
     each available Python script.</para>
 
-    <para>In either case, it is desirable to use a third system (instead of
+    <para>In either case, it is desirable to use a different host (instead of
     running the tests on the same system as the uCPE Manager) in order to
-    ensure that uCPE Manager is setup and installed correctly in terms of
+    ensure that the uCPE Manager is setup and installed correctly in terms of
     allowing external users to access it and use it effectively.</para>
   </section>
 
@@ -94,25 +101,31 @@
     <itemizedlist>
       <listitem>
         <para>VNF, Device and Network Smoke Test Cases. A sample test suite
-        that acts as basic smoke tests for the Enea NFV Access and also as a
+        that acts as basic smoke tests for Enea NFV Access and also as a
         sanity-check test suite for the AF and TH.</para>
       </listitem>
 
       <listitem>
         <para>VNF Deployment and Lifecycle. A sample test suite that verifies
-        the instantiation, lifecycle control and destruction of a VNF for the
-        Enea NFV Access.</para>
+        the instantiation, lifecycle control and destruction of a VNF for Enea
+        NFV Access.</para>
       </listitem>
 
       <listitem>
-        <para>Service Creation and Lifecycle: A sample test suite that
+        <para>Service Creation and Lifecycle. A sample test suite that
         contains complex test cases showcasing service creation and lifecycle
         management.</para>
       </listitem>
     </itemizedlist>
 
-    <para>For details about the test suites or test cases please refer to the
-    chapter "Sample Test Cases" from the Enea NFV Access System Test
-    Specification document.</para>
+    <para>For details about the test suites or test cases please refer to
+    chapter <olink targetdoc="book_enea_nfv_access_system_test_specification"
+    targetptr="sample_testcases">Sample Test Cases in <xi:include
+    href="../../s_docbuild/olinkdb/pardoc-names.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>.</para>
+
+    <remark>this olink needs to be fixed it points to getting started not the
+    test spec manual, an olinkdb update is needed to know why.</remark>
   </section>
 </chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml
index 34c9308..e4aaa6b 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml
@@ -11,19 +11,19 @@
 
     <itemizedlist>
       <listitem>
-        <para>Python 2.7</para>
+        <para>Python 2.7.</para>
       </listitem>
 
       <listitem>
-        <para>EPEL Repository installed:<programlisting>sudo yum install epel-release</programlisting></para>
+        <para>EPEL Repository:<programlisting>sudo yum install epel-release</programlisting></para>
       </listitem>
 
       <listitem>
-        <para>PIP package manager installed: <programlisting>sudo yum -y install python-pip</programlisting></para>
+        <para>PIP package manager: <programlisting>sudo yum -y install python-pip</programlisting></para>
       </listitem>
 
       <listitem>
-        <para>Virtualenv tool installed: <programlisting>sudo pip install virtualenv</programlisting></para>
+        <para><literal>Virtualenv</literal> tool: <programlisting>sudo pip install virtualenv</programlisting></para>
       </listitem>
     </itemizedlist>
 
@@ -31,7 +31,8 @@
       <para>The Automation Framework and Test Harness installation may be done
       on the same machine used for uCPE Manager installation, although this is
       not encouraged. For more details see <link linkend="automation">chapter
-      3.2</link>.</para>
+      3.2</link>.<remark>what chapter of what book is this link refering
+      to?</remark></para>
     </note>
   </section>
 
@@ -47,11 +48,13 @@
                        fileref="images/environment_basicsetup.png" scale="35" />
           </imageobject>
         </mediaobject>
-      </figure>The following enviroment setup is needed for running all the
-    tests defined in the Enea NFV Access System Test Specification
-    document:</para>
+      </figure>The following enviroment setup is needed for running all tests
+    defined in the Enea NFV Access System Test Specification manual:</para>
 
-    <para><emphasis role="bold">Lab Network</emphasis><itemizedlist>
+    <remark>olink to the book needed here.</remark>
+
+    <para><emphasis role="bold">Lab Network
+    Requirements</emphasis><itemizedlist spacing="compact">
         <listitem>
           <para>DHCP enabled.</para>
         </listitem>
@@ -61,32 +64,36 @@
         </listitem>
       </itemizedlist></para>
 
-    <para><emphasis role="bold">uCPE Manager host</emphasis></para>
+    <para><emphasis role="bold">uCPE Manager Host
+    Requirements</emphasis></para>
 
-    <itemizedlist>
+    <itemizedlist spacing="compact">
       <listitem>
         <para>Running CentOS 7.</para>
       </listitem>
 
       <listitem>
-        <para>Connected to Lab Network.</para>
+        <para>Connected to the Lab Network.</para>
       </listitem>
 
       <listitem>
         <para>uCPE Manager installed.</para>
 
         <note>
-          <para>For details on how to install the uCPE Manager, see "Getting
-          Started with Enea uCPE Manager" from the Enea NFV Access Getting
-          Started manual.</para>
+          <para>For details on how to install the uCPE Manager, see <olink
+          targetdoc="book_enea_nfv_access_getting_started"
+          targetptr="install_ucpe_manager">Install the Enea uCPE Manager in
+          <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
+          xmlns:xi="http://www.w3.org/2001/XInclude"
+          xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>.</para>
         </note>
       </listitem>
     </itemizedlist>
 
-    <para><emphasis role="bold">1<superscript>st</superscript> uCPE
-    device</emphasis><itemizedlist>
+    <para><emphasis role="bold">uCPE device
+    Requirements</emphasis><itemizedlist spacing="compact">
         <listitem>
-          <para>Minimum 4 Physical Network Devices.</para>
+          <para>Minimum of 4 Physical Network Devices.</para>
         </listitem>
 
         <listitem>
@@ -94,23 +101,24 @@
         </listitem>
 
         <listitem>
-          <para>2 Physical connections to Lab Network.</para>
+          <para>2 Physical connections to the Lab Network.</para>
         </listitem>
 
         <listitem>
-          <para>Enea NFV Access Run Time Platform installed.</para>
+          <para>Enea NFV Access Run-Time Platform installed.</para>
 
           <note>
             <para>For information on how to install Enea NFV Access refer to
             <olink targetdoc="book_enea_nfv_access_getting_started"
-    targetptr="plat-release-content">Getting Started with Enea NFV Access
-    in <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>.</para>
+            targetptr="plat-release-content">Getting Started with Enea NFV
+            Access in <xi:include
+            href="../../s_docbuild/olinkdb/pardoc-names.xml"
+            xmlns:xi="http://www.w3.org/2001/XInclude"
+            xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>.</para>
           </note>
         </listitem>
       </itemizedlist><figure>
-        <title>Lab setup overview for ChainedVNFsService Setup</title>
+        <title>Lab Setup Overview for ChainedVNFsService</title>
 
         <mediaobject>
           <imageobject>
@@ -121,24 +129,10 @@
         </mediaobject>
       </figure></para>
 
-    <para><emphasis role="bold">Changes to 1<superscript>st</superscript> uCPE
-    device</emphasis></para>
-
-    <itemizedlist>
-      <listitem>
-        <para>16GB RAM and 8 cores (Intel C3000 or Xeon D).</para>
-      </listitem>
-
-      <listitem>
-        <para>1 Physical connection back to back with the
-        2<superscript>nd</superscript> uCPE device.</para>
-      </listitem>
-    </itemizedlist>
-
-    <para><emphasis role="bold">2<superscript>nd</superscript> uCPE
-    device</emphasis><itemizedlist>
+    <para><emphasis role="bold">uCPE device 1 and 2
+    Requirements</emphasis><itemizedlist spacing="compact">
         <listitem>
-          <para>Minimum 4 Physical Network Devices.</para>
+          <para>Minimum of 4 Physical Network Devices.</para>
         </listitem>
 
         <listitem>
@@ -146,25 +140,16 @@
         </listitem>
 
         <listitem>
-          <para>2 Physical connections to Lab Network.</para>
+          <para>2 Physical connections to the Lab Network.</para>
         </listitem>
 
         <listitem>
-          <para>1 Physical connection back to back with the
-          1<superscript>st</superscript> uCPE device.</para>
+          <para>1 Physical connection back to back between both uCPE
+          devices.</para>
         </listitem>
 
         <listitem>
-          <para>Enea NFV Access installed.</para>
-
-          <note>
-            <para>For information on how to install Enea NFV Access, refer to
-            <olink targetdoc="book_enea_nfv_access_getting_started"
-            targetptr="plat-release-content">Getting Started with Enea NFV
-            Access<xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
-            xmlns:xi="http://www.w3.org/2001/XInclude"
-            xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>.</para>
-          </note>
+          <para>Enea NFV Access Run-Time Platform installed.</para>
         </listitem>
       </itemizedlist></para>
   </section>
@@ -172,23 +157,29 @@
   <section id="initial_setup">
     <title>Installation and Initial Setup</title>
 
-    <para>Unzip the <filename>nfvaccess22_af-th.zip</filename> archive file,
-    provided by Enea, on a supported host machine. The directory in which the
-    archive has been unpacked will be denoted as
-    <literal>&lt;AF-TH-installdir&gt;</literal>.</para>
+    <orderedlist>
+      <listitem>
+        <para>Unzip the <filename>nfvaccess22_af-th.zip</filename> archive
+        file, provided by Enea, on a supported host machine.</para>
 
-    <para>Enter the <literal>&lt;AF-TH-install-dir&gt;</literal> directory and
-    run the <filename>setup_env.sh</filename> script to do the initial setup
-    of the Test Harness environment: <filename>source
-    setup_env.sh</filename>.</para>
+        <para>The directory in which the archive has been unpacked will be
+        denoted as <literal>&lt;AF-TH-installdir&gt;</literal>.</para>
+      </listitem>
 
-    <para>Setup the uCPE Manager which will be used by the TH:</para>
+      <listitem>
+        <para>Enter the <literal>&lt;AF-TH-install-dir&gt;</literal> directory
+        and run the <filename>setup_env.sh</filename> script to do the initial
+        setup of the Test Harness environment: <programlisting>source setup_env.sh</programlisting></para>
+      </listitem>
 
-    <orderedlist>
       <listitem>
-        <para>Create the uCPE Manager JSON config file in the
-        <literal>&lt;AF-TH-install-dir&gt;/uCPEM_config/</literal>
-        directory:<programlisting>{
+        <para>Set up the uCPE Manager which will be used by the TH:</para>
+
+        <orderedlist spacing="compact">
+          <listitem>
+            <para>Create the uCPE Manager JSON config file in the
+            <literal>&lt;AF-TH-install-dir&gt;/uCPEM_config/</literal>
+            directory:<programlisting>{
 "ucpe_usr":"uCPE Manager Username",
 "ucpe_pass":"uCPE Manager Password",
 "ucpe_host":"uCPE Manager IP/Hostname",
@@ -196,28 +187,36 @@
 "ftp_pass":"FTP Password",
 "ftp_port":"FTP Port"
 }</programlisting>See the
-        <filename>&lt;AF-TH-install-dir&gt;/uCPEM_config/ucpem01.json</filename>
-        file as an example.</para>
-      </listitem>
-
-      <listitem>
-        <para>Run the <filename>setupuCPEManager.yml</filename> Ansible
-        Playbook with the JSON config path as parameter: <programlisting>ansible-playbook playbooks/setupuCPEManager.yml -e\
+            <filename>&lt;AF-TH-install-dir&gt;/uCPEM_config/ucpem01.json</filename>
+            file as an example.</para>
+          </listitem>
+
+          <listitem>
+            <para>Run the <filename>setupuCPEManager.yml</filename> Ansible
+            Playbook with the JSON config path as a parameter:
+            <programlisting>ansible-playbook playbooks/setupuCPEManager.yml -e\
 "@uCPEM_config/&lt;config_name&gt;.json"</programlisting></para>
 
-        <para><emphasis role="bold">Example</emphasis> <programlisting>ansible-playbook playbooks/setupuCPEManager.yml -e\
+            <para><emphasis role="bold">Example</emphasis> <programlisting>ansible-playbook playbooks/setupuCPEManager.yml -e\
 "@uCPEM_config/ucpem01.json"</programlisting></para>
+          </listitem>
+        </orderedlist>
       </listitem>
     </orderedlist>
 
-    <para>Note that the steps presented in this sub-chapter are to be executed
-    only once, for the initial setup of the TH environment. Afterwards, each
-    session ends by closing the Python virtual environment (<literal>source
-    &lt;AF-THinstall-dir&gt;/testHarness/bin/deactivate</literal>) and
-    subsequent use of the installation requires activating the Python virtual
-    enviroment before using the Automation Framework and Test Harness
-    (<literal>source
-    &lt;AF-THinstall-dir&gt;/testHarness/bin/activate</literal>).</para>
+    <note>
+      <para>The steps presented in this section are to be executed only once,
+      for the initial setup of the TH environment.</para>
+    </note>
+
+    <para>After the initial setup, each session ends by closing the Python
+    virtual environment: <literal>source
+    &lt;AF-THinstall-dir&gt;/testHarness/bin/deactivate</literal>.</para>
+
+    <para>Subsequent use of the installation requires activating the Python
+    virtual enviroment before using the Automation Framework and Test Harness:
+    <literal>source
+    &lt;AF-THinstall-dir&gt;/testHarness/bin/activate</literal>.</para>
 
     <para>Furthermore, if a user wants to use a new uCPE Manager instance for
     a new session, the user also has to re-run the
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml
index ab10fe9..69d5f0e 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml
@@ -3,20 +3,20 @@
   <title>Overview</title>
 
   <para>This document describes the Automation Framework and Test Harness for
-  the Enea NFV Access, along with providing instructions regarding
-  the necessary steps to run these software tools.</para>
+  Enea NFV Access, along with instructions regarding the necessary steps to
+  run these software tools.</para>
 
   <section id="descrip">
     <title>Description</title>
 
     <para>The Automation Framework provides a way for driving configuration
     with Python scripting. It complements the Enea uCPE Manager GUI and uses
-    the northbound REST APIs, given for full availability of the Enea uCPE
+    the northbound REST APIs, given to provide full usability of the Enea uCPE
     Manager features.</para>
 
     <para>The Test Harness is based on running Ansible Playbooks to complete
     different test cases, which make use of the Automation Framework Python
-    modules and/or direct commands on the uCPE devices running Enea NFV
+    modules and/or direct commands on the uCPE devices running the Enea NFV
     Access Run Time Platform.</para>
   </section>
 
@@ -41,8 +41,8 @@
           <row>
             <entry>Enea NFV Access</entry>
 
-            <entry>Enea NFV Access (with ODM) Runtime Platform and Enea uCPE
-            Manager.</entry>
+            <entry>The Enea NFV Access (with ODM) Runtime Platform and the
+            Enea uCPE Manager.</entry>
           </row>
         </tbody>
       </tgroup>
@@ -174,16 +174,16 @@
           <row>
             <entry>VCPE</entry>
 
-            <entry>Virtual Customer Premises Equipment</entry>
+            <entry>Virtual Customer Premises Equipment.</entry>
           </row>
 
           <row>
             <entry>VNF</entry>
 
-            <entry>Virtualized Network Function</entry>
+            <entry>Virtualized Network Function.</entry>
           </row>
         </tbody>
       </tgroup>
     </table>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/troubleshooting_guide.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/troubleshooting_guide.xml
index 2f0509b..f51fe11 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/troubleshooting_guide.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/troubleshooting_guide.xml
@@ -3,35 +3,41 @@
   <title>Troubleshooting Guide</title>
 
   <para>The following are best practices and possible solutions to problems
-  that may occur during operation.</para>
+  that may occur during operation:</para>
 
   <itemizedlist>
     <listitem>
       <para>All the Playbooks have to be run from the root directory of the
-      Test Harness to avoid failures such as "File not found!", because the
-      paths to the needed configuration files are hardcoded into the
+      Test Harness (TH) to avoid failures such as "File not found!", since the
+      paths to the required configuration files are hardcoded into the
       Playbooks.</para>
     </listitem>
 
     <listitem>
-      <para>If the setup_env.sh fails, for debugging, remove &amp;&gt;
-      /dev/null from the failed command. Then the output of the command will
-      be printed, and will not be redirected to /dev/null anymore.</para>
+      <para>If the <literal>setup_env.sh</literal> fails, for debugging remove
+      <literal>&amp;&gt; /dev/null</literal> from the failed command. The
+      output of the command will be printed, and will not be redirected to
+      <literal>/dev/null</literal> anymore.</para>
     </listitem>
 
     <listitem>
-      <para>When setup the uCPE Manager to be used by the TH using
-      setupuCPEManager.yml Playbook, if the uCPE username/password/host are
-      wrong or are missing, all the Sample test cases will fail. If the FTP
-      username/password/port are wrong or are missing, the tests that requires
-      file transfer to uCPE Manager will fail.</para>
+      <para>When setting up the uCPE Manager to be used by the TH through the
+      <literal>setupuCPEManager.yml</literal> Playbook, if the uCPE
+      username/password/host are incorrect or are missing, all the Sample test
+      cases will fail. If the FTP username/password/port are wrong or are
+      missing, the tests that require file transfer to the uCPE Manager will
+      fail.</para>
     </listitem>
 
     <listitem>
-      <para>Ansible logs are not written into the log/ansible.log file when
-      the stdout_callback is set to selective in the ansible.cfg. For
-      debugging, check the python logs from log/debug.log file or change the
-      stdout_callback to debug and rerun the test.</para>
+      <para>Ansible logs are not written into the
+      <literal>log/ansible.log</literal> file when the
+      <literal>stdout_callback</literal> is set to
+      <literal>selective</literal> in the <literal>ansible.cfg</literal> file.
+      For debugging, check the python logs from the
+      <literal>log/debug.log</literal> file or change the
+      <literal>stdout_callback</literal> to <literal>debug</literal> and rerun
+      the test.</para>
     </listitem>
   </itemizedlist>
 </chapter>
\ No newline at end of file