1 files changed, 38 insertions, 32 deletions

diff --git a/doc/book-enea-edge-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
index 9f6e64f..8113c3a 100644
--- a/doc/book-enea-edge-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
@@ -5,6 +5,12 @@
   <section id="auto_fw">
     <title>Automation Framework</title>
 
+    <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>
+
     <para>All Automation Framework sources are under the
     <literal>&lt;AF-TH-install-dir&gt;/automation_framework</literal>
     directory.</para>
@@ -45,7 +51,7 @@
       ignored.</para>
 
       <para>In the following script examples, <emphasis>Enea Edge Management
-      </emphasis> is reffered as <emphasis>Enea uCPE
+      </emphasis> is referred as <emphasis>Enea uCPE
       Manager</emphasis>.</para>
     </note>
 
@@ -602,7 +608,7 @@ Options:
  "deviceGroupingTags": " ",
  "description": "",
  "address": "172.24.12.114",
- "version": "2.4.0",
+ "version": "2.5.0",
  "port": "22",
  "username": "root",
  "password": "root",
@@ -1862,7 +1868,7 @@ Options:
         format:</emphasis><programlisting>[
  {
  "name": "Upload NFVA image on uCPE Manager",
- "args": "-f /tmp/enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 -t xeon_d"
+ "args": "-f /tmp/enea-edge-runtime-xeon_d.ostree.tar.bz2 -t xeon_d"
  }
 ]</programlisting></para>
       </section>
@@ -1874,7 +1880,7 @@ Options:
         executed individually by running the following command line:</para>
 
         <programlisting>$ python uploadImage.py -u admin -p admin -H localhost \
--f /tmp/enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 -t xeon_d
+-f /tmp/enea-edge-runtime-xeon_d.ostree.tar.bz2 -t xeon_d
 2020-02-28 11:38:42,754 - DEBUG: Started logging
 2020-02-28 11:38:42,755 - INFO: Upload NFVA image on uCPE Manager
 2020-02-28 11:38:43,307 - DEBUG: Login successful on host 'localhost'
@@ -1882,7 +1888,7 @@ Options:
 2020-02-28 11:41:29,148 - INFO: Verify image validation flag
 2020-02-28 11:41:29,149 - INFO: Valid flag: True
 2020-02-28 11:41:29,344 - INFO: The image \
-'enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2' was successfully uploaded
+'enea-edge-runtime-xeon_d.ostree.tar.bz2' was successfully uploaded
 2020-02-28 11:41:29,344 - INFO: Done
 2020-02-28 11:41:29,388 - DEBUG: Logging out and exiting...</programlisting>
       </section>
@@ -1933,7 +1939,7 @@ Options:
         format:</emphasis><programlisting>[
  {
  "name": "Delete NFVA image on uCPE Manager",
- "args": "-i enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2"
+ "args": "-i enea-edge-runtime-xeon_d.ostree.tar.bz2"
  }
 ]</programlisting></para>
       </section>
@@ -1945,17 +1951,17 @@ Options:
         executed individually by running the following command line:</para>
 
         <programlisting>$ python deleteUpgradeFile.py -u admin -p admin -H localhost -i \
-enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2
+enea-edge-runtime-xeon_d.ostree.tar.bz2
 2020-02-28 12:06:20,111 - DEBUG: Started logging
 2020-02-28 12:06:20,112 - INFO: Delete NFVA image from uCPE Manager
 2020-02-28 12:06:20,210 - DEBUG: Login successful on host 'localhost'
 2020-02-28 12:06:20,211 - DEBUG: Session token is: 594b2d50-5a1a-11ea-a3de-5652b3ac1c30
 2020-02-28 12:06:20,255 - INFO: The image \
-'enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2' was successfully found
+'enea-edge-runtime-xeon_d.ostree.tar.bz2' was successfully found
 2020-02-28 12:06:20,256 - INFO: The oid for \
-'enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2' image name is as follows: \
-VcpeAgent/xeon_d/enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2
-2020-02-28 12:06:20,449 - INFO: The 'enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2' \
+'enea-edge-runtime-xeon_d.ostree.tar.bz2' image name is as follows: \
+VcpeAgent/xeon_d/enea-edge-runtime-xeon_d.ostree.tar.bz2
+2020-02-28 12:06:20,449 - INFO: The 'enea-edge-runtime-xeon_d.ostree.tar.bz2' \
 image was successfully removed
 2020-02-28 12:06:20,479 - INFO: Done
 2020-02-28 12:06:20,517 - DEBUG: Logging out and exiting...</programlisting>
