2 files changed, 69 insertions, 54 deletions

diff --git a/doc/book-enea-edge-system-test-specification/doc/book.xml b/doc/book-enea-edge-system-test-specification/doc/book.xml
index bcc2dcd..0884348 100644
--- a/doc/book-enea-edge-system-test-specification/doc/book.xml
+++ b/doc/book-enea-edge-system-test-specification/doc/book.xml
@@ -7,7 +7,7 @@
   <title><trademark class="registered">Enea</trademark> Edge System Test Specification</title>
 
   <subtitle>Release Version
-         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
+         <xi:include href="../../eltf_params_updated.xml" xpointer="element(EneaEdge_REL_VER/1)"
          xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
 
   <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
diff --git a/doc/book-enea-edge-system-test-specification/doc/sample_test_cases.xml b/doc/book-enea-edge-system-test-specification/doc/sample_test_cases.xml
index 9fa6bda..c32a784 100644
--- a/doc/book-enea-edge-system-test-specification/doc/sample_test_cases.xml
+++ b/doc/book-enea-edge-system-test-specification/doc/sample_test_cases.xml
@@ -1,10 +1,16 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="sample_testcases">
   <title>Sample Test Cases</title>
 
   <para>The test cases specified in this chapter are implemented as a Sample
   Test Suite included in the TH.</para>
 
+  <note>
+    <para>The NFVA and uCPE Manager terms from this document and from the
+    source code are references to the Enea Edge Runtime and the Enea Edge
+    Management application components, respectively.</para>
+  </note>
+
   <section id="vnf_dev_net_smoke">
     <title>VNF, Device and Network Smoke Test Cases</title>
 
@@ -61,7 +67,8 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
       <title>VNF - Offboard a VNF</title>
 
       <para><emphasis role="bold">Description:</emphasis> Removing a VNF
-      Descriptor from the Enea Edge Management. For details please refer to:</para>
+      Descriptor from the Enea Edge Management. For details please refer
+      to:</para>
 
       <itemizedlist>
         <listitem>
@@ -125,8 +132,8 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
     <section id="device_upload_image">
       <title>Device - Upload a Edge image</title>
 
-      <para><emphasis role="bold">Description:</emphasis> Upload a Edge
-      image file onto the Enea Edge Management. For details please refer to:</para>
+      <para><emphasis role="bold">Description:</emphasis> Upload a Edge image
+      file onto the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -150,7 +157,7 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
 image_path="&lt;Image-path&gt;" -e upgrade_type="&lt;Upgrade-type&gt;"</programlisting></para>
 
       <para><emphasis role="bold">Example:</emphasis> <programlisting>ansible-playbook playbooks/uploadImage.yml -e \
-image_path="/tmp/enea-nfv-access-xeon-d6.rootfs.ostree.tar.bz2" -e \
+image_path="/tmp/enea-edge-runtime-xeon_d.ostree.tar.bz2" -e \
 upgrade_type="xeon_d"</programlisting></para>
 
       <para><emphasis role="bold">Result:</emphasis> Output of the test case
@@ -194,7 +201,7 @@ A file with the same name is already uploaded.</programlisting></para>
 image_name="&lt;Image-name&gt;"</programlisting></para>
 
       <para><emphasis role="bold">Example:</emphasis> <programlisting>ansible-playbook playbooks/deleteUpgradeFile.yml -e \
-image_name="enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2"</programlisting></para>
+image_name="enea-edge-runtime-xeon_d.ostree.tar.bz2"</programlisting></para>
 
       <para><emphasis role="bold">Result:</emphasis> Output of the test case
       run using the Test Harness:<programlisting>TASK [Remove NFVA image -- Run deleteUpgradeFile.py module from automation_framework]
@@ -255,8 +262,8 @@ localhost                  : ok=1    changed=1    unreachable=0    failed=0</pro
 
       <para><emphasis role="bold">Preconditions:</emphasis> <itemizedlist>
           <listitem>
-            <para>The device must be previously added to the Enea Edge Management
-            instance.</para>
+            <para>The device must be previously added to the Enea Edge
+            Management instance.</para>
           </listitem>
 
           <listitem>
@@ -274,7 +281,7 @@ image_name="&lt;Image_name&gt;" -e upgrade_type="&lt;Upgrade_type&gt;" -e \
 device="&lt;Device-name&gt;"</programlisting></para>
 
       <para><emphasis role="bold">Example:</emphasis> <programlisting>ansible-playbook playbooks/installAndActivate.yml -e \
-image_name="enea-nfv-access-xeon-d6.rootfs.ostree.tar.bz2" -e \
+image_name="enea-edge-runtime-xeon_d.ostree.tar.bz2" -e \
 upgrade_type=xeon_d -e device=inteld1521-16"</programlisting></para>
 
       <para><emphasis role="bold">Result:</emphasis> Output of the test case
