4 files changed, 358 insertions, 40 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 e1bab54..9f9930a 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
@@ -814,7 +814,8 @@ Events on device: intelc3850-2 and severity: 1000
     <section id="enable_disable_dpdk">
       <title>Enabling or Disabling the DPDK</title>
 
-      <para>Steps and details on how to enable or disable the DPDK are explained below.</para>
+      <para>Steps and details on how to enable or disable the DPDK are
+      explained below.</para>
 
       <section id="script_dpdk">
         <title>Script Options</title>
@@ -1105,31 +1106,43 @@ Options:
 2020-01-07 05:58:03,688 - DEBUG: Session token is: 93dd3cd0-313c-11ea-b0c7-525400b7889f
 2020-01-07 05:58:03,715 - DEBUG: Found device with name 'intelc3850-2'
 2020-01-07 05:58:03,717 - DEBUG:
------------------ External Network Interfaces for intelc3850-2-----------------
-2020-01-07 05:58:07,622 - DEBUG: eno4 DpdkTypes: [u'igb_uio', u'vfio-pci'] MacAddress: 0c:c4:7a:fb:85:dfsriov(7)
+----------------External Network Interfaces for intelc3850-2----------------
+2020-01-07 05:58:07,622 - DEBUG: eno4 DpdkTypes: [u'igb_uio', u'vfio-pci'] \ 
+MacAddress: 0c:c4:7a:fb:85:dfsriov(7)
 2020-01-07 05:58:07,624 - DEBUG:
 2020-01-07 05:58:07,656 - DEBUG:
------------------ Configured External Network Interfaces for intelc3850-2-----------------
-2020-01-07 05:58:07,657 - DEBUG: eno3 DpdkType: vfio-pci ID: 47556b22-b5c2-4acb-b3cb-09b1f024b3a7
-2020-01-07 05:58:07,658 - DEBUG: enp1s0f1 DpdkType: vfio-pci ID: 2c06b4f7-6814-4432-8765-a9d0cd5303c1
-2020-01-07 05:58:07,659 - DEBUG: enp1s0f0 DpdkTypes: [u'igb_uio', u'vfio-pci'] MacAddress: ac:1f:6b:2d:ee:58sriov(63)
+----------------Configured External Network Interfaces for intelc3850-2----------------
+2020-01-07 05:58:07,657 - DEBUG: eno3 DpdkType: vfio-pci ID: \
+47556b22-b5c2-4acb-b3cb-09b1f024b3a7
+2020-01-07 05:58:07,658 - DEBUG: enp1s0f1 DpdkType: vfio-pci ID: \
+2c06b4f7-6814-4432-8765-a9d0cd5303c1
+2020-01-07 05:58:07,659 - DEBUG: enp1s0f0 DpdkTypes: [u'igb_uio', u'vfio-pci'] \
+MacAddress: ac:1f:6b:2d:ee:58sriov(63)
 2020-01-07 05:58:07,660 - DEBUG:
 2020-01-07 05:58:07,690 - DEBUG:
------------------ Configured External Network Interfaces for intelc3850-2-----------------
-2020-01-07 05:58:07,691 - DEBUG: eno3 DpdkType: vfio-pci ID: 47556b22-b5c2-4acb-b3cb-09b1f024b3a7
-2020-01-07 05:58:07,692 - DEBUG: enp1s0f1 DpdkType: vfio-pci ID: 2c06b4f7-6814-4432-8765-a9d0cd5303c1
-2020-01-07 05:58:07,693 - DEBUG: eno2 DpdkTypes: [u'igb_uio', u'vfio-pci'] MacAddress: 0c:c4:7a:fb:85:ddsriov(7)
+----------------Configured External Network Interfaces for intelc3850-2----------------
+2020-01-07 05:58:07,691 - DEBUG: eno3 DpdkType: vfio-pci ID: \
+47556b22-b5c2-4acb-b3cb-09b1f024b3a7
+2020-01-07 05:58:07,692 - DEBUG: enp1s0f1 DpdkType: vfio-pci ID: \
+2c06b4f7-6814-4432-8765-a9d0cd5303c1
+2020-01-07 05:58:07,693 - DEBUG: eno2 DpdkTypes: [u'igb_uio', u'vfio-pci'] \
+MacAddress: 0c:c4:7a:fb:85:ddsriov(7)
 2020-01-07 05:58:07,695 - DEBUG:
 2020-01-07 05:58:07,724 - DEBUG:
------------------ Configured External Network Interfaces for intelc3850-2-----------------
-2020-01-07 05:58:07,725 - DEBUG: eno3 DpdkType: vfio-pci ID: 47556b22-b5c2-4acb-b3cb-09b1f024b3a7
-2020-01-07 05:58:07,726 - DEBUG: enp1s0f1 DpdkType: vfio-pci ID: 2c06b4f7-6814-4432-8765-a9d0cd5303c1
-2020-01-07 05:58:07,727 - DEBUG: eno1 DpdkTypes: [u'igb_uio', u'vfio-pci'] MacAddress: 0c:c4:7a:fb:85:dcsriov(7)
+----------------Configured External Network Interfaces for intelc3850-2----------------
+2020-01-07 05:58:07,725 - DEBUG: eno3 DpdkType: vfio-pci ID: \
+47556b22-b5c2-4acb-b3cb-09b1f024b3a7
+2020-01-07 05:58:07,726 - DEBUG: enp1s0f1 DpdkType: vfio-pci ID: \
+2c06b4f7-6814-4432-8765-a9d0cd5303c1
+2020-01-07 05:58:07,727 - DEBUG: eno1 DpdkTypes: [u'igb_uio', u'vfio-pci'] \
+MacAddress: 0c:c4:7a:fb:85:dcsriov(7)
 2020-01-07 05:58:07,728 - DEBUG:
 2020-01-07 05:58:07,760 - DEBUG:
------------------ Configured External Network Interfaces for intelc3850-2-----------------
-2020-01-07 05:58:07,761 - DEBUG: eno3 DpdkType: vfio-pci ID: 47556b22-b5c2-4acb-b3cb-09b1f024b3a7
-2020-01-07 05:58:07,761 - DEBUG: enp1s0f1 DpdkType: vfio-pci ID: 2c06b4f7-6814-4432-8765-a9d0cd5303c1
+----------------Configured External Network Interfaces for intelc3850-2----------------
+2020-01-07 05:58:07,761 - DEBUG: eno3 DpdkType: vfio-pci ID: \
+47556b22-b5c2-4acb-b3cb-09b1f024b3a7
+2020-01-07 05:58:07,761 - DEBUG: enp1s0f1 DpdkType: vfio-pci ID: \
+2c06b4f7-6814-4432-8765-a9d0cd5303c1
 2020-01-07 05:58:07,762 - DEBUG:
 2020-01-07 05:58:07,763 - INFO: Done
 2020-01-07 05:58:07,787 - DEBUG: Logging out and exiting...</programlisting>
@@ -1137,7 +1150,7 @@ Options:
     </section>
 
     <section id="create_ovs_net_bridge">
-      <title>Create an OVS Network Bridge</title>
+      <title>Creating an OVS Network Bridge</title>
 
       <para>Instructions on how to Create an OVS Bridge on a device are
       detailed below.</para>
@@ -1226,7 +1239,7 @@ Options:
     </section>
 
     <section id="delete_ovs_net_bridge">
-      <title>Delete an OVS Network Bridge</title>
+      <title>Deleting an OVS Network Bridge</title>
 
       <para>How to Delete an OVS Bridge from a device is detailed in the
       following.</para>
@@ -1313,7 +1326,7 @@ Options:
     </section>
 
     <section id="onboard_vnf_bundle">
-      <title>Onboard a VNF Image</title>
+      <title>Onboarding a VNF Image</title>
 
       <para>The specifics of how to Onboard a VNF image onto the Enea uCPE
       Manager is detailed below.</para>
@@ -1385,7 +1398,7 @@ Options:
     </section>
 
     <section id="onboard_vnf_image">
-      <title>Onboard a VNF Image Raw</title>
+      <title>Onboarding a VNF Image Raw</title>
 
       <para>How to Onboard a VNF image in the uCPE Manager based upon its raw
       constituents, is detailed in depth below.</para>
@@ -1502,7 +1515,7 @@ Options:
     </section>
 
     <section id="offboard_vnf">
-      <title>Offboard a VNF</title>
+      <title>Offboarding a VNF</title>
 
       <para>Steps on how to Offboard a VNF from the uCPE Manager are detailed
       below.</para>
@@ -1568,7 +1581,7 @@ Options:
     </section>
 
     <section id="instantiate_vnf">
