Final 2.2.3 edits part 2.

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

8 files changed, 288 insertions, 187 deletions

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 2917b1a..3439a64 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
@@ -46,10 +46,12 @@
       <para>One or more uCPE devices running the Enea NFV Access Run Time
       Platform are required as hosts to run the VNF(s). The uCPE device is
       known to the uCPE Manager as the "VcpeAgent" device module.</para>
-      
-      <note><para>Before running any use case with the Automation Framework or 
-        the Test Harness, make sure the uCPE device(s) have been added to 
-        the uCPE Manager.</para></note>
+
+      <note>
+        <para>Before running any use case with the Automation Framework or the
+        Test Harness, make sure the uCPE device(s) have been added to the uCPE
+        Manager.</para>
+      </note>
 
       <para>Adding a VcpeAgent device can be done via two methods:</para>
 
@@ -124,12 +126,10 @@
 
     <para>For details about the test suites or test cases please refer to
     chapter <olink targetdoc="book_enea_nfv_access_system_test_specification"
-    targetptr="sample_testcases">Sample Test Cases in <xi:include
+    targetptr="sample_testcases">Sample Test Cases 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_getting_started/1)" /></olink>.</para>
-
-    <remark>this olink needs to be fixed it points to getting started not the
-    test spec manual, an olinkdb update is needed to know why.</remark>
+    xpointer="element(book_enea_nfv_access_system_test_specification/1)" /></olink>
+    Manual.</para>
   </section>
 </chapter>
\ No newline at end of file
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 68e6f12..8a62b3b 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
@@ -30,9 +30,12 @@
     <note>
       <para>The Automation Framework and Test Harness installation may be done
       on the same machine used for uCPE Manager installation, although this is
-      not encouraged. For more details see <link linkend="automation">chapter
-      3.2</link>.<remark>what chapter of what book is this link refering
-      to?</remark></para>
+      not encouraged. For more details see section <olink
+      targetdoc="book_enea_nfv_access_auto_fw_th_user_guide"
+      targetptr="automation">Automation Framework 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_auto_fw_th_user_guide/1)" /></olink>.</para>
     </note>
   </section>
 
@@ -49,9 +52,11 @@
           </imageobject>
         </mediaobject>
       </figure>The following enviroment setup is needed for running all tests
-    defined in the Enea NFV Access System Test Specification manual:</para>
-
-    <remark>olink to the book needed here.</remark>
+    defined in the <xi:include
+    href="../../s_docbuild/olinkdb/pardoc-common.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xpointer="element(book_enea_nfv_access_system_test_specification/1)" />
+    manual:</para>
 
     <para><emphasis role="bold">Lab Network
     Requirements</emphasis><itemizedlist spacing="compact">
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/appendix_4.xml b/doc/book-enea-nfv-access-example-usecases/doc/appendix_4.xml
index 42e6a5e..9fe1b2b 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/appendix_4.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/appendix_4.xml
@@ -2,8 +2,14 @@
 <appendix id="appendix_four_cust">
   <title>Running Enea Automation Framework tests</title>
 
+  <para>For more detailed information regarding the Automation Framework and
+  Test Harness please see the <xi:include
+  href="../../s_docbuild/olinkdb/pardoc-common.xml"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xpointer="element(book_enea_nfv_access_auto_fw_th_user_guide/1)" />.</para>
+
   <para>The most relevant information from the Automation Framework and Test
-  Harness structure:</para>
+  Harness structure is presented below:</para>
 
   <programlisting>|---automation_framework
 |  |---unittestSuite
@@ -18,14 +24,14 @@
 |  |  |---unittestSuite.py
 |---lab_config
 |  |---trgt-1 
-|  |  |---enp4s0f0_0000_04_00_0.json
-|  |  |---enp4s0f1_0000_04_00_1.json
 |  |  |---ibm_br.json                  - In-band management definition.
-|  |  |---lan_br_enp4s0f1.json         - Lan bridge definition.
-|  |  |---trgt-1.json      
-            - Target definition - make sure to update the "address".
+|  |  |---lan_br.json                  - Lan bridge definition.
+|  |  |---target.json      
+            - Target definition - the "address", "deviceId", "name" and \
+              "version" must be updated.
 |  |  |---sfc_br.json                  - Service chain bridge definition.
 |  |  |---vnf_mgmt_br.json             - VNF management bridge definition.
