3 files changed, 195 insertions, 113 deletions

diff --git a/doc/book-enea-nfv-access-system-test-specification/doc/configuration.xml b/doc/book-enea-nfv-access-system-test-specification/doc/configuration.xml
index d1415c2..1be36cb 100644
--- a/doc/book-enea-nfv-access-system-test-specification/doc/configuration.xml
+++ b/doc/book-enea-nfv-access-system-test-specification/doc/configuration.xml
@@ -5,28 +5,29 @@
   <section id="test_objects">
     <title>Test Objects</title>
 
-    <para>The test objects for the Test Harness are considered to be the Enea
-    NFV Access and Enea uCPE Manager installations performed as indicated in
-    chapter 3 of the Enea NFV Access Automation Framework and Test Harness
-    User Guide.</para>
+    <para>The test objects for the Test Harness are the Enea NFV Access and
+    Enea uCPE Manager installations performed as indicated in chapter 3 of the
+    Enea NFV Access Automation Framework and Test Harness User
+    Guide.<remark>olink needed.</remark></para>
   </section>
 
   <section id="test_env">
     <title>Test Environment</title>
 
-    <para>To setup the required Test Harness environment please refer to the
+    <para>To set up the required Test Harness environment please refer to the
     "Environment" chapter from the Enea NFV Access Automation Framework and
-    Test Harness User Guide.</para>
+    Test Harness User Guide.<remark>olink needed.</remark></para>
   </section>
 
   <section id="precon_exe_steps">
-    <title>Preconditions and Execution Steps</title>
+    <title>Preconditions and Execution</title>
 
     <para>Please refer to the "Prerequisites" and "Installation and Initial
     Setup" chapters from Enea NFV Access Automation Framework and Test Harness
-    User Guide.</para>
+    User Guide <remark>olinks needed.</remark> for more details.</para>
 
     <para>For detailed execution steps of the sample test cases included with
-    the Test Harness please see chapter 3 in this document.</para>
+    the Test Harness please see chapter 3 in this document. <remark>xref to
+    the next chapter needed.</remark></para>
   </section>
 </chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-system-test-specification/doc/overview.xml b/doc/book-enea-nfv-access-system-test-specification/doc/overview.xml
index f89f8bd..d23a073 100644
--- a/doc/book-enea-nfv-access-system-test-specification/doc/overview.xml
+++ b/doc/book-enea-nfv-access-system-test-specification/doc/overview.xml
@@ -2,10 +2,9 @@
 <chapter id="overview_sts">
   <title>Overview</title>
 
-  <para>The scope of this document is to describe the Test Harness (TH) sample
-  test cases for System Testing of Enea NFV Access. Furthermore, this document
-  shall also describe the necessary environment setup to run these tests
-  successfully.</para>
+  <para>This document describes the Test Harness (TH) sample test cases for
+  the System Testing of Enea NFV Access, and the necessary environment setup
+  to run these tests successfully.</para>
 
   <section id="def_acro_sts">
     <title>Definitions and Acronyms</title>
@@ -28,7 +27,7 @@
           <row>
             <entry>Enea NFV Access</entry>
 
-            <entry>The Enea NFV Access (with ODM) Run-time Platform and the
+            <entry>The Enea NFV Access (with ODM) Run-Time Platform and the
             Enea uCPE Manager.</entry>
           </row>
         </tbody>
diff --git a/doc/book-enea-nfv-access-system-test-specification/doc/sample_test_cases.xml b/doc/book-enea-nfv-access-system-test-specification/doc/sample_test_cases.xml
index ec2e592..30322ac 100644
--- a/doc/book-enea-nfv-access-system-test-specification/doc/sample_test_cases.xml
+++ b/doc/book-enea-nfv-access-system-test-specification/doc/sample_test_cases.xml
@@ -13,28 +13,35 @@
     TH.</para>
 
     <section id="onb_vnf_image">