@@ -291,12 +298,12 @@ Duplicate entry - Release already installed</programlisting></para>
     </section>
 
     <section id="dev_upload_inst_activ">
-      <title>Device - Upload, Install and Activate a Edge image on a
-      uCPE device</title>
+      <title>Device - Upload, Install and Activate a Edge image on a uCPE
+      device</title>
 
       <para><emphasis role="bold">Description:</emphasis> Upload, install and
-      activate a Edge image on a uCPE device from the Enea Edge Management. For
-      details please refer to:</para>
+      activate a Edge image on a uCPE device from the Enea Edge Management.
+      For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -335,8 +342,8 @@ Duplicate entry - Release already installed</programlisting></para>
 
       <itemizedlist>
         <listitem>
-          <para>The device has to be previously added to the Enea Edge Management
-          instance.</para>
+          <para>The device has to be previously added to the Enea Edge
+          Management instance.</para>
         </listitem>
 
         <listitem>
@@ -357,8 +364,8 @@ image_name="&lt;Image-name&gt;" -e upgrade_type="&lt;Upgrade-type&gt;"</programl
 
       <para><emphasis role="bold">Example:</emphasis> <programlisting>ansible-playbook playbooks/installNFVAImage.yml -e \
 device="inteld1521-16" -e \
-image_path=/tmp/enea-nfv-access-xeon-d5.rootfs.ostree.tar.bz2 -e \
-image_name=enea-nfv-access-xeon-d5.rootfs.ostree.tar.bz2 -e \
+image_path=/tmp/enea-edge-runtime-xeon_d.ostree.tar.bz2 -e \
+image_name=enea-edge-runtime-xeon_d.ostree.tar.bz2 -e \
 upgrade_type=xeon_d</programlisting></para>
 
       <para><emphasis role="bold">Result:</emphasis> Output of the test case
@@ -388,8 +395,8 @@ upgrade_type=xeon_d</programlisting></para>
 
       <itemizedlist>
         <listitem>
-          <para>The device has to be previously added to the Enea Edge Management
-          instance.</para>
+          <para>The device has to be previously added to the Enea Edge
+          Management instance.</para>
         </listitem>
 
         <listitem>
@@ -413,7 +420,8 @@ upgrade_type=xeon_d</programlisting></para>
       <title>Device - Remove a Device</title>
 
       <para><emphasis role="bold">Description:</emphasis> Removing a uCPE
-      device from the Enea Edge Management. For details please refer to:</para>
+      device from the Enea Edge Management. For details please refer
+      to:</para>
 
       <itemizedlist>
         <listitem>
@@ -429,8 +437,8 @@ upgrade_type=xeon_d</programlisting></para>
 
       <itemizedlist>
         <listitem>
-          <para>The device has to be previously added to the Enea Edge Management
-          instance.</para>
+          <para>The device has to be previously added to the Enea Edge
+          Management instance.</para>
         </listitem>
 
         <listitem>
@@ -517,7 +525,8 @@ upgrade_type=xeon_d</programlisting></para>
 
       <itemizedlist>
         <listitem>
-          <para>A NIC is bound to a device in a Enea Edge Management instance.</para>
+          <para>A NIC is bound to a device in a Enea Edge Management
+          instance.</para>
         </listitem>
 
         <listitem>
@@ -638,8 +647,8 @@ bridge=&lt;Bridge-name&gt;"</programlisting></para>
 
       <para><emphasis role="bold">Precondition: </emphasis></para>
 
-      <para>A device must have been previously added and connected to the Enea Edge
-      Management instance.</para>
+      <para>A device must have been previously added and connected to the Enea
+      Edge Management instance.</para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>configDPDK.yml</filename> Ansible Playbook with the
@@ -693,12 +702,12 @@ DEBUG: "{{ scriptName }} was uploaded to Enea Edge Management!"</programlisting>
     </section>
 
     <section id="cs_upload_device">
-      <title>Custom Scripts - Upload a Custom Script from the Enea Edge Management to
-      a Device</title>
+      <title>Custom Scripts - Upload a Custom Script from the Enea Edge
+      Management to a Device</title>
 
       <para><emphasis role="bold">Description:</emphasis> Upload a Custom
-      Script from the Enea Edge Management to a Device. For details please refer
-      to:</para>
+      Script from the Enea Edge Management to a Device. For details please
+      refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -719,8 +728,8 @@ DEBUG: "{{ scriptName }} was uploaded to Enea Edge Management!"</programlisting>
         </listitem>
 
         <listitem>
-          <para>A Custom Script must have been previously added to the Enea Edge
-          Management instance.</para>
+          <para>A Custom Script must have been previously added to the Enea
+          Edge Management instance.</para>
         </listitem>
       </itemizedlist>
 
@@ -745,7 +754,8 @@ DEBUG: "{{ scriptName }} was uploaded to {{ device }}!"</programlisting>
       Management</title>
 
       <para><emphasis role="bold">Description:</emphasis> Remove a Custom