+|  |  |---lan_nic.json                 - NIC definition.
 |---vnf_config
 |  |---128t
 |  |  |---128tInstance.json            - 128T instantiation - used in use case 1.
@@ -37,16 +43,53 @@
 |  |  |---fortigateInstance.json       - Fortigate instantiantion.
 |  |  |---fortigate.json               - Fortigate onboarding.
 |  |  |---fortigateLicense.lic
-             - Fortigate license - replace it with a valid License file.
+            - Fortigate license - contact Fortinet to get a VNF image and license file.
 |---vnf_image
-|  |---centos_128t_with_ci.qcow2       - 128T qcow2 image.
-|  |---fortios.qcow2                   - Fortigate qcow2 image.</programlisting>
+|  |---centos_128t_with_ci.qcow2       - Contact 128 Technology to get a \
+                                         VNF image and its license file.
+|  |---fortios.qcow2                   - Contact Fortinet to get a VNF image \
+                                         and its license file.</programlisting>
 
   <para>Make sure to update the relevant configuration file for your setup.
-  The essential files to consider are the target configuration
-  (<filename>trgt-1.json</filename>), the license for the Fortigate VNF, and
+  The essential files to consider are the uCPE Device configuration
+  (<filename>target.json</filename>), the license for the Fortigate VNF, and
   the 128T cloud-init iso image matching your network.</para>
 
-  <para>To run a test:<programlisting>&gt; cd automation_and_systemtest/automation_framework/unittestSuite
-&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.109 -n trgt-1 -s</programlisting></para>
+  <para>For uCPE Device configuration (<filename>target.json</filename>)
+  please change the following information, if needed, in the JSON file:</para>
+
+  <itemizedlist spacing="compact">
+    <listitem>
+      <para><literal>address</literal> - The IP address of uCPE Device.</para>
+    </listitem>
+
+    <listitem>
+      <para><literal>version</literal> - The NFVA version.</para>
+    </listitem>
+
+    <listitem>
+      <para><literal>deviceId</literal> - The device ID of uCPE Device.</para>
+    </listitem>
+
+    <listitem>
+      <para><literal>name</literal> - The name of uCPE Device.</para>
+    </listitem>
+  </itemizedlist>
+
+  <note>
+    <para>Before starting the two usecases detailed in the following appendix,
+    the uCPE Device needs to be added into the uCPE Manager.</para>
+  </note>
+
+  <para>To run a test:</para>
+
+  <programlisting>&gt; cd automation_framework/unittestSuite/
+&gt; python unittestSuite.py -u admin -p admin -H &lt;uCPEManager IP address&gt; -n \
+&lt;uCPE Device name&gt; -s &lt;Test suite&gt; -d &lt;description&gt;</programlisting>
+
+  <para>The <literal>Test suite</literal> must be one from any of the
+  following: <filename>128tDeploy.json</filename>,
+  <filename>128tCleanup.json</filename>,
+  <filename>128t_FG_SFCDeploy.json</filename>, or
+  <filename>128t_FG_SFCCleanup.json</filename>.</para>
 </appendix>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/appendix_5.xml b/doc/book-enea-nfv-access-example-usecases/doc/appendix_5.xml
index bdffa2f..2097435 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/appendix_5.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/appendix_5.xml
@@ -2,200 +2,240 @@
 <appendix id="appendix_five_cust">
   <title>Example Tests Results using the Automation Framework</title>
 