-      <title>VNF - Onboard_VNF_Image</title>
+      <title>VNF - Onboard_VNF_Image<remark>all titles are formated with
+      underscores can this be changed or should it be left as
+      is?</remark></title>
 
       <para><emphasis role="bold">Description: </emphasis>Onboarding a VNF
       Image into the uCPE Manager. For details please refer to:</para>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/onboardVNFImage.yml</filename></para>
+      <itemizedlist>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/onboardVNFImage.yml</filename></para>
+        </listitem>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/vnf/onboardVNFRaw.py</filename></para>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/vnf/onboardVNFRaw.py</filename></para>
+        </listitem>
+      </itemizedlist>
 
       <para><emphasis role="bold">Preconditions:</emphasis></para>
 
       <itemizedlist>
         <listitem>
           <para>Add the VNF Image in the <literal>vnf_image</literal> folder
-          in QCOW2 format: <programlisting>&lt;AF-TH-install-dir&gt;/vnf_image/&lt;VNF-Image-name&gt;.qcow2</programlisting></para>
+          in the QCOW2 format: <programlisting>&lt;AF-TH-install-dir&gt;/vnf_image/&lt;VNF-Image-name&gt;.qcow2</programlisting></para>
         </listitem>
 
         <listitem>
           <para>A VNF Image JSON configuration file is created:
-          <filename>&lt;AF-TH-install-dir&gt;/vnf_config/&lt;VNF-Descriptor-name&gt;/&lt;VNF-Descriptor-name&gt;.json</filename>.</para>
-
-          <para><emphasis role="bold">Example:</emphasis><programlisting>&lt;AF-TH-install-dir&gt;/vnf_config/fortigateImage/fortigateImage.json</programlisting></para>
+          <programlisting>&lt;AF-TH-install-dir&gt;/vnf_config/&lt;VNF-Descriptor-name&gt;/&lt;VNF-Descriptor-name&gt;.json</programlisting><emphasis
+          role="bold">Example:</emphasis><programlisting>&lt;AF-TH-install-dir&gt;/vnf_config/fortigateImage/fortigateImage.json</programlisting></para>
         </listitem>
       </itemizedlist>
 
@@ -46,7 +53,7 @@
 vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
 
       <para><emphasis role="bold">Result:</emphasis> Output of the test case
-      run using the Test Harness: <programlisting># Onboard VNF Image task result
+      run using the Test Harness:<programlisting># Onboard VNF Image task result
 &lt;VNF-Descriptor-name&gt; successfully onboarded!</programlisting><emphasis
       role="bold">Note:</emphasis> The test will not fail if the VNF Image is
       already onboarded. The output will instead contain: <programlisting># debug &lt;VNF-Descriptor-name&gt; already onboarded!</programlisting></para>
@@ -59,13 +66,19 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
       <para><emphasis role="bold">Description:</emphasis> Onboarding a VNF
       Bundle into the uCPE Manager. For details please refer to:</para>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/onboardVNFBundle.yml</filename></para>
+      <itemizedlist>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/onboardVNFBundle.yml</filename></para>
+        </listitem>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/vnf/onboardVNF.py</filename></para>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/vnf/onboardVNF.py</filename></para>
+        </listitem>
+      </itemizedlist>
 
       <para><emphasis role="bold">Precondition:</emphasis> Add the VNF Bundle
       in the <literal>vnf_image</literal> folder in the zip format:
-      <filename>&lt;AF-TH-install-dir&gt;/vnf_image/&lt;VNF-Bundle-name&gt;.zip</filename>.</para>
+      <programlisting><filename>&lt;AF-TH-install-dir&gt;/vnf_image/&lt;VNF-Bundle-name&gt;.zip</filename></programlisting></para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>onboardVNFBundle.yml</filename> Ansible Playbook with the
@@ -85,9 +98,15 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
       <para><emphasis role="bold">Description:</emphasis> Removing a VNF
       Descriptor from the uCPE Manager. For details please refer to:</para>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/offboardVNF.yml</filename></para>
