8 files changed, 81 insertions, 59 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 35cac8c..2cf02b6 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
@@ -802,13 +802,13 @@ Mandatory options:
         <para><emphasis role="bold">Sample
         <filename>intelc3850-2.json</filename> configuration
         file:</emphasis></para>
-        
+
         <programlisting>{
  "name": "intelc3850-2",
  "deviceId": "intelc3850-2",
  "deviceGroupingTags": " ",
  "description": "",
- "address": "192.168.1.100",
+"address": "172.24.12.114",
  "port": "22",
  "username": "root",
  "password": "root",
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 3439a64..b408041 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
@@ -34,10 +34,11 @@
       <para>For more on Enea uCPE Manager installation instructions, please
       refer to the section on how to <olink
       targetdoc="book_enea_nfv_access_getting_started"
-      targetptr="install_ucpe_manager">Install the Enea uCPE Manager in
+      targetptr="install_ucpe_manager">Install the Enea uCPE Manager 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>
+      xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
+      Manual.</para>
     </section>
 
     <section id="ena_plat">
@@ -71,10 +72,11 @@
 
       <para>For more on Enea NFV Access installation instructions, please
       refer to chapter <olink targetdoc="book_enea_nfv_access_getting_started"
-      targetptr="access_installer">Getting Started with Enea NFV Access in
+      targetptr="access_installer">Getting Started with Enea NFV Access 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>
+      xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
+      Manual.</para>
     </section>
   </section>
 
@@ -126,7 +128,7 @@
 
     <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 the<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_system_test_specification/1)" /></olink>
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 8a62b3b..dbb19c4 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
@@ -88,9 +88,10 @@
           <para>For details on how to install the uCPE Manager, see <olink
           targetdoc="book_enea_nfv_access_getting_started"
           targetptr="install_ucpe_manager">Install the Enea uCPE Manager in
-          <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
+          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>
+          xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
+          Manual.</para>
         </note>
       </listitem>
     </itemizedlist>
@@ -116,10 +117,11 @@
             <para>For information on how to install Enea NFV Access refer to
             <olink targetdoc="book_enea_nfv_access_getting_started"
             targetptr="plat-release-content">Getting Started with Enea NFV
-            Access in <xi:include
+            Access 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>
+            xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
+            Manual.</para>
           </note>
         </listitem>
       </itemizedlist><figure>
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 a732129..e2a8a97 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
@@ -277,11 +277,11 @@ userdel postgres</programlisting>
       <note>
         <para>The service will be automatically started when the computer
         boots up. The user may enable the firewall in order to allow access to
-        these specific ports: 80 (TCP), 443 (TCP), 54327 (UDP) and 5701:5708
-        (TCP). If callhome is used access to the following ports must also be
-        allowed: 4334 (TCP) and 2021:2040 (TCP). Otherwise, the user should
-        check that the CentOS machine where the uCPE Manager is installed has
-        the firewall disabled.</para>
+        these specific ports: 80 (TCP), 443 (TCP), 54327 (UDP), 5701:5708
+        (TCP) and 7000:7009 (TCP). If callhome is used, access to the
+        following ports must also be allowed: 4334 (TCP) and 2021:2040 (TCP).
+        Otherwise, the user should check that the CentOS machine where the
+        uCPE Manager is installed has the firewall disabled.</para>
       </note>
 
       <para>Verify that the installation has succeeded by:</para>
@@ -2034,8 +2034,36 @@ userdel postgres</programlisting>
       <orderedlist>
         <listitem>
           <para>SSH to the uCPE device from the Enea uCPE Manager
