Final 2.2.3 edits.Enea_NFV_Access_2.2.3_RC6

Change-Id: Ic391ab17dd0ebd8483598be84eb9051aec5f0546
Signed-off-by: mrpa <miruna.paun@enea.com>

14 files changed, 386 insertions, 305 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 4f94422..2a4cc8a 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
@@ -12,7 +12,14 @@
     <para>The <literal>/device</literal> folder contains Python scripts for
     adding uCPE device(s), receiving uCPE events' reports, removing a uCPE
     device, waiting for a uCPE device to connect to the uCPE Manager, as well
-    as scripts for adding and removing an offline configuration store.</para>
+    as scripts for adding and removing an offline configuration store. This
+    folder also contains scripts for uploading and removing an NFVA image into 
+      the uCPE Manager, and for installing and activating a NFVA image on a uCPE
+    Device.</para>
+
+    <para>The <literal>/customScripts</literal> folder contains Python scripts
+    for uploading custom scripts onto the uCPE Manager and uCPE device(s), for
+    removing custom scripts from the uCPE Manager and uCPE device(s).</para>
 
     <para>The <literal>/network</literal> folder contains Python scripts for
     binding or unbinding a network interface to and from a uCPE device (DPDK
@@ -25,16 +32,19 @@
       <para>Commands within the network folder that include the option
       <emphasis role="bold">-o</emphasis> allow the user to perform the action
       in an offline configuration store alternative available for use at a
-      later setup time. All options contain either <emphasis
-      role="bold">-n</emphasis>, <emphasis role="bold">-o</emphasis> or both.
-      One of them must always be provided, if both are provided, -o has
-      priority, and -n is thus ignored.</para>
+      later setup time. Commands that include the <emphasis
+      role="bold">-n</emphasis> option refer to a uCPE device, with the
+      operation being performed on uCPE device. All options contain either
+      <emphasis role="bold">-n</emphasis>, <emphasis role="bold">-o</emphasis>
+      or both. One of them must always be provided, if both are provided, -o
+      has priority, and -n is thus ignored.</para>
     </note>
 
-    <para>The <literal>/unittestSuite</literal> folder contains Python
-    unit-test class and loader scripts for generating specific test cases for
-    the available Python scripts. The generated test cases are injected into
-    the Python unit-test suite class to be run using the Python unit-test
+    <para>The <literal>/unittestSuite</literal> folder contains JSON files for
+    complex scenarios (multiple operations), as well as Python unit-test class
+    and loader scripts for generating specific test cases for the available
+    Python scripts. The generated test cases are injected into the Python
+    unit-test suite class to be run using the Python unit-test
     framework.</para>
 
     <para>The <literal>/unittestSuite/config</literal> folder contains
@@ -43,6 +53,10 @@
     that must contain the test case name and arguments to be passed to the
     Python script for running the test case.</para>
 
+    <para>The <literal>/unittestSuite/vnf_config</literal> directory contains
+    symlinks for the Fortigate license file and for the
+    <literal>/vnf_config/fortigateImage</literal> folder. </para>
+
     <para>The <literal>/vnf</literal> folder contains Python scripts for
     onboarding and offboarding a VNF image, instantiating a VNF, controlling a
     VNF instance or destroying an existing one.</para>
@@ -107,7 +121,8 @@ Options:
 
         <para>Below is a sample unit-test configuration file, describing the
         Fortigate <emphasis role="bold">deployment</emphasis> scenario
-        <filename>fortigateDeploy.json</filename>:</para>
+        <filename>fortigateDeploy.json</filename>, found in
+        <literal>&lt;AF-TH-install-dir&gt;/automation_framework/unittestSuite</literal>:</para>
 
         <para><programlisting>[
    {
@@ -1346,78 +1361,6 @@ Options:
       </section>
     </section>
 
-    <section id="onboard_vnf_bundle">
-      <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>
-
-      <section id="script_opts_onbvnf">
-        <title>Script Options</title>
-
-        <programlisting>$ python onboardVNF.py -h
-Usage: onboardVNF.py [options]
-
-Onboard a VNF to Enea 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 FTPUSERNAME, --ftpUsername=FTPUSERNAME
- Username for FTP
- -w FTPPASSWORD, --ftpPassword=FTPPASSWORD
- FTP password
- -P FTPPORT, --ftpPort=FTPPORT
- FTP port
- -b VNFBUNDLE, --bundle=VNFBUNDLE
- File name of VNF bundle in ZIP format
-
- Mandatory options:
- -H/--host, -b/--bundle</programlisting>
-      </section>
-
-      <section id="json_onbvnf">
-        <title>Configuring the JSON File</title>
-
-        <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>[
- {
- "name": "Onboarding Fortigate VNF ",
- "args": "-b ../../vnf_images/Fortigate.zip"
- }
-]</programlisting></para>
-      </section>
-
-      <section id="pymod_onbvnf">
-        <title>Running the Python Module</title>
-
-        <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
-2019-02-25 16:00:53,890 - DEBUG: Started logging
-2019-02-25 16:00:53,890 - INFO: Onboard VNF
-2019-02-25 16:00:53,985 - DEBUG: Login successful on host 'localhost'
-2019-02-25 16:00:53,985 - DEBUG: Session token is: c421cd03-3905-11e9-a81f525400d08e1d
-2019-02-25 16:00:53,994 - DEBUG: FTP file '../../vnf_images/Fortigate.zip' on host
-'localhost', port '2021'
-2019-02-25 16:00:54,229 - DEBUG: Onboard VNF: Fortigate
-2019-02-25 16:00:56,836 - INFO: Done
-2019-02-25 16:00:56,861 - DEBUG: Logging out and exiting...</programlisting>
-      </section>
-    </section>
-
     <section id="onboard_vnf_image">
       <title>Onboarding a VNF Image Raw</title>
 
@@ -2562,34 +2505,41 @@ Options:
     <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
+    needed by Automation Framework python modules and installing
+    Ansible.</para>
+
+    <para>The <literal>/playbooks</literal> directory contains all the
+    implemented Ansible Playbooks. For more details please refer to the <olink
+    targetdoc="book_enea_nfv_access_system_test_specification"
+    targetptr="sample_testcases">Sample Test Cases Chapter in the <xi:include
+    href="../../s_docbuild/olinkdb/pardoc-names.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xpointer="element(book_enea_nfv_access_system_test_specification/1)" /></olink>
+    Manual.</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
+    in the TH.</para>
+
+    <para>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, 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>
+
+    <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>
+
+    <para>The <literal>/log</literal> 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,
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 18e7048..68e6f12 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
@@ -159,8 +159,8 @@
     <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>
+        <filename>Enea_NFV_Access_AF-TH_&lt;version&gt;-build&lt;build_number&gt;.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>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/128t_vnf_router.xml b/doc/book-enea-nfv-access-example-usecases/doc/128t_vnf_router.xml
index 9b63248..d58f101 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/128t_vnf_router.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/128t_vnf_router.xml
@@ -29,6 +29,38 @@
         <para>1 LAN interface for 128T.</para>
       </listitem>
     </itemizedlist>
+
+    <para>The following files are needed for this example use-case:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>128T router VNF image. Please contact 128 Technology to get a
+        VNF image and its license file.</para>
+      </listitem>
+
+      <listitem>
+        <para>cloud-init iso image. Please check <olink
+        targetdoc="book_enea_nfv_access_example_usecases"
+        targetptr="appendix_one_cust">Appendix A: How to create a 128T
+        cloud-init iso image (day-0 configuration) in the <xi:include
+        href="../../s_docbuild/olinkdb/pardoc-names.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_nfv_access_example_usecases/1)" /></olink>
+        Manual for more details.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>For data path validation, it may be required to generate a new
+      cloud-init image to match your network configuration. Please check
+      <olink targetdoc="book_enea_nfv_access_example_usecases"
+      targetptr="appendix_one_cust">Appendix A: How to create 128T cloud-init
+      iso image (day-0 configuration) in the <xi:include
+      href="../../s_docbuild/olinkdb/pardoc-names.xml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xpointer="element(book_enea_nfv_access_example_usecases/1)" /></olink>
+      Manual for more details.</para>
+    </note>
   </section>
 
   <section id="vnf_router_cust">
@@ -50,11 +82,6 @@
       <para><emphasis role="bold">Configuring Network Interfaces on uCPE
       devices:</emphasis><orderedlist>
           <listitem>
-            <para>Log into the uCPE Manager with both username and password
-            values: <literal>admin</literal>.</para>
-          </listitem>
-
-          <listitem>
             <para>Add the trgt uCPE device into the uCPE Manager:
             <literal>Devices -&gt; Manage -&gt; Add</literal>.</para>
 
@@ -375,8 +402,8 @@
       <para><emphasis role="bold">Onboarding the VNFs:</emphasis></para>
 
       <para>Onboard the VM Image through <literal>VNF -&gt; Descriptors -&gt;
-      On-board -&gt; VM Image</literal>, and fill in the required fields with
-      the following values:</para>
+      On-board</literal>, and fill in the required fields with the following
+      values:</para>
 
       <table>
         <title>VM Image Details</title>
@@ -637,6 +664,11 @@
           </tbody>
         </tgroup>
       </table>
+
+      <note>
+        <para>To procure the VNF image files and their licenses, please
+        contact each respective VNF provider.</para>
+      </note>
     </section>
 
     <section id="uc_test_cust_router">
@@ -661,10 +693,7 @@
       <para>In order to validate the data path, connect a test machine to the
       LAN physical port, assign the static IP and a route:<programlisting>&gt; ifconfig eth3 192.168.64.3 netmask 255.255.255.0
 &gt; ip route add default via 192.168.64.1  dev eth3
-&gt; ping 8.8.8.8</programlisting>For data path validation, it may be required
-      to generate a new cloud-init image to match your network configuration.
-      Please check Appendix A: How to create 128T cloud-init iso image (day-0
-      configuration), for more details.</para>
+&gt; ping 8.8.8.8</programlisting></para>
     </section>
 
     <section id="cleanup_custone">
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/appendix_2.xml b/doc/book-enea-nfv-access-example-usecases/doc/appendix_2.xml
index b0a90b2..2458d99 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/appendix_2.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/appendix_2.xml
@@ -6,8 +6,8 @@
   used as the VNF image on NFV Access.</para>
 
   <note>
-    <para>Follow the <filename>128tISO-Install.pdf</filename> document and
-    keep in mind a Virtual Machine was used instead of a physical host.</para>
+    <para>Keep in mind a Virtual Machine was used instead of a physical
+    host.</para>
   </note>
 
   <para><emphasis role="bold">Prerequisites:</emphasis><itemizedlist>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml b/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml
index b5e7803..36c7114 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml
@@ -166,7 +166,7 @@
 
         <listitem>
           <para><emphasis role="bold">Cloud-init content file</emphasis>: Add
-          a license file entry.</para>
+          a file entry where Path: license.</para>
         </listitem>
       </itemizedlist>
 
@@ -249,13 +249,13 @@
 
       <para>The FortiGate VNF management interface is accessible through the
       WAN interface. The WAN IP address can be used from a web browser on the
-      Lab Machine to access the FortiGate VNF Management Web UI. Please check
+      Lab Machine to access the FortiGate VNF Management Web UI. See section
       <olink targetdoc="book_enea_nfv_access_example_usecases"
-      targetptr="fortigate_webmg">FortiGate VNF web management<xi:include
-      href="../../s_docbuild/olinkdb/pardoc-names.xml"
+      targetptr="fortigate_webmg">FortiGate VNF web management in the
+      <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
       xmlns:xi="http://www.w3.org/2001/XInclude"
       xpointer="element(book_enea_nfv_access_example_usecases/1)" /></olink>
-      for more information.</para>
+      Manual for more information.</para>
     </section>
   </section>
 
@@ -343,13 +343,13 @@
 
       <orderedlist>
         <listitem>
-          <para>Connect the <literal>VNFMgr</literal> interfaces to the Lab
-          Network for VNF management access.</para>
+          <para>Connect the <literal>VNF Management</literal> interfaces to
+          the Lab Network for VNF management access.</para>
         </listitem>
 
         <listitem>
-          <para>Directly connect the <literal>WAN</literal> interfaces back to
-          back (using a cable) or connected via VPN.</para>
+          <para>Connect the <literal>WAN</literal> interfaces back to back or
+          via VPN.</para>
         </listitem>
 
         <listitem>
@@ -434,7 +434,7 @@
 
         <listitem>
           <para><emphasis role="bold">Cloud-init content file</emphasis>: Add
-          a license file entry.</para>
+          a file entry where Path: license.</para>
         </listitem>
       </itemizedlist>
 
@@ -502,9 +502,8 @@
       <literal>sdwan1</literal> example configuration file.</para>
 
       <para>To complete the branch-to-branch setup, configure <literal>uCPE
-      device 2</literal> in the same way as <literal>uCPE device 1</literal>.
-      Make sure to use the <literal>sdwan2</literal> configuration file for
-      the second VNF instantiation.</para>
+      device 2</literal> in the same way as <literal>uCPE device
+      1</literal>.</para>
 
       <note>
         <para>The names of the ports used during instantiation need to be the
@@ -520,15 +519,13 @@
       be established between the two uCPE devices. The Test Machines can be
       connected to the LAN interface on each uCPE device.</para>
 
-      <para>The connected Test Machine can be a laptop or a uCPE device that
-      has one interface configured to get a dynamic IP from a DHCP server. The
-      <command>dhclient &lt;interface&gt;</command> command can be used to
-      request an IP address.</para>
-
       <note>
-        <para>The received IP must be in the 172.16.1.2 - 172.16.1.255 range
-        for Test Machine-1 and in the 172.16.2.2 - 172.16.2.255 range for Test
-        Machine-2.</para>
+        <para>The connected Test Machine can be a laptop or a uCPE device that
+        has one interface configured to get a dynamic IP from a DHCP server.
+        The <command>dhclient &lt;interface&gt;</command> command can be used
+        to request an IP address.The received IP must be in the 172.16.1.2 -
+        172.16.1.255 range for Test Machine-1 and in the 172.16.2.2 -
+        172.16.2.255 range for Test Machine-2.</para>
       </note>
 
       <para>The Test Machine connected to <literal>uCPE device 1</literal>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/service_chaining_128t_fortigate.xml b/doc/book-enea-nfv-access-example-usecases/doc/service_chaining_128t_fortigate.xml
index 4719399..43c3fce 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/service_chaining_128t_fortigate.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/service_chaining_128t_fortigate.xml
@@ -2,12 +2,9 @@
 <chapter id="service_chaining_128t_fortigate">
   <title>Service Chaining 128T - Fortigate Example Use-case</title>
 
-  <para>The term service chaining or service function chaining (SFC) is used
-  to describe the definition and instantiation of an ordered list of instances
-  of such service functions and the subsequent "steering" of traffic flows
-  through those service functions. The set of enabled service function chains
-  reflects operator service offerings and is designed in conjunction with
-  application delivery and service and network policy.</para>
+  <para>The following is an example of how to setup and configure a service
+  chain on top of the Enea NFV Access virtualization platform, using the
+  following commercial VNFs: 128T router and FortiGate.</para>
 
   <section id="prereq_serv_chain_cust">
     <title>Prerequisites</title>
@@ -45,6 +42,36 @@
         Firewall and vRouter.</para>
       </listitem>
     </itemizedlist>
+
+    <para>The following files are needed for this example use-case:</para>
+
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>FortiGate VNF image. Please contact Fortinet to get a VNF image
+        and its license file.</para>
+      </listitem>
+
+      <listitem>
+        <para>128T router VNF image. Please contact 128 Technology to get a
+        VNF image and its license file.</para>
+      </listitem>
+
+      <listitem>
+        <para>Cloud-init iso image. Please check <olink
+        targetdoc="book_enea_nfv_access_example_usecases"
+        targetptr="appendix_one_cust">Appendix A: How to create a 128T
+        cloud-init iso image (day-0 configuration) in the <xi:include
+        href="../../s_docbuild/olinkdb/pardoc-names.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_nfv_access_example_usecases/1)" /></olink>
+        Manual for more details.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>To procure the VNF image files and their licenses, please contact
+      each respective VNF provider.</para>
+    </note>
   </section>
 
   <section id="ser_chain_uc">
@@ -66,11 +93,6 @@
       <para><emphasis role="bold">Configuring Network Interfaces on uCPE
       devices:</emphasis><orderedlist>
           <listitem>
-            <para>Log into the uCPE Manager with both username and password
-            values: <literal>admin</literal>.</para>
-          </listitem>
-
-          <listitem>
             <para>Add the trgt uCPE device into the uCPE Manager:
             <literal>Devices -&gt; Manage -&gt; Add</literal>, and fill in the
             required fields with the following data:</para>
@@ -225,10 +247,8 @@
 
             <para>Add the OVS bridges by selecting the trgt device then:
             <literal>Configuration -&gt; OpenVSwitch -&gt; Bridges -&gt;
-            Add</literal>.</para>
-
-            <para>Fill in the required fields for each bridge with the
-            following data from each table:</para>
+            Add</literal>. Fill in the required fields for each bridge with
+            the following data from each table:</para>
 
             <table>
               <title>ibm_br Bridge Details</title>
@@ -276,6 +296,8 @@
               </tgroup>
             </table>
 
+            <para></para>
+
             <table>
               <title>vnf_mgmt_br Bridge Details</title>
 
@@ -443,8 +465,8 @@
       <para><emphasis role="bold">Onboarding the VNFs:</emphasis></para>
 
       <para>Onboard the 128T VNF VM Image through <literal>VNF -&gt;
-      Descriptors -&gt; On-board -&gt; VM Image</literal>, and fill in the
-      required fields with the following values:</para>
+      Descriptors -&gt; On-board</literal>, and fill in the required fields
+      with the following values:</para>
 
       <table>
         <title>128T VM Image Details</title>
@@ -600,8 +622,8 @@
       </note>
 
       <para>Onboard the Fortigate VNF VM Image through <literal>VNF -&gt;
-      Descriptors -&gt; On-board -&gt; VM Image</literal>, and fill in the
-      required fields with the following values:</para>
+      Descriptors -&gt; On-board</literal>, and fill in the required fields
+      with the following values:</para>
 
       <table>
         <title>Fortigate VM Image Details</title>
@@ -626,7 +648,7 @@
               <entry>VM image file</entry>
 
               <entry><literal>fortios.qcow2</literal>. Please make sure to
-              contact Fortigate for an official Fortigate KVM image.</entry>
+              contact Fortinet for an official FortiGate KVM image.</entry>
             </row>
 
             <row>
@@ -822,10 +844,7 @@
             <row>
               <entry>Cloud Init File</entry>
 
-              <entry><literal>centos_128t_internet_ci.iso</literal>. Example
-              image provided. Please see Appendix A for details on how to
-              change the configuration and create a new cloud-init iso
-              image.</entry>
+              <entry><literal>centos_128t_internet_ci.iso</literal>.</entry>
             </row>
 
             <row>
@@ -873,6 +892,11 @@
         </tgroup>
       </table>
 
+      <note>
+        <para>To procure the VNF image files and their licenses, please
+        contact each respective VNF provider.</para>
+      </note>
+
       <para>Instantiate the Fortigate VNF by selecting the trgt device, then
       <literal>VNF -&gt; Instances -&gt; Add</literal>.</para>
 
@@ -936,8 +960,7 @@
             <row>
               <entry>License File</entry>
 
-              <entry><literal>FGVM08TM00001.lic</literal>. Please make sure to
-              use a valid license file (.lic) received from Fortinet.</entry>
+              <entry>The FortiGate license file provided by Fortinet.</entry>
             </row>
 
             <row>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/vnf_chaining.xml b/doc/book-enea-nfv-access-example-usecases/doc/vnf_chaining.xml
index b8b0d5e..8b82337 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/vnf_chaining.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/vnf_chaining.xml
@@ -2,6 +2,13 @@
 <chapter id="vnf_chaining">
   <title>VNF Chaining Example Use-case</title>
 
+  <para>The term service chaining or service function chaining (SFC) is used
+  to describe the definition and instantiation of an ordered list of instances
+  of such service functions and the subsequent "steering" of traffic flows
+  through those service functions. The set of enabled service function chains
+  reflects operator service offerings and is designed in conjunction with
+  application delivery and service and network policy.</para>
+
   <para>The following is an example of how to setup and configure a
   branch-to-branch service comprised on two commercial VNFs (SD-WAN +
   Firewall). This service will run in a service chain on top of the Enea NFV
@@ -40,11 +47,6 @@
 
       <para>The following files are needed for this example use-case:</para>
 
-      <note>
-        <para>To procure the VNF image files and their licenses, please
-        contact each respective VNF provider.</para>
-      </note>
-
       <itemizedlist>
         <listitem>
           <para>Fortigate VNF image file.</para>
@@ -55,6 +57,10 @@
         </listitem>
 
         <listitem>
+          <para>vSRX-Site&lt;x&gt;.iso Cloud-init files.</para>
+        </listitem>
+
+        <listitem>
           <para>VNF Configuration files, provided with your Enea NFV Access
           Release:</para>
 
@@ -64,15 +70,18 @@
             </listitem>
 
             <listitem>
-              <para><filename>vSRX-Site&lt;x&gt;.iso</filename>.</para>
-            </listitem>
-
-            <listitem>
               <para><filename>FortiFW-Site&lt;x&gt;.conf</filename>.</para>
             </listitem>
           </itemizedlist>
         </listitem>
       </itemizedlist>
+
+      <note>
+        <para>To procure the VNF image files and their licenses, please
+        contact each respective VNF provider. To create the
+        vSRX-Site&lt;x&gt;.iso file, please follow the documentation provided
+        by Juniper.</para>
+      </note>
     </section>
 
     <section id="exam_setup_chain">
@@ -205,8 +214,8 @@
             </listitem>
 
             <listitem>
-              <para>Add <literal>license</literal> as the Cloud-Init content
-              in the Cloud-Init tab files.</para>
+              <para>In the Cloud-init content files field add an entry where
+              <literal>Path: license</literal>.</para>
             </listitem>
           </itemizedlist>
         </listitem>
@@ -222,11 +231,6 @@
             <listitem>
               <para>Use <filename>vSRX-Site1.iso</filename> as the Cloud-Init
               file.</para>
-
-              <note>
-                <para>Please follow Juniper's documentation to create the
-                <filename>vSRX-Site1.iso</filename> file.</para>
-              </note>
             </listitem>
 
             <listitem>
@@ -239,7 +243,7 @@
             <listitem>
               <para>Add virtual interfaces:</para>
 
-              <itemizedlist>
+              <itemizedlist spacing="compact">
                 <listitem>
                   <para>Management interface added to
                   <literal>vnf_mgmt_br</literal>.</para>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml b/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml
index 47c4ea4..649a80d 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml
@@ -253,6 +253,14 @@ node0.1048576kB = 3 </programlisting>
     root filesystem. When the installation is complete, the uCPE device is
     automatically rebooted into Enea NFV Access Run Time Platform.</para>
 
+    <note>
+      <para>The <literal>.hddimg</literal>, <literal>initramfs</literal>, and
+      <literal>bzImage</literal> files are available in the
+      Enea_NFV_Access_Run_Time_Platform_
+      &lt;processor&gt;_&lt;version&gt;-&lt;build_number&gt;.tar.gz file you
+      downloaded with your release.</para>
+    </note>
+
     <section id="bare_meta_prov_prereq">
       <title>Prerequisites</title>
 
@@ -303,9 +311,10 @@ node0.1048576kB = 3 </programlisting>
 
         <listitem>
           <para>Compress the Enea NFV Access Run Time Platform
-          <literal>hddimg</literal> image for the uCPE device architecture
-          using <literal>gzip</literal> and copy the resulting
-          <literal>hddimg.gz</literal> file to the HTTP server.</para>
+          <literal>.hddimg</literal> image for the uCPE
+          device architecture using <literal>gzip</literal> and copy the
+          resulting <literal>hddimg.gz</literal> file to the HTTP
+          server.</para>
         </listitem>
       </orderedlist>
 
@@ -348,14 +357,12 @@ node0.1048576kB = 3 </programlisting>
 
         <para>Installation Configuration File Example:</para>
 
-        <programlisting>
- image_url = http://192.168.1.100/enea-nfv-access-xeon-d.hddimg.gz
- install_drive = /dev/sda
+        <programlisting>image_url = http://192.168.1.100/enea-nfv-access-xeon-d.hddimg.gz
+install_drive = /dev/sda</programlisting>
 
-</programlisting>
-      <note>
-        <para>The installation configuration file needs to use the Linux end-of-line
-        format (\n), not the Windows format (\r\n).</para>
+        <note>
+          <para>The installation configuration file needs to use the Linux
+          end-of-line format (\n), not the Windows format (\r\n).</para>
       </note>
       </section>
 
diff --git a/doc/book-enea-nfv-access-getting-started/doc/getting_started_nfv_access.xml b/doc/book-enea-nfv-access-getting-started/doc/getting_started_nfv_access.xml
index bb7b525..d46b4c7 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/getting_started_nfv_access.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/getting_started_nfv_access.xml
@@ -8,16 +8,24 @@
     <title>Enea NFV Access Run Time Platform Installer</title>
 
     <para>The current release supports two methods of installation:</para>
-    
+
     <itemizedlist>
-      <listitem><para>Manual installation from a USB stick using the Enea NFV Access Web-installer,
-      which guarantees a clean installation of NFV Access on a uCPE device.</para></listitem>
-      <listitem><para>Mass installation and automated deployment using
-        Bare Metal Provisioning.</para></listitem>
+      <listitem>
+        <para>Manual installation from a USB stick using the Enea NFV Access
+        Web-installer, which guarantees a clean installation of NFV Access on
+        a uCPE device.</para>
+      </listitem>
+
+      <listitem>
+        <para>Mass installation and automated deployment using Bare Metal
+        Provisioning.</para>
+      </listitem>
     </itemizedlist>
-      
-      <para>For more information about Bare Metal Provisioning please refer 
-        to <xref linkend="bare_meta_prov">5.3, Bare Metal Provisioning"</xref>.</para>
+
+    <para>For more information about Bare Metal Provisioning please refer to
+    <xref linkend="bare_meta_prov">
+         5.3, Bare Metal Provisioning" 
+      </xref>.</para>
 
     <section id="prereq">
       <title>Prerequisites</title>
@@ -202,149 +210,167 @@ rootfs_destination=</programlisting></para>
     <section id="auto_installer">
       <title>Creating a bootable USB stick</title>
 
-      <para>In order to install the Enea NFV Access Run Time Platform, you must
-      first create a bootable USB stick with the image you intend to
+      <para>In order to install the Enea NFV Access Run Time Platform, you
+      must first create a bootable USB stick with the image you intend to
       install. Follow the example below to proceed.</para>
 
+      <note>
+        <para>The <literal>.hddimg</literal> image is available in the
+        Enea_NFV_Access_Run_Time_Platform_
+        &lt;processor&gt;_&lt;version&gt;-build&lt;build_number&gt;.tar.gz file you
+        downloaded with your release.</para>
+      </note>
+
       <para><emphasis role="bold">Create a bootable USB stick
       image</emphasis></para>
 
       <orderedlist>
         <listitem>
-          <para>Copy the HDDIMG image file provided by Enea, onto a
-          development machine.</para>
+          <para>Copy the <literal>.hddimg</literal> image file provided by
+          Enea, onto a development machine.</para>
         </listitem>
 
         <listitem>
           <para>Connect the USB stick to the development machine and identify
-          the device name given by the system with
-          <command>lsblk</command>:
-            <programlisting>NAME         MAJ:MIN          RM    SIZE    RO TYPE MOUNTPOINT
+          the device name given by the system with <command>lsblk</command>:
+          <programlisting>NAME         MAJ:MIN          RM    SIZE    RO TYPE MOUNTPOINT
 sda            8:0            1     28.7G   0  disk
 sdb            8:0            0     111.8G  0  disk
 |-sdb1         8:1            0     111.8G  0  part</programlisting></para>
         </listitem>
 
         <listitem>
-          <para>Copy the HDDIMG image onto the USB stick, e.g:
-            <programlisting>sudo dd if=./enea-nfv-access-&lt;machine&gt;.hddimg \
+          <para>Copy the <literal>.hddimg</literal> image onto the USB stick,
+          e.g: <programlisting>sudo dd if=./enea-nfv-access-&lt;machine&gt;.hddimg \
 of=/dev/sdb bs=4M conv=fsync</programlisting></para>
         </listitem>
       </orderedlist>
 
       <para>Where <filename>enea-nfv-access-&lt;machine&gt;.hddimg
-      </filename>is the <literal>.hddimg</literal> file and <literal>sdb</literal> is the
-      assigned USB device name.</para>
+      </filename>is the <literal>.hddimg</literal> file and
+      <literal>sdb</literal> is the assigned USB device name.</para>
     </section>
 
     <section id="install_ena_stick">
       <title>Installing Enea NFV Access</title>
-      
+
       <para><emphasis role="bold">How to install the Enea NFV Access Run Time
       Platform using a bootable USB stick image</emphasis></para>
 
       <orderedlist>
         <listitem>
-          <para>Plug the USB stick into the uCPE device. Connect a laptop directly into one of the ports that will
-          not later be chosen as a WAN port. No other ports should be connected.</para>
+          <para>Plug the USB stick into the uCPE device. Connect a laptop
+          directly into one of the ports that will not later be chosen as a
+          WAN port. No other ports should be connected.</para>
         </listitem>
 
         <listitem>
-          <para>Power up the uCPE device and boot the USB stick. Verify that the
-          USB stick is selected from the BIOS boot menu.</para>
+          <para>Power up the uCPE device and boot the USB stick. Verify that
+          the USB stick is selected from the BIOS boot menu.</para>
         </listitem>
 
         <listitem>
-          <para>Once the USB stick is properly booted, the Web-installer application starts
-            automatically and can be accessed in a web browser at <literal>http://172.16.1.1</literal> (port 80).
-          </para>
-          
-          <para>On the first page of the Web-installer, the user should fill in:</para>
+          <para>Once the USB stick is properly booted, the Web-installer
+          application starts automatically and can be accessed in a web
+          browser at <literal>http://172.16.1.1</literal> (port 80).</para>
+
+          <para>On the first page of the Web-installer, the user should fill
+          in:</para>
 
           <itemizedlist>
             <listitem>
-              <para><emphasis role="bold">The uCPE Manager IP Address</emphasis>.</para>
+              <para><emphasis role="bold">The uCPE Manager IP
+              Address</emphasis>.</para>
             </listitem>
 
             <listitem>
-              <para><emphasis role="bold">The Device ID</emphasis>. The unique identifier of the
-              uCPE device.</para>
-              
+              <para><emphasis role="bold">The Device ID</emphasis>. The unique
+              identifier of the uCPE device.</para>
             </listitem>
 
             <listitem>
-              <para><emphasis role="bold">Customer Tags</emphasis>. They are used for  
-              <link linkend="zero_touch_prov">Zero Touch Provisining (ZTP)</link> and can be left 
-                empty. What can be entered here (as needed), are the tag(s) specified when 
-                creating an offline configuration in the uCPE Manager.</para>
+              <para><emphasis role="bold">Customer Tags</emphasis>. They are
+              used for <link linkend="zero_touch_prov">Zero Touch Provisining
+              (ZTP)</link> and can be left empty. What can be entered here (as
+              needed), are the tag(s) specified when creating an offline
+              configuration in the uCPE Manager.</para>
             </listitem>
           </itemizedlist>
 
-          <para>On the second page of the Web-installer, the user should fill in:</para>
+          <para>On the second page of the Web-installer, the user should fill
+          in:</para>
 
-          <itemizedlist>            
+          <itemizedlist>
             <listitem>
-              <para><emphasis role="bold">The Layer 3 configuration of WAN Interface(s)</emphasis>. 
-                Static or Dynamic IP must be specified.</para>
-              
-              <para>During network configuration, WAN cables will be plugged into the device
-              in order to identify ports and make them available for configuration. Each 
-              port with a physically connected cable will be automatically set as a WAN port and must be
-              configured (DHCP is the default setting). The user needs to connect the same quantity of 
-                cables as the number of WAN ports that he wishes to configure. No LAN ports should be 
-                connected nor configured at this time. The configured WAN cables cannot be removed 
-                after being configured.</para>
-
-              <note>
-                <para>The LAN port used to access the Web-installer from the laptop will not be shown
-              and cannot be configured.</para></note>      
+              <para><emphasis role="bold">The Layer 3 configuration of WAN
+              Interface(s)</emphasis>. Static or Dynamic IP must be
+              specified.</para>
+
+              <para>During network configuration, WAN cables will be plugged
+              into the device in order to identify ports and make them
+              available for configuration. Each port with a physically
+              connected cable will be automatically set as a WAN port and must
+              be configured (DHCP is the default setting). The user needs to
+              connect the same quantity of cables as the number of WAN ports
+              that he wishes to configure. No LAN ports should be connected
+              nor configured at this time. The configured WAN cables cannot be
+              removed after being configured.</para>
+
+              <note>
+                <para>The LAN port used to access the Web-installer from the
+                laptop will not be shown and cannot be configured.</para>
+              </note>
             </listitem>
 
-            <listitem>
-              <para><emphasis role="bold">The Management Interface</emphasis>. The interface that 
-                will be used by the uCPE Manager to communicate with the device.</para>
-              
-            </listitem>
+            <listitem>
+              <para><emphasis role="bold">The Management Interface</emphasis>.
+              The interface that will be used by the uCPE Manager to
+              communicate with the device.</para>
+            </listitem>
           </itemizedlist>
         </listitem>
 
         <listitem>
-          <para>When the user has completed the configuration steps in the Web-installer, NFV Access
-          is installed on the hard drive. The largest drive found on the device will be used for
-          installation.</para>
+          <para>When the user has completed the configuration steps in the
+          Web-installer, NFV Access is installed on the hard drive. The
+          largest drive found on the device will be used for
+          installation.</para>
         </listitem>
-        
       </orderedlist>
     </section>
 
     <section id="boot_ena">
       <title>Booting NFV Access</title>
 
-      <para>When the installation has finished successfully, the user should remove the USB stick 
-      before confirming the reboot of the device in Web-installer and ensure that BIOS is configured
-      to boot from the hard drive.</para>
+      <para>When the installation has finished successfully, the user should
+      remove the USB stick before confirming the reboot of the device in
+      Web-installer and ensure that BIOS is configured to boot from the hard
+      drive.</para>
+
+      <para>When configured with the Web-installer GUI, the uCPE device
+      start-up sequence will configure the interfaces accordingly and try to
+      register the device in the uCPE manager. If connectivity is established
+      with the uCPE manager server and a device with a matching Device ID is
+      found, the configuration is successful, and the connection is
+      established.</para>
 
-      <para>When configured with the Web-installer GUI, the uCPE device start-up sequence will 
-        configure the interfaces accordingly and try to register the device in the uCPE manager. 
-        If connectivity is established with the uCPE manager server and a device with a matching 
-        Device ID is found, the configuration is successful, and the connection is established.</para>
-              
       <note>
-        <para>If NFV Access was installed by Bare Metal Provisioning, the Web-installer will launch at
-        start-up expecting the user to provide the post-installation configuration. The Web-installer will
-        be launched on port 80 for post-installation configuration: <literal>
+        <para>If NFV Access was installed by Bare Metal Provisioning, the
+        Web-installer will launch at start-up expecting the user to provide
+        the post-installation configuration. The Web-installer will be
+        launched on port 80 for post-installation configuration: <literal>
         http://172.16.1.1</literal>.</para>
       </note>
 
-      <para>In case of failure, the user should remove all WAN cables, re-attach the laptop, reboot 
-        the device and then access the Web-installer on <literal>http://172.16.1.1</literal>.
-      </para>
-      
-      <note>      
-        <para>After having established a successful connection with the uCPE Manager, the user will 
-        connect any LAN cable(s) that should be connected to the device.
-        </para>
-      </note>      
+      <para>In case of failure, the user should remove all WAN cables,
+      re-attach the laptop, reboot the device and then access the
+      Web-installer on <literal>http://172.16.1.1</literal>.</para>
+
+      <note>
+        <para>After having established a successful connection with the uCPE
+        Manager, the user will connect any LAN cable(s) that should be
+        connected to the device.</para>
+      </note>
     </section>
 
     <section condition="hidden" id="examples">
@@ -684,4 +710,4 @@ ssh root@&lt;target_ip&gt; "cd /mnt/sda6; tar -zxf -"</programlisting>
       </note>
     </section>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml b/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml
index 818bd52..dda71bb 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/getting_started_ucpe_manager.xml
@@ -228,11 +228,11 @@ userdel postgres</programlisting>
             </listitem>
 
             <listitem>
-              <para><literal>configureHA.sh</literal></para>
+              <para><filename>configureHA.sh</filename></para>
             </listitem>
 
             <listitem>
-              <para><filename>ucpemanager-x.y-Buildz-Linux.tar.gz</filename></para>
+              <para><filename>Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename></para>
             </listitem>
 
             <listitem>
@@ -244,7 +244,8 @@ userdel postgres</programlisting>
         <listitem>
           <para>Run the following command:</para>
 
-          <programlisting>./install.sh /opt/ems ucpemanager-x.y-Buildz-Linux.tar.gz</programlisting>
+          <programlisting>./install.sh /opt/ems \
+            Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programlisting>
         </listitem>
       </orderedlist>
 
@@ -321,7 +322,7 @@ userdel postgres</programlisting>
       additional argument as shown below:</para>
 
       <programlisting>./install.sh \
-      /opt/ems ucpemanager-x.y-Buildz-Linux.tar.gz  \
+      /opt/ems Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz  \
       SystemBackup_MMMDD_YYYY_HHMM_SS.zip</programlisting>
 
       <para>The other steps are exactly the same as specified in the
@@ -350,7 +351,7 @@ userdel postgres</programlisting>
             </listitem>
 
             <listitem>
-              <para><filename>ucpemanager-x.y-Buildz-Linux.tar.gz</filename></para>
+              <para><filename>Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename></para>
             </listitem>
           </itemizedlist>
         </listitem>
@@ -358,7 +359,8 @@ userdel postgres</programlisting>
         <listitem>
           <para>Run the following command:</para>
 
-          <programlisting>./upgrade.sh /opt/ems ucpemanager-x.y-Buildz-Linux.tar.gz</programlisting>
+          <programlisting>./upgrade.sh /opt/ems \
+            Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programlisting>
         </listitem>
       </orderedlist>
 
@@ -1298,6 +1300,13 @@ userdel postgres</programlisting>
       Uploaded Successfully</literal> appears on the File Upload
       Screen.</para>
 
+      <note>
+        <para>The image file of type <literal>rootfs.ostree.tar.bz2</literal>
+        is available in the
+        Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz
+        file you downloaded with your release.</para>
+      </note>
+
       <section id="upload_image">
         <title>Image Library</title>
 
@@ -1320,7 +1329,7 @@ userdel postgres</programlisting>
             to the image file (must be of type
             <literal>rootfs.ostree.tar.bz2</literal>). Select the target
             hardware platform corresponding to the image being uploaded
-            (xeon-d or atomc-3000).</para>
+            (xeon-d or atom-c3000).</para>
           </listitem>
 
           <listitem>
diff --git a/doc/book-enea-nfv-access-release-info/doc/about_release.xml b/doc/book-enea-nfv-access-release-info/doc/about_release.xml
index ed7394c..ef46843 100644
--- a/doc/book-enea-nfv-access-release-info/doc/about_release.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/about_release.xml
@@ -20,19 +20,19 @@
 
     <itemizedlist>
       <listitem>
-        <para>Enea_NFV_Access_Run_Time_Platform_XeonD_2.2.3.tar.gz</para>
+        <para>Enea_NFV_Access_Run_Time_Platform_C3000_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</para>
       </listitem>
 
       <listitem>
-        <para>Enea_NFV_Access_Run_Time_Platform_C3000_2.2.3.tar.gz</para>
+        <para>Enea_NFV_Access_Run_Time_Platform_XeonD_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</para>
       </listitem>
 
       <listitem>
-        <para>ucpeManager_2.2.3_b1-CentOS.tar.gz</para>
+        <para>Enea_NFV_Access_AF-TH_&lt;version&gt;-build&lt;build_number&gt;.zip</para>
       </listitem>
 
       <listitem>
-        <para>nfvaccess2.2.3_af-th.zip (Automation and Test Harness)</para>
+        <para>Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</para>
       </listitem>
 
       <listitem>
diff --git a/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml b/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml
index 007c150..c1d7de5 100644
--- a/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml
@@ -87,6 +87,13 @@
     </listitem>
 
     <listitem>
+      <para><remark>ELCCR-847</remark>The Juniper VNF cannot be instantiated
+      on the XeonD architecture because the domain XML file cannot be modified
+      prior to creating a Virtual Machine. This impacts all Examples Use Cases
+      and AF&amp;TH Tests where Juniper VNF is used.</para>
+    </listitem>
+
+    <listitem>
       <para><remark>LXCR-????</remark>The Call Home functionality does not
       support having multiple interfaces/routes that go from the device to the
       uCPE Manager.</para>
diff --git a/doc/book-enea-nfv-access-release-info/doc/main_changes.xml b/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
index c373d39..a9a360c 100644
--- a/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
@@ -12,7 +12,13 @@
   <section id="relinfo-changes-other">
     <title>New Features</title>
 
-    <para>No new features were added in this release.</para>
+    <itemizedlist>
+      <listitem><para>Added support for running the uCPE Manager behind a NAT.</para></listitem>
+      <listitem><para>The Domain Upgrade Script supplied during VNF instantiation is now executed 
+        after the virsh define command, in order to perform additional system configurations.</para></listitem>
+      <listitem><para>Corrections and improvements towards the content of previous NFV Access 
+        release.</para></listitem>
+    </itemizedlist>
   </section>
 
   <section id="open_source">
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 3443883..b55b9bc 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
@@ -304,8 +304,13 @@ Duplicate entry - Release already installed</programlisting></para>
         </listitem>
 
         <listitem>
-          <para>The playbook imports the previously described
-          playbooks:<itemizedlist spacing="compact">
+          <para>The playbook imports the previously described playbooks:</para>
+            
+            <itemizedlist spacing="compact">
+              <listitem>
+                <para><filename>playbooks/waitDeviceUp.yml</filename></para>
+              </listitem>
+              
               <listitem>
                 <para><filename>playbook/uploadImage.yml</filename></para>
               </listitem>
@@ -321,7 +326,7 @@ Duplicate entry - Release already installed</programlisting></para>
               <listitem>
                 <para><filename>playbook/clearCompletedUpgradesInfo.yml</filename></para>
               </listitem>
-            </itemizedlist></para>
+            </itemizedlist>
         </listitem>
       </itemizedlist>
 
@@ -334,8 +339,8 @@ Duplicate entry - Release already installed</programlisting></para>
         </listitem>
 
         <listitem>
-          <para>A device JSON configuration file must be created:
-          <programlisting>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/&lt;Device-name&gt;.json</programlisting></para>
+          <para>A device JSON configuration file must be created:</para>
+          <programlisting>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/&lt;Device-name&gt;.json</programlisting>
         </listitem>
       </itemizedlist>
 
@@ -344,7 +349,9 @@ Duplicate entry - Release already installed</programlisting></para>
       <literal>&lt;Image-path&gt;</literal>,
       <literal>&lt;Image-name&gt;</literal>,
       <literal>&lt;Upgrade-type&gt;</literal>, and the
-      <literal>&lt;Device-name&gt;</literal> as extra-vars:<programlisting>ansible-playbook playbooks/installNFVAImage.yml -e \
+      <literal>&lt;Device-name&gt;</literal> as extra-vars:
+        
+        <programlisting>ansible-playbook playbooks/installNFVAImage.yml -e \
 device="&lt;Device-name&gt;" -e image_path="&lt;Image-path&gt;" -e \
 image_name="&lt;Image-name&gt;" -e upgrade_type="&lt;Upgrade-type&gt;"</programlisting></para>
 
@@ -832,10 +839,17 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
         </listitem>
       </itemizedlist>
 
-      <para><emphasis role="bold">Precondition:</emphasis></para>
+      <para><emphasis role="bold">Precondition:</emphasis><itemizedlist>
+          <listitem>
+            <para>The Offline Configuration Store should not already exist on
+            the uCPE Manager. If it exists, the test will report a
+            duplicate.</para>
+          </listitem>
 
-      <para>The Offline Configuration Store should not already exist on the
-      uCPE Manager. If it exists, the test will report a duplicate.</para>
+          <listitem>
+            <para>A store JSON file needs to exist: <programlisting>&lt;AF-TH-install-dir&gt;/lab_config/&lt;device-name&gt;/store.json</programlisting></para>
+          </listitem>
+        </itemizedlist></para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>addConfigStore.yml</filename> Ansible Playbook with the
@@ -909,8 +923,17 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
 
       <para><emphasis role="bold">Precondition:</emphasis></para>
 
-      <para>The Offline Configuration Store should exist in the uCPE Manager.
-      If it does not, the test will say so.</para>
+      <itemizedlist>
+        <listitem>
+          <para>The Offline Configuration Store should exist in the uCPE
+          Manager. If it does not, the test will say so.</para>
+        </listitem>
+
+        <listitem>
+          <para>A Bridge JSON configuration file needs to exist:
+          <programlisting>&lt;AF-TH-install-dir&gt;/lab_config/&lt;device-name&gt;/&lt;bridge-name&gt;.json</programlisting></para>
+        </listitem>
+      </itemizedlist>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>addOfflineBridge.yml</filename> Ansible Playbook with the
@@ -1115,8 +1138,8 @@ vnfi=&lt;VNFI-name&gt;"</programlisting><emphasis
       <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
-      Firewall:</para>
+      <para><emphasis role="bold">How to deploy the FortiGate VNF as a
+      Firewall:</emphasis></para>
 
       <orderedlist>
         <listitem>