-      Script from the Enea Edge Management. For details please refer to:</para>
+      Script from the Enea Edge Management. For details please refer
+      to:</para>
 
       <itemizedlist>
         <listitem>
@@ -827,7 +837,8 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
       Store</title>
 
       <para><emphasis role="bold">Description:</emphasis> Adding an Offline
-      Config Store to the Enea Edge Management. For details please refer to:</para>
+      Config Store to the Enea Edge Management. For details please refer
+      to:</para>
 
       <itemizedlist>
         <listitem>
@@ -872,7 +883,8 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
       Store</title>
 
       <para><emphasis role="bold">Description:</emphasis> Removing an Offline
-      Config Store from the Enea Edge Management. For details please refer to:</para>
+      Config Store from the Enea Edge Management. For details please refer
+      to:</para>
 
       <itemizedlist>
         <listitem>
@@ -887,7 +899,8 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
       <para><emphasis role="bold">Precondition:</emphasis></para>
 
       <para>The Offline Configuration Store the user wishes to remove should
-      exist in the Enea Edge Management. If it does not, the test will say so.</para>
+      exist in the Enea Edge Management. If it does not, the test will say
+      so.</para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>removeConfigStore.yml</filename> Ansible Playbook with the
@@ -908,8 +921,8 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
       Configuration Store</title>
 
       <para><emphasis role="bold">Description:</emphasis> Adding a network
-      bridge to an Offline Config Store in Enea Edge Management. For details please
-      refer to:</para>
+      bridge to an Offline Config Store in Enea Edge Management. For details
+      please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -1027,7 +1040,8 @@ INFO: Done</programlisting>
         </listitem>
 
         <listitem>
-          <para>The device should be connected to the Enea Edge Management.</para>
+          <para>The device should be connected to the Enea Edge
+          Management.</para>
         </listitem>
       </itemizedlist>
 
@@ -1078,7 +1092,8 @@ INFO: Done</programlisting>
         </listitem>
 
         <listitem>
-          <para>The device should be connected to the Enea Edge Management.</para>
+          <para>The device should be connected to the Enea Edge
+          Management.</para>
         </listitem>
       </itemizedlist>
 
@@ -1109,7 +1124,8 @@ INFO: Done</programlisting>
     <title>VNF Deployment and Lifecycle</title>
 
     <para>The following details the automated suite that handles the testing
-    of the instantiation, lifecycle and destruction of a VNF for Enea Edge.</para>
+    of the instantiation, lifecycle and destruction of a VNF for Enea
+    Edge.</para>
 
     <section id="inst_vnfi">
       <title>Instantiating a VNFI</title>
@@ -1130,8 +1146,8 @@ INFO: Done</programlisting>
       <para><emphasis role="bold">Preconditions:</emphasis> <itemizedlist>
           <listitem>
             <para>A VNF Image is onboarded and a device is added and connected
-            to the Enea Edge Management. Depending on the VNF, other steps may be
-            required.</para>
+            to the Enea Edge Management. Depending on the VNF, other steps may
+            be required.</para>
           </listitem>
 
           <listitem>
@@ -1507,8 +1523,7 @@ FortigateFWInstance tested successfully!</programlisting></para>
               </listitem>
 
               <listitem>
-                <para><olink
-                targetdoc="book_enea_edge_auto_fw_th_user_guide"
+                <para><olink targetdoc="book_enea_edge_auto_fw_th_user_guide"
                 targetptr="python_testsuite">Python Unit-Test Suite in
                 <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -1763,23 +1778,23 @@ LAN-to-LAN connectivity (through VPN tunnel)tested successfully!</programlisting
       </listitem>
 
       <listitem>
-        <para>The custom script should have been previously saved in 
-          <literal>&lt;AF-TH-install-dir&gt;/lab_config/customScripts</literal>.</para>
+        <para>The custom script should have been previously saved in
+        <literal>&lt;AF-TH-install-dir&gt;/lab_config/customScripts</literal>.</para>
       </listitem>
-      
+
       <listitem>
-        <para>Add device settings in the <literal>hosts</literal> Ansible inventory file under 
-          <literal>[customScriptDevice]</literal> and remove the <literal>inteld1521-1</literal>
-          example.</para>
+        <para>Add device settings in the <literal>hosts</literal> Ansible
+        inventory file under <literal>[customScriptDevice]</literal> and
+        remove the <literal>inteld1521-1</literal> example.</para>
       </listitem>
     </itemizedlist>
-    
+
     <para><emphasis role="bold">Example:</emphasis></para>
-    
+
     <programlisting>[customScriptDevice]
 inteld1521-1 ansible_host=172.24.12.73 ansible_port=22 ansible_user=root \
       ansible_pass=root</programlisting>
-    
+
     <para><emphasis role="bold">Action:</emphasis> Run
     <filename>basicTest.yml</filename> (example data for
     <filename>test_success_after_always</filename>):</para>