-  <programlisting>Test Host:
-Use Case1 - 128T
-&gt; cd automation_and_systemtest/automation_framework/unittestSuite
-&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.109 -n trgt-1 \
+  <para>In order to run the following example usecases, certain configuration
+  file entries need to be modified according to the network setup that it will
+  be used, for more details see the previous appendix:</para>
+
+  <itemizedlist spacing="compact">
+    <listitem>
+      <para>uCPE Device name: inteld1521-17</para>
+    </listitem>
+
+    <listitem>
+      <para>address: 172.24.8.62</para>
+    </listitem>
+
+    <listitem>
+      <para>version: 2.2.3</para>
+    </listitem>
+
+    <listitem>
+      <para>deviceId: inteld1521-17</para>
+    </listitem>
+  </itemizedlist>
+
+  <para><programlisting>&gt; cat lab_config/trgt-1/target.json
+{
+    "name": "inteld1521-17",
+    "description": "trgt",
+    "address": "172.24.8.62",
+    "port": "830",
+    "username": "root",
+    "password": "",
+    "certificate": null,
+    "passphrase": null,
+    "maintMode": "false",
+    "version": "2.2.3",
+    "deviceId": "inteld1521-17"
+}</programlisting>The IP address of the uCPE Manager that will be used in
+  these examples is <literal>172.24.3.92</literal>.</para>
+
+  <para>The FortiGate and 128T VNF images need to be copied into the
+  <literal>vnf_image</literal> directory. The names should be the same as
+  those described in Appendix D.</para>
+
+  <para>The FortiGate valid license file needs to be copied into the
+  <literal>vnf_config/fortigate/</literal> directory. The name should be the
+  same as that described in Appendix D.</para>
+
+  <para>The cloud init files that match the network, need to be copied into
+  the <literal>vnf_config/fortigate/</literal> and the
+  <literal>vnf_config/128t/</literal> directories respectively. The names
+  should be the same as those described in Appendix D.</para>
+
+  <section id="ap_d_uc1">
+    <title>Use-case 1: 128T VNF Router Example Use-case</title>
+
+    <programlisting>&gt; cd automation_framework/unittestSuite/
+&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.92 -n inteld1521-17 \
 -s 128tDeploy.json -d "128T Deployment"
 
 Running 128T Deployment...
 
 test 001: Wait VCPE Agent device be up (__main__.UnittestSuite) ...
-2020-04-15 19:04:58,037 - INFO: Wait uCPE device
-2020-04-15 19:05:29,128 - INFO: Status: Connected
-2020-04-15 19:05:29,128 - INFO: Done
+2020-08-26 10:10:05,517 - INFO: Wait uCPE device
+2020-08-26 10:10:36,650 - INFO: Status: Connected
+2020-08-26 10:10:36,651 - INFO: Done
 ok
 test 002: Bind NIC to DPDK for LAN connection (__main__.UnittestSuite) ...
-2020-04-15 19:05:29,154 - INFO: Bind NIC
-2020-04-15 19:05:30,280 - INFO: Done
+2020-08-26 10:10:36,686 - INFO: Bind NIC
+2020-08-26 10:10:37,788 - INFO: Done
 ok
 test 003: Creating ibm bridge  (__main__.UnittestSuite) ...
-2020-04-15 19:05:30,302 - INFO: New OVS network bridge
-2020-04-15 19:05:50,687 - INFO: Done
+2020-08-26 10:10:37,818 - INFO: New OVS network bridge
+2020-08-26 10:10:58,762 - INFO: Done
 ok
 test 004: Creating VNF Management bridge  (__main__.UnittestSuite) ...
-2020-04-15 19:05:50,706 - INFO: New OVS network bridge
-2020-04-15 19:05:50,982 - INFO: Done
+2020-08-26 10:10:58,794 - INFO: New OVS network bridge
+2020-08-26 10:10:58,977 - INFO: Done
 ok
 test 005: Creating LAN bridge and attaching lan interface to the bridge  \
 (__main__.UnittestSuite) ...
-2020-04-15 19:05:51,001 - INFO: New OVS network bridge
-2020-04-15 19:05:51,682 - INFO: Done
+2020-08-26 10:10:59,003 - INFO: New OVS network bridge
+2020-08-26 10:10:59,334 - INFO: Done
 ok
 test 006: Onboarding 128T VNF (wizard API) (__main__.UnittestSuite) ...
-2020-04-15 19:05:51,704 - INFO: Onboard wizard
-2020-04-15 19:08:43,978 - INFO: Done
+2020-08-26 10:10:59,370 - INFO: Onboard wizard
+2020-08-26 10:13:55,775 - INFO: Done
 ok
 test 007: Instantiate 128T VNF   (__main__.UnittestSuite) ...