-          (<literal>Device-&gt;SSH</literal>) using user:
-          <literal>root</literal> and no password.</para>
+          (<literal>Device-&gt;SSH</literal>) using:</para>
+
+          <itemizedlist>
+            <listitem>
+              <para>For normal connections: the <literal>Username</literal>
+              (default: root), the <literal>Password</literal> (default: no
+              password), the <literal>Port</literal> (default: 22) and the
+              <literal>Reverse ssh</literal> checkbox: unchecked.</para>
+            </listitem>
+
+            <listitem>
+              <para>For reverse ssh connections: the
+              <literal>Username</literal> (default: root) and the
+              <literal>Reverse ssh</literal> checkbox checked. The port will
+              be automatically choosen by the uCPE Manager in the range
+              defined in the <literal>System -&gt; Configuration -&gt; Reverse
+              SSH</literal> configuration panel. By default, the start port
+              will be <literal>7000</literal> and the maximum number of ports
+              allocated to all devices is 10. Only one port per device is
+              allowed.</para>
+
+              <para>A SSH Tunnel between the uCPE Manager and the device will be created:</para>
+              <programlisting>ssh -f -N -T -R &lt; Port &gt; :localhost:22 &lt;uCPE Mgr user&gt;@&lt;uCPE MgrIP&gt;</programlisting>
+              <para>The device must be connected to the uCPE Manager for the tunnel to be created. 
+                On connection, a normal ssh connection will be made:</para>
+              <programlisting>ssh -p &lt;Port&gt; &lt;Username&gt;@localhost</programlisting>
+
+               
+            </listitem>
+          </itemizedlist>
         </listitem>
 
         <listitem>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/introduction.xml b/doc/book-enea-nfv-access-getting-started/doc/introduction.xml
index 96c3172..2009672 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/introduction.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/introduction.xml
@@ -4,16 +4,6 @@
 <chapter id="intro_ucpe">
   <title>Introduction</title>
 
-  <para><remark>INFO <emphasis role="bold">eltf_params_updated.xml</emphasis>
-  contains many parameters in the book, also in the open source books, and
-  MUST be created FROM <emphasis
-  role="bold">eltf_params_template.xml</emphasis>. The parameters are
-  automatically used in the books, via xi:include statements, similar to how
-  parameters from pardoc-distro.xml are included in the book. Read the file
-  <emphasis role="bold">eltf_params_updated_template_how_to_use.txt</emphasis>
-  for important details about formats and how to do! The idea is that ELTF
-  will auto-create/update it.</remark></para>
-
   <para>Enea NFV Access for universal Customer Premise Equipment (uCPE) is a
   virtualization and management platform, which allows end-users to introduce,
   instantiate, and run third-party VNFs onto their systems. It is comprised of
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 9b1c740..636af3f 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
@@ -16,7 +16,7 @@
     <listitem>
       <para><remark>ELCCR-319</remark>After a successful installation or
       upgrade, the uCPE Manager will reboot. The time required for restarting
-      all its services is influenced by hardware configuration of the host
+      all its services is influenced by the hardware configuration of the host
       platform.</para>
     </listitem>
 
@@ -60,7 +60,7 @@
 
     <listitem>
       <para><remark>ELCCR-577</remark>If a uCPEM is restored from a backup
-      made on an older release version than 2.2.3, VNFs cannot be instantiated
+      made on a release version older than 2.2.3, VNFs cannot be instantiated
       from the GUI.</para>
     </listitem>
 
@@ -89,8 +89,8 @@
     <listitem>
       <para><remark>ELCCR-847</remark>The Juniper VNF cannot be instantiated
       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>
+      domain XML. This impacts all example use cases and AF&amp;TH tests where
+      the Juniper VNF is used.</para>
     </listitem>
 
     <listitem>
@@ -100,7 +100,7 @@
     </listitem>
 
     <listitem>
-      <para><remark>LXCR-9853</remark>The WAN interface of uCPE device needs
+      <para><remark>LXCR-9853</remark>The WAN interface of a uCPE device needs
       to be connected to a network with at least a router/gateway installed
       for next-hop communication.</para>
     </listitem>
@@ -120,28 +120,29 @@
       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 shall be used
-      instead for the entire IOMMU group.</para>
+      drivers. The <literal>igb_uio</literal> driver must be used instead for
+      the entire IOMMU group.</para>
 
       <para>Driver selection for DPDK-assigned interfaces is a system-wide
-      configuration, therefore selecting <literal>igb_uio</literal>
-      or <literal>vfio-pci</literal> when adding a DPDK interface will not
+      configuration, therefore selecting <literal>igb_uio</literal> or
+      <literal>vfio-pci</literal> when adding a DPDK interface will not
       influence the actual driver used. In this release, NFV Access runtime
-      software is using <literal>vfio-pci</literal> driver by default, but
+      software uses the <literal>vfio-pci</literal> driver by default, but
       <literal>igb_uio</literal> can be used instead by providing custom
       scripting. Please contact Enea for further details.</para>