+      <itemizedlist>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/offboardVNF.yml</filename></para>
+        </listitem>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/vnf/offboardVNF.py</filename>.</para>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/vnf/offboardVNF.py</filename></para>
+        </listitem>
+      </itemizedlist>
 
       <para><emphasis role="bold">Precondition:</emphasis> The VNF has been
       previously onboarded in the uCPE Manager instance.</para>
@@ -111,13 +130,18 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
       <para><emphasis role="bold">Description:</emphasis> Adding a uCPE device
       to the uCPE Manager. For details please refer to:</para>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/addDevice.yml</filename></para>
+      <itemizedlist>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/addDevice.yml</filename></para>
+        </listitem>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/device/addDevice.py</filename>.</para>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/device/addDevice.py</filename></para>
+        </listitem>
+      </itemizedlist>
 
       <para><emphasis role="bold">Precondition:</emphasis> A device JSON
-      configuration file must be created:
-      <filename>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/&lt;Device-name&gt;.json</filename>.</para>
+      configuration file must be created: <programlisting><filename>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/&lt;Device-name&gt;.json</filename></programlisting></para>
 
       <para><emphasis role="bold">Example:</emphasis> <programlisting>&lt;AF-TH-install-dir&gt;/lab_config/intelc3850-2/intelc3850-2.json</programlisting></para>
 
@@ -139,9 +163,15 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
       <para><emphasis role="bold">Description:</emphasis> Removing a uCPE
       device from the uCPE Manager. For details please refer to:</para>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/removeDevice.yml</filename></para>
+      <itemizedlist>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/removeDevice.yml</filename></para>
+        </listitem>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/device/removeDevice.py</filename>.</para>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/device/removeDevice.py</filename></para>
+        </listitem>
+      </itemizedlist>
 
       <para><emphasis role="bold">Preconditions:</emphasis></para>
 
@@ -175,9 +205,15 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
       <para><emphasis role="bold">Description:</emphasis> Binding a physical
       network interface (NIC) to a device. For details please refer to:</para>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/bindNIC.yml</filename></para>
+      <itemizedlist>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/bindNIC.yml</filename></para>
+        </listitem>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/network/bindNetworkInterface.py</filename>.</para>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/network/bindNetworkInterface.py</filename></para>
+        </listitem>
+      </itemizedlist>
 
       <para><emphasis role="bold">Preconditions:</emphasis></para>
 
@@ -188,8 +224,7 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
         </listitem>
 
         <listitem>
-          <para>A NIC JSON configuration file must exist:
-          <filename>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/&lt;NIC&gt;.json</filename>.</para>
+          <para>A NIC JSON configuration file must exist: <programlisting>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/&lt;NIC&gt;.json</programlisting></para>
 
           <para><emphasis role="bold">Example:</emphasis> <programlisting>&lt;AF-TH-install-dir&gt;/lab_config/intelc3850-2/wan_nic.json
 &lt;AF-TH-install-dir&gt;/lab_config/intelc3850-2/lan_nic.json</programlisting></para>
@@ -202,7 +237,7 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
       <literal>&lt;NIC&gt;</literal> as extra-vars: <programlisting>ansible-playbook playbooks/bindNIC.yml -e "device=&lt;Device-name&gt; nic=&lt;NIC&gt;"</programlisting></para>
 
       <para><emphasis role="bold">Result:</emphasis> Output of the test case
-      run using the Test Harness: <programlisting># Bind NIC task result
+      run using the Test Harness:<programlisting># Bind NIC task result
 &lt;NIC&gt; binded successfully!</programlisting> <emphasis
       role="bold">Note:</emphasis> The test will not fail if the NIC is
       already bound, it will be unbound and bound again with the provided
@@ -216,9 +251,15 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
       network interface (NIC) from a device. For details please refer
       to:</para>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/unbindNIC.yml</filename></para>