-      <title>Instantiate a VNF</title>
+      <title>Instantiating a VNF</title>
 
       <para>Instantiating a VNF via the uCPE Manager is detailed below.</para>
 
@@ -1647,7 +1660,7 @@ License("vnf_config/fortigateImage/fortigateLicense.lic")
     </section>
 
     <section id="control_vnf_inst">
-      <title>Control a VNF Instance</title>
+      <title>Controlling a VNF Instance</title>
 
       <para>How to Control a VNF instance from the Enea uCPE Manager is
       detailed below.</para>
@@ -1731,7 +1744,7 @@ fortigateFWInstance -c stop
     </section>
 
     <section id="destroy_vnf_inst">
-      <title>Destroy a VNF Instance</title>
+      <title>Destroying a VNF Instance</title>
 
       <para>Steps and options on how to Destroy a VNF instance from the Enea
       uCPE Manager are described below.</para>
@@ -1797,6 +1810,311 @@ fortigateFWInstance
 2019-03-07 17:33:51,712 - DEBUG: Logging out and exiting...</programlisting>
       </section>
     </section>
+
+    <section id="upload_vnf_image">
+      <title>Uploading a NFV Access image onto the Enea uCPE Manager</title>
+
+      <para>Steps and options on how to Upload a NFV Access image onto the Enea uCPE
+      Manager are described below.</para>
+
+      <section id="script_opts_upload">
+        <title>Script Options</title>
+
+        <programlisting>$ python uploadImage.py -h
+Upload NFVA image on uCPE Manager
+Usage: uploadImage.py [options]
+
+Upload NFVA image on uCPE Manager.
+
+Options:
+  --version             show program's version number and exit
+  -h, --help            show this help message and exit
+  -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
+  -f FILENAME, --fileName=FILENAME
+                        Path to NFVA image file name
+  -m MODULE, --module=MODULE
+                        Module name (default is: VcpeAgent)
+  -t UPGRADETYPE, --upgradeType=UPGRADETYPE
+                        Upgrade Type depends on architecture: xeon_d or
+                        atom_c3000
+
+  Mandatory options:
+    -H/--host, -f/--fileName, -m/--module, -t/--upgradeType</programlisting>
+      </section>
+
+      <section id="json_upload">
+        <title>Configuring the JSON File</title>
+
+        <para>The JSON configuration file needed to upload a NFV Access image should
+        contain a list of dictionaries. Each dictionary indicates the test
+        case name and the test case arguments passed to the
+        <filename>uploadImage</filename> Python module.</para>
+
+        <para><emphasis role="bold">Sample unit-test JSON file
+        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"
+ }
+]</programlisting></para>
+      </section>
+
+      <section id="pymod_upload">
+        <title>Running the Python Module</title>
+
+        <para>The <filename>uploadImage</filename> Python module can be
+        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
+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'
+2020-02-28 11:38:43,308 - DEBUG: Session token is: 7da3f960-5a16-11ea-a3de-5652b3ac1c30
+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
+2020-02-28 11:41:29,344 - INFO: Done
+2020-02-28 11:41:29,388 - DEBUG: Logging out and exiting...</programlisting>
+      </section>
+    </section>
+
+    <section id="delete_vnf_image">
+      <title>Deleting a NFV Access image file from the Enea uCPE Manager</title>
+
+      <para>Steps and options on how to Delete a NFV Access image from the Enea uCPE
+      Manager are described below.</para>
+
+      <section id="script_opts_deleteupload">
+        <title>Script Options</title>
+
+        <programlisting>$ python deleteUpgradeFile.py -h
+Delete NFVA image from uCPE Manager
+Usage: deleteUpgradeFile.py [options]
+
+Delete NFVA image from uCPE Manager.
+
+Options:
+  --version             show program's version number and exit
+  -h, --help            show this help message and exit
+  -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
+  -i IMAGENAME, --imageName=IMAGENAME
+                        NFVA Image name
+  -m MODULE, --module=MODULE
+                        Module name - default is VcpeAgent
+
+  Mandatory options:
+    -H/--host, -i/--imageName, -m/--module.</programlisting>
+      </section>
+
+      <section id="json_delete_upload">
+        <title>Configuring the JSON File</title>
+
+        <para>The JSON configuration file needed to delete a NFV Access image should
+        contain a list of dictionaries. Each dictionary indicates the test
+        case name and the test case arguments passed to the
+        <filename>deleteUpgradeFile</filename> Python module.</para>
+
+        <para><emphasis role="bold">Sample unit-test JSON file
+        format:</emphasis><programlisting>[
+ {
+ "name": "Delete NFVA image on uCPE Manager",
+ "args": "-i enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2"
+ }
+]</programlisting></para>
+      </section>
+
+      <section id="pymod_delete_upload">
+        <title>Running the Python Module</title>
+
+        <para>The <filename>deleteUpgradeFile</filename> Python module can be
+        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
+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
+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' \
+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>
+      </section>
+    </section>
+
+    <section id="install_activate_vnf_image">
+      <title>Installing and activating a NFV Access image on an uCPE device from the
+      Enea uCPE Manager</title>
+
+      <para>Steps and options on how to Install and Activate a NFV Access image on an
+      uCPE device from the Enea uCPE Manager are described below.</para>
+
+      <section id="script_opts_install_activate">
+        <title>Script Options</title>
+
+        <programlisting>$ python installAndActivate.py -h
+Install and activate NFVA image from uCPE Manager
+Usage: installAndActivate.py [options]
+
+Install and activate NFVA image from uCPE Manager.
+
+Options:
+  --version             show program's version number and exit
+  -h, --help            show this help message and exit
+  -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
+  -i IMAGENAME, --imageName=IMAGENAME
+                        Image name
+  -m MODULE, --module=MODULE
+                        Module name -- VcpeAgent
+  -t UPGRADETYPE, --upgradeType=UPGRADETYPE
+                        Upgrade Type -- xeon_d or atom_c3000
+  -d DEVICENAME, --deviceName=DEVICENAME
+                        Device Name
+
+  Mandatory options:
+    -H/--host, -i/--imageName, -t/--upgradeType, -d/--deviceName,
+    -m/--module</programlisting>
+      </section>
+
+      <section id="json_install_activate">
+        <title>Configuring the JSON File</title>
+
+        <para>The JSON configuration file needed to install and activate a NFV Access
+        image on a uCPE device from the Enea uCPE Manager should contain a
+        list of dictionaries. Each dictionary indicates the test case name and
+        the test case arguments passed to the
+        <filename>installAndActivate</filename> Python module.</para>
+
+        <para><emphasis role="bold">Sample unit-test JSON file
+        format:</emphasis><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"
+ }
+]</programlisting></para>
+      </section>
+
+      <section id="pymod_install_activate">
+        <title>Running the Python Module</title>
+
+        <para>The <filename>installAndActivate</filename> Python module can be
+        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
+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'
+2020-02-28 12:36:46,288 - DEBUG: Session token is: 99b7cde0-5a1e-11ea-a3de-5652b3ac1c30
+2020-02-28 12:36:46,325 - DEBUG: Found device with name '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
+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
+2020-02-28 12:37:26,713 - INFO: Validating upgrade to \
+enea-nfv-access-xeon-d.rootfs.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]
+2020-02-28 12:37:46,819 - INFO: Validating upgrade to \
+enea-nfv-access-xeon-d.rootfs.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]
+2020-02-28 12:38:06,920 - INFO: Validating upgrade to \
+enea-nfv-access-xeon-d.rootfs.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]
+2020-02-28 12:38:27,019 - INFO: Validating upgrade to \
+enea-nfv-access-xeon-d.rootfs.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]
+2020-02-28 12:38:47,133 - INFO: Validating upgrade to \
+enea-nfv-access-xeon-d.rootfs.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!
+2020-02-28 12:39:17,243 - INFO: Done
+2020-02-28 12:39:17,294 - DEBUG: Logging out and exiting...</programlisting>
+      </section>
+    </section>
+
+    <section id="clearing_info_upgrade">
+      <title>Clearing information about completed upgrades of uCPE devices
+      from the Enea uCPE Manager</title>
+
+      <para>Steps and options on how to clear information about completed
+      upgrades of uCPE devices from the Enea uCPE Manager are described
+      below.</para>
+
+      <section id="script_opts_clearinfo">
+        <title>Script Options</title>
+
+        <programlisting>$ python clearCompletedUpgradesInfo.py -h
+Clear info about completed upgrades
+Usage: clearCompletedUpgradesInfo.py [options]
+
+Clear info about completed upgrades
+
+Options:
+  --version             show program's version number and exit
+  -h, --help            show this help message and exit
+  -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
+
+  Mandatory options:
+    -H/--host </programlisting>
+      </section>
+
+      <section id="json_clear_info">
+        <title>Configuring the JSON File</title>
+
+        <para>No JSON configuration file is needed to clear information about
+        completed upgrades of uCPE devices from the Enea uCPE Manager. The
+        <filename>clearCompletedUpgradesInfo</filename> Python module can be
+        run without a JSON file as a parameter.</para>
+      </section>
+
+      <section id="pymod_clear_info">
+        <title>Running the Python Module</title>
+
+        <para>The <filename>clearCompletedUpgradesInfo</filename> Python
+        module can be executed individually by running the following command
+        line:</para>
+
+        <programlisting>$ python clearCompletedUpgradesInfo.py -u admin -p admin -H localhost
+2020-02-28 12:51:55,861 - DEBUG: Started logging
+2020-02-28 12:51:55,862 - INFO: Clear info about completed upgrades
+2020-02-28 12:51:55,950 - DEBUG: Login successful on host 'localhost'
+2020-02-28 12:51:55,951 - DEBUG: Session token is: b7eb83e0-5a20-11ea-a3de-5652b3ac1c30
+2020-02-28 12:51:55,993 - INFO: Done
+2020-02-28 12:51:56,025 - DEBUG: Logging out and exiting...</programlisting>
+      </section>
+    </section>
   </section>
 
   <section id="test_harness">
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 28abdd3..3eefcfd 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
@@ -11,8 +11,8 @@
 
     <mediaobject>
       <imageobject>