-2020-04-15 19:08:44,000 - INFO: Instantiate VNF
-2020-04-15 19:09:37,385 - INFO: Done
+2020-08-26 10:13:55,813 - INFO: Instantiate VNF
+2020-08-26 10:14:56,583 - INFO: Done
 ok
 
 ----------------------------------------------------------------------
-Ran 7 tests in 279.366s
+Ran 7 tests in 291.103s
 
 OK
 
+&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.92 -n inteld1521-17 \
+-s 128tCleanup.json -d "128T Cleanup"
 
-Clean-up use-case1
-&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.109 -n trgt-1 \
--s 128tCleanup.json -d "128T Clean-up"
-
-Running 128T Clean-up...
+Running 128T Cleanup...
 
 test 001: Destroying 128T VNF     (__main__.UnittestSuite) ...
-2020-04-15 19:10:41,926 - INFO: Destroy VNF
-2020-04-15 19:10:42,813 - INFO: Done
+2020-08-26 10:15:28,395 - INFO: Destroy VNF
+2020-08-26 10:15:29,452 - INFO: Done
 ok
 test 002: Deleting network bridge LAN  (__main__.UnittestSuite) ...
-2020-04-15 19:10:42,831 - INFO: Delete OVS network bridge
-2020-04-15 19:10:43,231 - INFO: Done
+2020-08-26 10:15:29,493 - INFO: Delete OVS network bridge
+2020-08-26 10:15:29,734 - INFO: Done
 ok
 test 003: Deleting VNF management bridge  (__main__.UnittestSuite) ...
-2020-04-15 19:10:43,248 - INFO: Delete OVS network bridge
-2020-04-15 19:10:43,366 - INFO: Done
+2020-08-26 10:15:29,765 - INFO: Delete OVS network bridge
+2020-08-26 10:15:30,080 - INFO: Done
 ok
 test 004: Deleting ibm(In Band Management) bridge  (__main__.UnittestSuite) ...
-2020-04-15 19:10:43,383 - INFO: Delete OVS network bridge
-2020-04-15 19:10:58,638 - INFO: Done
+2020-08-26 10:15:30,110 - INFO: Delete OVS network bridge
+2020-08-26 10:15:46,907 - INFO: Done
 ok
 test 005: Unbind LAN NIC from DPDK target (__main__.UnittestSuite) ...
-2020-04-15 19:10:58,687 - INFO: Unbind NIC
-2020-04-15 19:11:00,490 - INFO: Done
+2020-08-26 10:15:46,967 - INFO: Unbind NIC
+2020-08-26 10:15:48,489 - INFO: Done
 ok
 test 006: Offboarding 128t VNF    (__main__.UnittestSuite) ...
-2020-04-15 19:11:00,509 - INFO: Offboard VNF
-2020-04-15 19:11:01,416 - INFO: Done
+2020-08-26 10:15:48,531 - INFO: Offboard VNF
+2020-08-26 10:15:49,171 - INFO: Done
 ok
 
 ----------------------------------------------------------------------
-Ran 6 tests in 19.507s
+Ran 6 tests in 20.808s
 
-OK
+OK</programlisting>
+  </section>
 
+  <section id="ap_d_uc2">
+    <title>Use-case 2: Service Chaining 128T - Fortigate Example
+    Usecase</title>
 
-Use-case2
-&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.109 -n trgt-1 \
+    <programlisting>&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.92 -n inteld1521-17 \
 -s 128t_FG_SFCDeploy.json -d "128T - Fortigate SFC Deployment"
 
 Running 128T - Fortigate SFC Deployment...
 
 test 001: Wait VCPE Agent device be up (__main__.UnittestSuite) ...
-2020-04-15 19:12:31,906 - INFO: Wait uCPE device
-2020-04-15 19:13:02,972 - INFO: Status: Connected
-2020-04-15 19:13:02,973 - INFO: Done
+2020-08-26 10:17:29,361 - INFO: Wait uCPE device
+2020-08-26 10:18:00,473 - INFO: Status: Connected
+2020-08-26 10:18:00,474 - INFO: Done
 ok
 test 002: Bind NIC to DPDK for LAN connection (__main__.UnittestSuite) ...