+      <itemizedlist>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/unbindNIC.yml</filename></para>
+        </listitem>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/network/unbindNetworkInterface.py</filename>.</para>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/network/unbindNetworkInterface.py</filename></para>
+        </listitem>
+      </itemizedlist>
 
       <para><emphasis role="bold">Preconditions:</emphasis></para>
 
@@ -228,8 +269,7 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
         </listitem>
 
         <listitem>
-          <para>A NIC JSON configuration file exists:
-          <filename>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/&lt;NIC&gt;.json</filename></para>
+          <para>A NIC JSON configuration file exists: <programlisting>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/&lt;NIC&gt;.json</programlisting></para>
         </listitem>
       </itemizedlist>
 
@@ -252,19 +292,24 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
       <para><emphasis role="bold">Description:</emphasis> Creating an OVS
       network bridge on a uCPE device. For details please refer to:</para>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/addBridge.yml</filename></para>
+      <itemizedlist>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/addBridge.yml</filename></para>
+        </listitem>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/network/newNetworkBridge.py</filename>.</para>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/network/newNetworkBridge.py</filename></para>
+        </listitem>
+      </itemizedlist>
 
-      <para><emphasis role="bold">Precondition:</emphasis><itemizedlist>
+      <para><emphasis role="bold">Preconditions:</emphasis><itemizedlist>
           <listitem>
             <para>A NIC is bound to a device in a uCPE Manager
             instance.</para>
           </listitem>
 
           <listitem>
-            <para>A Bridge JSON configuration file is created:
-            <filename>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/&lt;Bridge-name&gt;.json</filename></para>
+            <para>A Bridge JSON configuration file exists:<programlisting>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/&lt;Bridge-name&gt;.json</programlisting></para>
 
             <para><emphasis role="bold">Example:</emphasis><programlisting>&lt;AF-TH-install-dir&gt;/lab_config/intelc3850-2/wan_br.json
 &lt;AF-TH-install-dir&gt;/lab_config/intelc3850-2/lan_br.json</programlisting></para>
@@ -280,7 +325,7 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
       run using the Test Harness: <programlisting># Add Bridge task result
 &lt;Bridge-name&gt; network bridge was added!</programlisting><emphasis
       role="bold">Note:</emphasis> The test will not fail if there already
-      exists a bridge with the same name, it will be deleted and the bridge
+      exists a bridge with the same name. It will be deleted and the bridge
       will be created again with the provided configuration.</para>
     </section>
 
@@ -290,18 +335,23 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
       <para><emphasis role="bold">Description:</emphasis> Removing an OVS
       network bridge from a uCPE device. For details please refer to:</para>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/deleteBridge.yml</filename></para>
+      <itemizedlist>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/deleteBridge.yml</filename></para>
+        </listitem>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/network/delNetworkBridge.py</filename>.</para>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/network/delNetworkBridge.py</filename></para>
+        </listitem>
+      </itemizedlist>
 
-      <para><emphasis role="bold">Preconditions:</emphasis> <itemizedlist>
+      <para><emphasis role="bold">Preconditions:</emphasis><itemizedlist>
           <listitem>
-            <para>A Bridge is created in a uCPE Manager instance.</para>
+            <para>A Bridge exists in a uCPE Manager instance.</para>
           </listitem>
 
           <listitem>
-            <para>A Bridge JSON configuration file exists:
-            <filename>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/&lt;Bridge-name&gt;.json</filename>.</para>
+            <para>A Bridge JSON configuration file exists: <programlisting>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/&lt;Bridge-name&gt;.json</programlisting></para>
           </listitem>
         </itemizedlist><emphasis role="bold">Action:</emphasis> Run the
       <filename>deleteBridge.yml</filename> Ansible Playbook with the
@@ -331,9 +381,15 @@ bridge=&lt;Bridge-name&gt;"</programlisting></para>
       <para><emphasis role="bold">Description:</emphasis> Creating a VNF
       instance on a uCPE device. For details please refer to:</para>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/instantiateVNFI.yml</filename></para>