-      <para>Using both <literal>igb_uio</literal> driver for DPDK interfaces
-      and <literal>vfio-pci</literal> for SR-IOV/PCI-Passthrough is possible,
-      but not recomended, as it might not be supported by some hardware
-      configurations.</para>
+
+      <para>Using both the <literal>igb_uio</literal> driver for DPDK
+      interfaces and the <literal>vfio-pci</literal> driver for
+      SR-IOV/PCI-Passthrough is possible, but not recomended, as these actions
+      might not be supported by some hardware configurations.</para>
 
       <para>When an in-band management bridge uses the
       <literal>igb_uio</literal> driver and the VM connected to the bridge has
       other interfaces that use the <literal>vfio-pci</literal> driver (e.g.
       SR-IOV/PCI-Passthrough), then the VM must be stopped before restarting
-      the vCPE service on the device
-      (<command>systemctl restart vcpe</command>). Rebooting the device does
-      not have this restriction.</para>
+     the vCPE service on the device (<command>systemctl restart
+      vcpe</command>). Rebooting the device does not have this
+      restriction.</para>
     </listitem>
 
     <listitem>
@@ -151,7 +152,7 @@
     </listitem>
 
     <listitem>
-      <para><remark>STCR-6292</remark>Management of WAN Interface is not
+      <para><remark>STCR-6292</remark>Management of WAN Interfaces is not
       implemented in the Automation Framework and Test Harness.</para>
     </listitem>
 
diff --git a/doc/book-enea-nfv-access-system-test-specification/doc/configuration.xml b/doc/book-enea-nfv-access-system-test-specification/doc/configuration.xml
index 94bd4d9..4345326 100644
--- a/doc/book-enea-nfv-access-system-test-specification/doc/configuration.xml
+++ b/doc/book-enea-nfv-access-system-test-specification/doc/configuration.xml
@@ -8,7 +8,7 @@
     <para>The test objects for the Test Harness are the Enea NFV Access and
     Enea uCPE Manager installations performed as indicated in the <olink
     targetdoc="book_enea_nfv_access_auto_fw_th_user_guide"
-    targetptr="components">Components chapter of <xi:include
+    targetptr="components">Components chapter of 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>
@@ -18,7 +18,7 @@
     <title>Test Environment</title>
 
     <para>To set up the required Test Harness environment please refer to
-    chapter <olink targetdoc="book_enea_nfv_access_auto_fw_th_user_guide"
+    <olink targetdoc="book_enea_nfv_access_auto_fw_th_user_guide"
     targetptr="getting_started">Getting Started with the Automation Framework
     and Test Harness in the <xi:include
     href="../../s_docbuild/olinkdb/pardoc-names.xml"
@@ -36,8 +36,8 @@
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xpointer="element(book_enea_nfv_access_auto_fw_th_user_guide/1)" /></olink>
     and section <olink targetdoc="book_enea_nfv_access_auto_fw_th_user_guide"
-    targetptr="initial_setup">Installation and Initial Setup in the <xi:include
-    href="../../s_docbuild/olinkdb/pardoc-names.xml"
+    targetptr="initial_setup">Installation and Initial Setup 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>
     for more details.</para>
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 6e54bd4..f4b2fc7 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
@@ -1498,23 +1498,22 @@ FortigateFWInstance tested successfully!</programlisting></para>
 
             <itemizedlist>
               <listitem>
-                <para>Section <olink
-                targetdoc="book_enea_nfv_access_example_usecases"
+                <para><olink targetdoc="book_enea_nfv_access_example_usecases"
                 targetptr="fortigate_firewall_uc_1">FortiGate VNF as a
-                Firewall in the <xi:include
+                Firewall in the <ns: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>
+                xpointer="element(book_enea_nfv_access_example_usecases/1)"
+                xmlns:ns="http://www.w3.org/2001/XInclude" /></olink>
                 Manual.</para>
               </listitem>
 
               <listitem>
-                <para>Section <olink
+                <para><olink
                 targetdoc="book_enea_nfv_access_auto_fw_th_user_guide"
                 targetptr="python_testsuite">Python Unit-Test Suite in
-                <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude"
-                xpointer="element(book_enea_nfv_access_auto_fw_th_user_guide/1)" /></olink>.</para>
+                <ns:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
+                xpointer="element(book_enea_nfv_access_auto_fw_th_user_guide/1)"
+                xmlns:ns="http://www.w3.org/2001/XInclude" /></olink>.</para>
               </listitem>
             </itemizedlist>
           </listitem>