-2020-04-15 19:13:02,994 - INFO: Bind NIC
-2020-04-15 19:13:04,105 - INFO: Done
+2020-08-26 10:18:00,634 - INFO: Bind NIC
+2020-08-26 10:18:01,805 - INFO: Done
 ok
 test 003: Creating ibm bridge  (__main__.UnittestSuite) ...
-2020-04-15 19:13:04,122 - INFO: New OVS network bridge
-2020-04-15 19:13:10,939 - INFO: Done
+2020-08-26 10:18:01,863 - INFO: New OVS network bridge
+2020-08-26 10:18:30,640 - INFO: Done
 ok
 test 004: Creating VNF Management bridge  (__main__.UnittestSuite) ...
-2020-04-15 19:13:10,957 - INFO: New OVS network bridge
-2020-04-15 19:13:11,246 - INFO: Done
+2020-08-26 10:18:30,670 - INFO: New OVS network bridge
+2020-08-26 10:18:30,876 - INFO: Done
 ok
 test 005: Creating LAN bridge and attaching lan interface to the bridge  \
 (__main__.UnittestSuite) ...
-2020-04-15 19:13:11,264 - INFO: New OVS network bridge
-2020-04-15 19:13:12,010 - INFO: Done
+2020-08-26 10:18:30,908 - INFO: New OVS network bridge
+2020-08-26 10:18:31,243 - INFO: Done
 ok
 test 006: Creating SFC(service function chaining) bridge  (__main__.UnittestSuite) ...
-2020-04-15 19:13:12,026 - INFO: New OVS network bridge
-2020-04-15 19:13:12,104 - INFO: Done
+2020-08-26 10:18:31,273 - INFO: New OVS network bridge
+2020-08-26 10:18:31,416 - INFO: Done
 ok
 test 007: Onboarding 128T VNF (wizard API) (__main__.UnittestSuite) ...
-2020-04-15 19:13:12,118 - INFO: Onboard wizard
-2020-04-15 19:15:48,993 - INFO: Done
+2020-08-26 10:18:31,448 - INFO: Onboard wizard
+2020-08-26 10:21:21,569 - INFO: Done
 ok
 test 008: Onboarding Fortigate VNF (wizard API) (__main__.UnittestSuite) ...
-2020-04-15 19:15:49,012 - INFO: Onboard wizard
-2020-04-15 19:15:53,805 - INFO: Done
+2020-08-26 10:21:21,608 - INFO: Onboard wizard
+2020-08-26 10:21:27,199 - INFO: Done
 ok
 test 009: Instantiate 128T VNF   (__main__.UnittestSuite) ...
-2020-04-15 19:15:53,880 - INFO: Instantiate VNF
-2020-04-15 19:16:53,272 - INFO: Done
+2020-08-26 10:21:27,226 - INFO: Instantiate VNF
+2020-08-26 10:22:27,067 - INFO: Done
 ok
 test 010: Instantiate Fortigate VNF    (__main__.UnittestSuite) ...
-2020-04-15 19:16:53,289 - INFO: Instantiate VNF
-2020-04-15 19:16:57,428 - INFO: Done
+2020-08-26 10:22:27,121 - INFO: Instantiate VNF
+2020-08-26 10:22:31,310 - INFO: Done
 ok
 
 ----------------------------------------------------------------------
-Ran 10 tests in 265.536s
+Ran 10 tests in 301.989s
 
 OK
 
+&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.92 -n inteld1521-17 \
+-s 128t_FG_SFCCleanup.json -d "128T - Fortigate SFC Cleanup"
 
-# Access 128T management interface
-https://172.24.12.154:60001
-user: admin
-password: 128Tadmin
-
-# Access Fortigate management interface
-https://172.24.12.154:60002
-user: admin
-password:
-
-
-
-Use case2 clean-up
-&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.109 -n trgt-1 \
--s 128t_FG_SFCCleanup.json -d "128T - Fortigate SFC CleanUp"
-
-Running 128T - Fortigate SFC CleanUp...
+Running 128T - Fortigate SFC Cleanup...
 
 test 001: Destroying Fortigate VNF     (__main__.UnittestSuite) ...