+      <itemizedlist>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/instantiateVNFI.yml</filename></para>
+        </listitem>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/vnf/instantiateVNFI.py</filename>.</para>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/vnf/instantiateVNFI.py</filename></para>
+        </listitem>
+      </itemizedlist>
 
       <para><emphasis role="bold">Preconditions:</emphasis> <itemizedlist>
           <listitem>
@@ -342,8 +398,7 @@ bridge=&lt;Bridge-name&gt;"</programlisting></para>
           </listitem>
 
           <listitem>
-            <para>A VNFI JSON configuration file is created:
-            <filename>&lt;AF-TH-install-dir&gt;/vnf_config/&lt;VNF-Descriptor-name&gt;/&lt;VNFI-name&gt;.json</filename></para>
+            <para>A VNFI JSON configuration file exists: <programlisting>&lt;AF-TH-install-dir&gt;/vnf_config/&lt;VNF-Descriptor-name&gt;/&lt;VNFI-name&gt;.json</programlisting></para>
 
             <para><emphasis role="bold">Example:</emphasis> <programlisting>&lt;AF-TH-install-dir&gt;/vnf_config/fortigateImage/fortigateFWInstance.json</programlisting></para>
           </listitem>
@@ -359,8 +414,8 @@ vnfd=&lt;VNF-Descriptor-name&gt; vnfi=&lt;VNFI-name&gt;"</programlisting></para>
       <para><emphasis role="bold">Result:</emphasis> Output of the test case
       run using the Test Harness: <programlisting># Instantiate VNF task result
 &lt;VNFI-name&gt; was instantiated!</programlisting><emphasis
-      role="bold">Note:</emphasis> The test will not fail when the VNF
-      instance already exists. The output will contain: <programlisting># debug
+      role="bold">Note:</emphasis> The test will not fail if the VNF instance
+      already exists. The output will instead contain: <programlisting># debug
 &lt;VNFI-name&gt; already exists!</programlisting></para>
     </section>
 
@@ -371,9 +426,15 @@ vnfd=&lt;VNF-Descriptor-name&gt; vnfi=&lt;VNFI-name&gt;"</programlisting></para>
       of a VNF instance (Pause, Resume, Stop, Start). For details please refer
       to:</para>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/controlVNFI.yml</filename></para>
+      <itemizedlist>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/controlVNFI.yml</filename></para>
+        </listitem>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/vnf/controlVNFI.py</filename>.</para>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/vnf/controlVNFI.py</filename></para>
+        </listitem>
+      </itemizedlist>
 
       <para><emphasis role="bold">Precondition:</emphasis> A VNF is
       instantiated on a uCPE device.</para>
@@ -390,9 +451,9 @@ vnfi=&lt;VNFI-name&gt; status=&lt;Command&gt;"</programlisting>Where Command =
       run using the Test Harness: <programlisting># Change VNFI Status task result
 &lt;VNFI-name&gt; status was set to &lt;Command&gt;</programlisting><emphasis
       role="bold">Note:</emphasis> The test will not fail if the VNF instance
-      does not exist or when the specified command is not valid. Depending on
+      does not exist or if the specified command is not valid. Depending on
       the case, the output will contain: <programlisting># debug
-&lt;VNFI-name&gt; was not found!</programlisting><programlisting># debug
+&lt;VNFI-name&gt; was not found!</programlisting>or<programlisting># debug
 Invalid VNF Instance control command specified - &lt;Command&gt;</programlisting></para>
     </section>
 
@@ -402,9 +463,15 @@ Invalid VNF Instance control command specified - &lt;Command&gt;</programlisting
       <para><emphasis role="bold">Description:</emphasis> Destroying a VNF
       instance from a uCPE device. For details please refer to:</para>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/destroyVNFI.yml</filename></para>
+      <itemizedlist>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/destroyVNFI.yml</filename></para>
+        </listitem>
 
-      <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/vnf/destroyVNFI.py</filename>.</para>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/vnf/destroyVNFI.py</filename></para>
+        </listitem>
+      </itemizedlist>
 
       <para><emphasis role="bold">Precondition:</emphasis> A VNF is
       instantiated on a uCPE device.</para>