@@ -2016,7 +2022,7 @@ Options:
         <programlisting>[
  {
  "name": "Install and activate NFVA image on uCPE device from uCPE Manager",
- "args": "-i enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 -t xeon_d -d inteld1521-16"
+ "args": "-i enea-edge-runtime-xeon_d.ostree.tar.bz2 -t xeon_d -d inteld1521-16"
  }
 ]</programlisting>
       </section>
@@ -2028,7 +2034,7 @@ Options:
         executed individually by running the following command line:</para>
 
         <programlisting>$ python installAndActivate.py -u admin -p admin -H localhost -i \
-enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 -t xeon_d -d inteld1521-16
+enea-edge-runtime-xeon_d.ostree.tar.bz2 -t xeon_d -d inteld1521-16
 2020-02-28 12:36:46,137 - DEBUG: Started logging
 2020-02-28 12:36:46,138 - INFO: Install and activate NFVA image from uCPE Manager
 2020-02-28 12:36:46,288 - DEBUG: Login successful on host 'localhost'
@@ -2037,29 +2043,29 @@ enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 -t xeon_d -d inteld1521-16
 2020-02-28 12:36:46,459 - INFO: Display info about NFVA installation \
 [inteld1521-16:1001:172.24.12.152] Install Started
 2020-02-28 12:36:46,492 - INFO: Transferring Image: \
-enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2
+enea-edge-runtime-xeon_d.ostree.tar.bz2
 2020-02-28 12:36:56,552 - INFO: Verifying Release [1]
 2020-02-28 12:37:06,599 - INFO: Verifying Release [2]
 2020-02-28 12:37:16,652 - INFO: Validating Upgrade to \
-enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2
+enea-edge-runtime-xeon_d.ostree.tar.bz2
 2020-02-28 12:37:26,713 - INFO: Validating upgrade to \
-enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 [3]
+enea-edge-runtime-xeon_d.ostree.tar.bz2 [3]
 2020-02-28 12:37:36,770 - INFO: Validating upgrade to \
-enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 [5]
+enea-edge-runtime-xeon_d.ostree.tar.bz2 [5]
 2020-02-28 12:37:46,819 - INFO: Validating upgrade to \
-enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 [7]
+enea-edge-runtime-xeon_d.ostree.tar.bz2 [7]
 2020-02-28 12:37:56,879 - INFO: Validating upgrade to \
-enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 [9]
+enea-edge-runtime-xeon_d.ostree.tar.bz2 [9]
 2020-02-28 12:38:06,920 - INFO: Validating upgrade to \
-enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 [11]
+enea-edge-runtime-xeon_d.ostree.tar.bz2 [11]
 2020-02-28 12:38:16,975 - INFO: Validating upgrade to \
-enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 [13]
+enea-edge-runtime-xeon_d.ostree.tar.bz2 [13]
 2020-02-28 12:38:27,019 - INFO: Validating upgrade to \
-enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 [15]
+enea-edge-runtime-xeon_d.ostree.tar.bz2 [15]
 2020-02-28 12:38:37,091 - INFO: Validating upgrade to \
-enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 [18]
+enea-edge-runtime-xeon_d.ostree.tar.bz2 [18]
 2020-02-28 12:38:47,133 - INFO: Validating upgrade to \
-enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 [20]
+enea-edge-runtime-xeon_d.ostree.tar.bz2 [20]
 2020-02-28 12:38:57,186 - INFO: Waiting for release to become active
 2020-02-28 12:39:07,231 - INFO: Upgrade Request Complete
 2020-02-28 12:39:17,242 - INFO: Installation completed!
@@ -2578,7 +2584,7 @@ phase always-after-startup from uCPE Manager
 
         <programlisting>{
  "descr": "intelc3850-2",
- "version": "2.4.0",
+ "version": "2.5.0",
  "deviceGroupingTags": "",
  "deviceId": "intelc3850-2",
  "name": "intelc3850-2"
@@ -2801,17 +2807,17 @@ Options:
 
     <para>The <literal>/lab_config</literal> directory stores the JSON
     configuration files related to a device (devices, NICs and bridges) as
-    well as sample custom scripts. 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>
+    well as sample custom scripts. Each sub-folder 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 and VNF instances.
     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>
+    and any other files required by the type of the VNF. Each sub-folder
+    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 <literal>/log</literal> directory is created when the
     <literal>setup_env.sh</literal> is run. When test cases are run, the