-2020-04-15 19:31:37,255 - INFO: Destroy VNF
-2020-04-15 19:31:38,941 - INFO: Done
+2020-08-26 10:23:29,308 - INFO: Destroy VNF
+2020-08-26 10:23:30,026 - INFO: Done
 ok
 test 002: Destroying 128T VNF     (__main__.UnittestSuite) ...
-2020-04-15 19:31:38,960 - INFO: Destroy VNF
-2020-04-15 19:31:39,878 - INFO: Done
+2020-08-26 10:23:30,065 - INFO: Destroy VNF
+2020-08-26 10:23:30,917 - INFO: Done
 ok
 test 003: Deleting network bridge SFC  (__main__.UnittestSuite) ...
-2020-04-15 19:31:39,908 - INFO: Delete OVS network bridge
-2020-04-15 19:31:40,086 - INFO: Done
+2020-08-26 10:23:30,960 - INFO: Delete OVS network bridge
+2020-08-26 10:23:31,123 - INFO: Done
 ok
 test 004: Deleting network bridge LAN  (__main__.UnittestSuite) ...
-2020-04-15 19:31:40,102 - INFO: Delete OVS network bridge
-2020-04-15 19:31:40,388 - INFO: Done
+2020-08-26 10:23:31,156 - INFO: Delete OVS network bridge
+2020-08-26 10:23:31,381 - INFO: Done
 ok
 test 005: Deleting VNF management bridge  (__main__.UnittestSuite) ...
-2020-04-15 19:31:40,427 - INFO: Delete OVS network bridge
-2020-04-15 19:31:40,678 - INFO: Done
+2020-08-26 10:23:31,412 - INFO: Delete OVS network bridge
+2020-08-26 10:23:31,596 - INFO: Done
 ok
 test 006: Deleting ibm(In Band Management) bridge  (__main__.UnittestSuite) ...
-2020-04-15 19:31:40,701 - INFO: Delete OVS network bridge
-2020-04-15 19:31:46,894 - INFO: Done
+2020-08-26 10:23:31,621 - INFO: Delete OVS network bridge
+2020-08-26 10:23:47,980 - INFO: Done
 ok
 test 007: Unbind LAN NIC from DPDK target (__main__.UnittestSuite) ...
-2020-04-15 19:31:46,945 - INFO: Unbind NIC
-2020-04-15 19:31:48,792 - INFO: Done
+2020-08-26 10:23:48,019 - INFO: Unbind NIC
+2020-08-26 10:23:49,547 - INFO: Done
 ok
 test 008: Offboarding 128t VNF    (__main__.UnittestSuite) ...
-2020-04-15 19:31:48,808 - INFO: Offboard VNF
-2020-04-15 19:31:49,554 - INFO: Done
+2020-08-26 10:23:49,575 - INFO: Offboard VNF
+2020-08-26 10:23:50,252 - INFO: Done
 ok
 test 009: Offboarding Fortigate VNF    (__main__.UnittestSuite) ...
-2020-04-15 19:31:49,572 - INFO: Offboard VNF
-2020-04-15 19:31:49,837 - INFO: Done
+2020-08-26 10:23:50,295 - INFO: Offboard VNF
+2020-08-26 10:23:50,589 - INFO: Done
 ok
 
 ----------------------------------------------------------------------
-Ran 9 tests in 12.600s
+Ran 9 tests in 21.326s
 
 OK</programlisting>
+  </section>
 </appendix>
\ No newline at end of file
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 649a80d..9c60ebb 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
@@ -146,9 +146,9 @@
 node0.1048576kB = 3 </programlisting>
 
       <note>
-          <para>Make sure there are no hugepages reserved in the kernel boot
-              command line, these will override any manual configuration done
-              in the service.</para>
+        <para>Make sure there are no hugepages reserved in the kernel boot
+        command line, these will override any manual configuration done in the
+        service.</para>
       </note>
     </section>
   </section>
@@ -221,8 +221,8 @@ node0.1048576kB = 3 </programlisting>
         drive) under <literal>/uefi_sb_keys</literal>.</para>
 
         <para>These certificates need to be manually enrolled in BIOS. The
-        exact details on how to proceed may vary depending the version of the 
-          UEFI firmware.</para>
+        exact details on how to proceed may vary depending the version of the
+        UEFI firmware.</para>
       </section>
 
       <section id="enable_secure_boot">