@@ -416,8 +483,8 @@ Invalid VNF Instance control command specified - &lt;Command&gt;</programlisting
       role="bold">Result:</emphasis> Output of the test case run using the
       Test Harness:<programlisting># Destroy VNFI task result
 &lt;VNFI-name&gt; was destroyed!</programlisting><emphasis
-      role="bold">Note:</emphasis> The test will not fail when the VNF
-      instance does not exist. The output will contain: <programlisting># debug
+      role="bold">Note:</emphasis> The test will not fail if the VNF instance
+      does not exist. The output will instead contain: <programlisting># debug
 &lt;VNFI-name&gt; was not found!</programlisting></para>
     </section>
   </section>
@@ -431,9 +498,9 @@ Invalid VNF Instance control command specified - &lt;Command&gt;</programlisting
     Automation Framework (AF) and the Test Harness (TH).</para>
 
     <section id="fortigate_firewall">
-      <title>Fortigate_VNF_as_a_Firewall</title>
+      <title>Fortigate VNF as a Firewall</title>
 
-      <para>This test case was implemented in 2 different ways to exemplify
+      <para>This test case was implemented in two different ways to exemplify
       both methods supported by the AF and TH to deploy such services.</para>
 
       <para>Prerequisites needed in order to deploy the FortiGate VNF as a
@@ -445,19 +512,19 @@ Invalid VNF Instance control command specified - &lt;Command&gt;</programlisting
         </listitem>
 
         <listitem>
-          <para>Add a device.</para>
+          <para>Add a uCPE device.</para>
         </listitem>
 
         <listitem>
-          <para>Bind 2 physical interfaces, <literal>wan_nic</literal> (this
-          physical interface has to be connected to Lab Network) and
+          <para>Bind 2 physical interfaces: <literal>wan_nic</literal> (this
+          physical interface has to be connected to the Lab Network) and
           <literal>lan_nic</literal>.</para>
         </listitem>
 
         <listitem>