-        <imagedata align="center" fileref="images/autofw_testh_overview.png"
-                   scale="40" />
+        <imagedata align="center" contentwidth="600"
+                   fileref="images/autofw_testh_overview.png" />
       </imageobject>
     </mediaobject>
   </figure>
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 2f430c3..a63dfda 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
@@ -44,8 +44,8 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata align="center"
-                       fileref="images/environment_basicsetup.png" scale="35" />
+            <imagedata align="center" contentwidth="600"
+                       fileref="images/environment_basicsetup.png" />
           </imageobject>
         </mediaobject>
       </figure>The following enviroment setup is needed for running all tests
@@ -122,9 +122,8 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata align="center"
-                       fileref="images/ChainedVNFsService_setup.png"
-                       scale="40" />
+            <imagedata align="center" contentwidth="600"
+                       fileref="images/ChainedVNFsService_setup.png" />
           </imageobject>
         </mediaobject>
       </figure></para>
@@ -159,8 +158,9 @@
 
     <orderedlist>
       <listitem>
-        <para>Unzip the <filename>nfvaccess&lt;version&gt;_af-th.zip</filename> archive
-        file, provided by Enea, on a supported host machine.</para>
+        <para>Unzip the
+        <filename>nfvaccess&lt;version&gt;_af-th.zip</filename> archive file,
+        provided by Enea, on a supported host machine.</para>
 
         <para>The directory in which the archive has been unpacked will be
         denoted as <literal>&lt;AF-TH-installdir&gt;</literal>.</para>
@@ -210,8 +210,8 @@
     </note>
 
     <para>After the initial setup, each session ends by closing the Python
-    virtual environment through running <literal>deactivate</literal>
-    from the <literal>&lt;AF-THinstall-dir&gt;</literal> directory.</para>
+    virtual environment through running <literal>deactivate</literal> from the
+    <literal>&lt;AF-THinstall-dir&gt;</literal> directory.</para>
 
     <para>Subsequent use of the installation requires activating the Python
     virtual enviroment before using the Automation Framework and Test Harness:
@@ -223,4 +223,4 @@
     <filename>setupuCPEManager.yml</filename> playbook with the corresponding
     JSON config for the new uCPE Manager instance.</para>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file
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 69d5f0e..557495a 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
@@ -27,7 +27,7 @@
       <title>Definitions</title>
 
       <tgroup cols="2">
-        <colspec align="center" />
+        <colspec align="left" />
 
         <thead>
           <row>
@@ -52,7 +52,7 @@
       <title>Acronyms</title>
 
       <tgroup cols="2">
-        <colspec align="center" />
+        <colspec align="left" />
 
         <thead>
           <row>