@@ -311,10 +311,9 @@ 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>
 
@@ -363,7 +362,7 @@ install_drive = /dev/sda</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>
+        </note>
       </section>
 
       <section id="bare_meta_prov_pxe">
@@ -374,15 +373,14 @@ install_drive = /dev/sda</programlisting>
         (e.g <literal>/var/lib/tftpboot/pxelinux.cfg/default</literal>). The
         PXE entry should have the following settings:</para>
 
-        <programlisting>
-        default nfv_access
-        label nfv_access
-        menu label ^NFV_ACCESS_INSTALLER
-        kernel &lt;Path to kernel&gt;
-        append root=/dev/ram0 initrd=&lt;Path to initramfs&gt; LABEL=pxe-installer \
-           INSTALL_CFG=http://&lt;Server IP&gt;/&lt;Path to install config file&gt; \
-           console=ttyS0,115200 earlyprintk=ttyS0,115200
-        ipappend 2
+        <programlisting>default nfv_access
+label nfv_access
+menu label ^NFV_ACCESS_INSTALLER
+kernel &lt;Path to kernel&gt;
+append root=/dev/ram0 initrd=&lt;Path to initramfs&gt; LABEL=pxe-installer \
+   INSTALL_CFG=http://&lt;Server IP&gt;/&lt;Path to install config file&gt; \
+   console=ttyS0,115200 earlyprintk=ttyS0,115200
+ipappend 2
     </programlisting>
       </section>
     </section>
@@ -397,14 +395,12 @@ install_drive = /dev/sda</programlisting>
 
       <para>Example initiation using <literal>ipmitool</literal>:</para>
 
-      <programlisting>
-        ipmitool -U &lt;user&gt; -P &lt;password&gt; -H &lt;uCPE device IPMI IP address&gt; chassis bootdev pxe
-        ipmitool -U &lt;user&gt; -P &lt;password&gt; -H &lt;uCPE device IPMI IP address&gt; power reset
-    </programlisting>
+      <programlisting>ipmitool -U &lt;user&gt; -P &lt;password&gt; -H &lt;uCPE device IPMI IP address&gt; chassis bootdev pxe
+ipmitool -U &lt;user&gt; -P &lt;password&gt; -H &lt;uCPE device IPMI IP address&gt; power reset   </programlisting>
 
       <para>The uCPE devices should be configured in BIOS to boot from the
       installation drive first in order to automatically start the Enea NFV
       Access Run Time Platform when the installation is finished.</para>
     </section>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file
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 d46b4c7..932f0cc 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
@@ -23,9 +23,12 @@
     </itemizedlist>
 
     <para>For more information about Bare Metal Provisioning please refer to
-    <xref linkend="bare_meta_prov">
-         5.3, Bare Metal Provisioning" 
-      </xref>.</para>
+    section <olink targetdoc="book_enea_nfv_access_getting_started"
+    targetptr="bare_meta_prov">Bare Metal Provisioning in <xi:include
+    href="../../s_docbuild/olinkdb/pardoc-names.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
+    Manual.</para>
 
     <section id="prereq">
       <title>Prerequisites</title>
@@ -110,10 +113,8 @@ q or quit - exits the script</programlisting></para>
 
           <note>
             <para>When using the installer for the first time, make sure to
-            set ALL parameters in order to be able to run all steps. See <xref
-                linkend="examples">
-                 Example 2 
-              </xref> for details.</para>
+            set ALL parameters in order to be able to run all steps. See
+            Example 2 for details.</para>
           </note>
 
           <para><programlisting># set &lt;parameter_name&gt;=&lt;parameter_value&gt;</programlisting></para>
@@ -217,8 +218,8 @@ rootfs_destination=</programlisting></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>
+        &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
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 dda71bb..2acc009 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
@@ -136,23 +136,25 @@ export CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar</p
         </listitem>
 
         <listitem>
-          <para>If you plan to use the PostgreSQL server bundled with the 
-            uCPE Manager, verify that there is no existing installation of the
+          <para>If you plan to use the PostgreSQL server bundled with the uCPE
+          Manager, verify that there is no existing installation of the
           Postgres database. Execute the following command to check if you
           have a currently running PostgreSQL database server:</para>
 
           <programlisting>ps -ef | grep post</programlisting>