-          <para>Create 2 bridges, <literal>wan_br</literal> (using
+          <para>Create 2 bridges: <literal>wan_br</literal> (using the
           <literal>wan_nic</literal> interface) and <literal>lan_br</literal>
-          (using <literal>lan_nic</literal> interface).</para>
+          (using the <literal>lan_nic</literal> interface).</para>
         </listitem>
 
         <listitem>
@@ -466,8 +533,9 @@ Invalid VNF Instance control command specified - &lt;Command&gt;</programlisting
         </listitem>
       </orderedlist>
 
-      <para>For more information please refer to "FortiGate VNF as a Firewall"
-      chapter from the "Enea NFV Access Example Use-cases" manual. <note>
+      <para>For more information please refer to the "FortiGate VNF as a
+      Firewall" chapter from the "Enea NFV Access Example Use-cases" manual.
+      <remark>olink needed here</remark><note>
           <para>The license and configuration files for the FortiGate VNF are
           not included in the TH and should be obtained from Enea.</para>
         </note></para>
@@ -476,7 +544,7 @@ Invalid VNF Instance control command specified - &lt;Command&gt;</programlisting
         <title>FortigateFWInstance Test</title>
 
         <para><emphasis role="bold">Description:</emphasis> Instantiate the
-        FortiGate VNF as a Firewall and test it using isolated network
+        FortiGate VNF as a Firewall and test it using an isolated network
         namespace.</para>
 
         <para>This example was implemented with the "Test Harness" method,
@@ -510,7 +578,7 @@ Invalid VNF Instance control command specified - &lt;Command&gt;</programlisting
           </listitem>
 
           <listitem>
-            <para>Device JSON configuration file is created:
+            <para>The device JSON configuration file is created:
             <filename>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/&lt;Device-name&gt;.json</filename>.</para>
           </listitem>
 
@@ -526,42 +594,55 @@ ansible_user=root ansible_pass=root</programlisting></para>
           <listitem>
             <para>NIC JSON configuration files are created:</para>
 
-            <para><filename>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/wan_nic.json</filename></para>
+            <itemizedlist>
+              <listitem>
+                <para><filename>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/wan_nic.json</filename></para>
+              </listitem>
 
-            <para><filename>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/lan_nic.json</filename></para>
+              <listitem>
+                <para><filename>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/lan_nic.json</filename></para>
+              </listitem>
+            </itemizedlist>
           </listitem>
 
           <listitem>
             <para>Bridge JSON configuration files are created:</para>
 
-            <para><filename>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/wan_br.json</filename></para>
+            <itemizedlist>
+              <listitem>
+                <para><filename>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/wan_br.json</filename></para>
+              </listitem>
 
-            <para><filename>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/lan_br.json</filename></para>
+              <listitem>
+                <para><filename>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/lan_br.json</filename></para>
+              </listitem>
+            </itemizedlist>
           </listitem>
 
           <listitem>
-            <para>Download the FortiGate VNF Firewall basic configuration from
-            Enea, copy it into the
+            <para>Download the FortiGate VNF Firewall basic configuration file
+            from Enea, copy it into the
             <filename>&lt;AF-TH-install-dir&gt;/vnf_config/fortigateImage</filename>
-            directory and rename it to<filename>
-            fortigateFW.conf</filename>.</para>
+            directory and rename it to
+            <filename>fortigateFW.conf</filename>.</para>
           </listitem>
 
           <listitem>
-            <para>Retrieve the FortiGate VNF license from Fortinet or Enea,
-            copy it into the
+            <para>Retrieve the FortiGate VNF license file from Fortinet or
+            Enea, copy it into the
             <literal>&lt;AF-TH-install-dir&gt;/vnf_config/fortigateImage</literal>
             directory and rename it to
             <filename>fortigateLicense.lic</filename>.</para>
 
-            <para>Please refer to "FortiGate VNF as a Firewall" chapter from
-            the Enea NFV Access Example Use-cases manual.</para>
+            <para>Please refer to the "FortiGate VNF as a Firewall" chapter
+            from the Enea NFV Access Example Use-cases
+            manual.<remark>olink</remark></para>
           </listitem>
         </itemizedlist>
 
-        <para><emphasis role="bold">Action:</emphasis> Run the <emphasis
-        role="bold">instantiateFortigateFW.yml</emphasis> Ansible Playbook
-        with the <literal>&lt;Device-name&gt;</literal> as
+        <para><emphasis role="bold">Action:</emphasis> Run the
+        <filename>instantiateFortigateFW.yml</filename> Ansible Playbook with
+        the <literal>&lt;Device-name&gt;</literal> as
         extra-vars:<programlisting>ansible-playbook playbooks/fortigateFWService/instantiateFortigateFW.yml \
 -e "device=&lt;Device-name&gt;"</programlisting></para>
 
@@ -570,7 +651,7 @@ ansible_user=root ansible_pass=root</programlisting></para>
 FortigateFWInstance tested successfully!</programlisting></para>
 
         <para><emphasis role="bold">Cleanup:</emphasis> Run the
-        <literal>cleanupFortigateFWInstance.yml</literal> Ansible Playbook
+        <filename>cleanupFortigateFWInstance.yml</filename> Ansible Playbook
         with the <literal>&lt;Device-name&gt;</literal> as extra-vars:
         <programlisting>ansible-playbook playbooks/fortigateFWService/cleanupFortigateFWInstance.yml \
 -e "device=&lt;Device-name&gt;"</programlisting></para>
@@ -611,14 +692,13 @@ FortigateFWInstance tested successfully!</programlisting></para>
           </listitem>
 
           <listitem>
-            <para>Device JSON configuration file is created:
-            <filename></filename></para>
+            <para>The device JSON configuration file is created: </para>
 
             <para><filename>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/&lt;Device-name&gt;.json</filename>.</para>
           </listitem>
 
           <listitem>
-            <para>NIC JSON configuration files are created:</para>
+            <para>The NIC JSON configuration files are created:</para>
 
             <para><filename>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/wan_nic.json</filename></para>
 
@@ -626,7 +706,7 @@ FortigateFWInstance tested successfully!</programlisting></para>
           </listitem>
 
           <listitem>
-            <para>Bridge JSON configuration files are created:</para>
+            <para>The Bridge JSON configuration files are created:</para>
 
             <para><filename>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/wan_br.json</filename></para>
 
@@ -653,7 +733,8 @@ FortigateFWInstance tested successfully!</programlisting></para>
             <itemizedlist>
               <listitem>
                 <para>The "FortiGate VNF as a Firewall" chapter from the Enea
-                NFV Access Example Use-cases manual.</para>
+                NFV Access Example Use-cases manual.<remark>olink
+                needed</remark></para>
               </listitem>
 
               <listitem>
@@ -722,18 +803,18 @@ FortigateFW Scenario deployed successfully!</programlisting></para>
         </listitem>
 
         <listitem>
-          <para>Devices JSON configuration files are created, e.g.:</para>
+          <para>The device JSON configuration file(s) is created, e.g.:</para>
 
           <para><filename>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/&lt;Device-name&gt;.json</filename>.</para>
         </listitem>
 
         <listitem>
           <para>Add device settings in the <literal>hosts</literal> Ansible
-          inventory file under <literal>[chainedVNFs]</literal>, keeping both
-          devices, the "site1" and "site2" entries, and updating the values
-          for <literal>ansible_host</literal>,
-          <literal>ansible_port</literal>, <literal>ansible_user</literal> and
-          <literal>ansible_pass</literal>, as applicable.</para>
+          inventory file under <literal>[chainedVNFs]</literal>. Keep both
+          devices, the "site1" and "site2" entries, and update the values for
+          <literal>ansible_host</literal>, <literal>ansible_port</literal>,
+          <literal>ansible_user</literal> and <literal>ansible_pass</literal>,
+          as applicable.</para>
 
           <para><emphasis role="bold">Example:</emphasis></para>
 
@@ -803,8 +884,8 @@ ansible_pass=root</programlisting></para>
         </listitem>
 
         <listitem>
-          <para>Retrieve the FortiGate VNF license from Fortinet or Enea, copy
-          it into the
+          <para>Retrieve the FortiGate VNF license file from Fortinet or Enea,
+          copy it into the
           <literal>&lt;AF-TH-install-dir&gt;/vnf_config/fortigateFWImage</literal>
           directory and rename it to
           <filename>fortigateLicense.lic</filename>.</para>
@@ -819,19 +900,20 @@ ansible_pass=root</programlisting></para>
         </listitem>
 
         <listitem>
-          <para>Retrieve <filename>vSRX-domain-update-script</filename> from
-          Enea and copy it into the <literal>junipervSRXImage</literal>
+          <para>Retrieve the <filename>vSRX-domain-update-script</filename>
+          from Enea and copy it into the <literal>junipervSRXImage</literal>
           directory.</para>
 
           <para>Please refer to the "VNF Chaining Example Use-case" chapter
           from the Enea NFV Access Example Use-cases manual for additional
-          information about the preconditions.</para>
+          information about preconditions.<remark>olink to this
+          chapter</remark></para>
         </listitem>
       </itemizedlist>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
-      <filename>chainedVNFsService.yml</filename> Ansible Playbook as follows:
-      <programlisting>ansible-playbook playbooks/chainedVNFsService/chainedVNFsService.yml \
+      <filename>chainedVNFsService.yml</filename> Ansible Playbook as
+      follows:<programlisting>ansible-playbook playbooks/chainedVNFsService/chainedVNFsService.yml \
 -e "site1=inteld1521-1 site2=inteld1521-2 arch=XeonD"</programlisting></para>
 
       <para>Note that "arch" may either be { XeonD | AtomC } depending on the