-          
-          <para>To remove a currently installed PostgreSQL server (including the
-            existing postgres user), run the following commands:</para>
-          
+
+          <para>To remove a currently installed PostgreSQL server (including
+          the existing postgres user), run the following commands:</para>
+
           <programlisting>yum remove postgres\*
 rm -f /var/lib/pgsql
 rm -f /etc/postgres-reg.ini
 userdel postgres</programlisting>
-          
-          <note><para>This step is not necessary if the uCPE Manager
-            will be using an external database (like MariaDB).</para></note>
+
+          <note>
+            <para>This step is not necessary if the uCPE Manager will be using
+            an external database (like MariaDB).</para>
+          </note>
         </listitem>
 
         <listitem>
@@ -598,8 +600,12 @@ userdel postgres</programlisting>
         <para>When using this mechanism, the device will initiate a connection
         to the uCPE Manager for NETCONF traffic (over SSH), while the uCPE
         Manager waits for a device connection. For more information please see
-        section <link linkend="install_ena_stick">Installing Enea NFV
-        Access</link> for more details.</para>
+        section <olink targetdoc="book_enea_nfv_access_getting_started"
+        targetptr="auto_installer">Creating a bootable USB stick 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_getting_started/1)" /></olink>
+        Manual for more details.</para>
       </section>
     </section>
 
@@ -938,8 +944,13 @@ userdel postgres</programlisting>
             <note>
               <para>VNF management interfaces must be configured in same
               network as the <literal>vnf-mgmt-address</literal> of the
-              bridge. For more information, please see 4.4 <link
-              linkend="vnf_management">VNF Management</link>.</para>
+              bridge. For more information, please see section <olink
+              targetdoc="book_enea_nfv_access_getting_started"
+              targetptr="vnf_management">VNF 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_getting_started/1)" /></olink>
+              Manual.</para>
             </note>
           </section>
 
@@ -2041,4 +2052,4 @@ userdel postgres</programlisting>
       </orderedlist>
     </section>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file
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 c1d7de5..cdea2be 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
@@ -88,9 +88,9 @@
 
     <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>
+      on the Xeon-D architectures due to missing CPU features in the VNF's
+      domain XML. This impacts all Examples Use Cases and AF&amp;TH Tests
+      where Juniper VNF is used.</para>
     </listitem>
 
     <listitem>
@@ -113,17 +113,22 @@
     </listitem>
 
     <listitem>
-      <para><remark>LXCR-9992</remark>Due to the way VFIO works, there are
-      certain limitations regarding which devices can be used with VFIO.
-      Mainly, it comes down to how IOMMU groups work. Any Virtual Function
-      device can be used with VFIO on its own, however, physical devices will
-      require either all ports to be bound to VFIO, or only some of them bound
-      while others not bound to anything at all.</para>
+      <para><remark>LXCR-9992</remark>Depending on how PCI devices are split
+      among IOMMU groups, there are certain limitations regarding how the
+      <literal>vfio-pci</literal> driver can be used. For PCI devices
+      belonging to the same IOMMU group, it is required that all are managed
+      within same security domain (e.g. host system or VNF). Therefore it is
+      not possible to bind only some of them to the
+      <literal>vfio-pci</literal> driver, while the rest are managed by other
+      drivers. In this case the <literal>igb_uio</literal> driver will be used
+      instead for the entire IOMMU group.</para>
 
-      <para>If UEFI secure boot is enabled, the Linux kernel may disallow the
-      use of UIO on the system. Therefore, devices intended for use by the
-      DPDK should be bound to the <literal>vfio-pci</literal> kernel module
-      rather than the <literal>igb_uio</literal>.</para>
+      <para>If UEFI Secure Boot is enabled, the Linux kernel disallows the use
+      of the UIO framework, therefore network devices intended for use by DPDK
+      must be bound to the <literal>vfio-pci</literal> driver rather than the
+      <literal>igb_uio</literal>. However, the limitation stated above still
+      applies so all the interfaces must be assigned to
+      <literal>vfio-pci</literal>.</para>
     </listitem>
 
     <listitem>