USERDOCAP-636 - all books changes

Change-Id: I944098c2d726657c91edff3d62dc4a40fc8df8bb
Signed-off-by: iosc <ioana.scurt@enea.com>

1 files changed, 76 insertions, 77 deletions

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 2fa087b..b1bfa1e 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
@@ -9,14 +9,14 @@
     <title>VNF, Device and Network Smoke Test Cases</title>
 
     <para>The following is an automated test suite that acts as basic smoke
-    tests for Enea NFV Access, and as a sanity-check test suite for the AF and
+    tests for Enea Edge, and as a sanity-check test suite for the AF and
     TH.</para>
 
     <section id="onb_vnf_image">
       <title>VNF - Onboard a VNF Image</title>
 
       <para><emphasis role="bold">Description: </emphasis>Onboarding a VNF
-      Image into the uCPE Manager. For details please refer to:</para>
+      Image into the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -61,7 +61,7 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
       <title>VNF - Offboard a VNF</title>
 
       <para><emphasis role="bold">Description:</emphasis> Removing a VNF
-      Descriptor from the uCPE Manager. For details please refer to:</para>
+      Descriptor from the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -74,7 +74,7 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
       </itemizedlist>
 
       <para><emphasis role="bold">Precondition:</emphasis> The VNF has been
-      previously onboarded in the uCPE Manager instance.</para>
+      previously onboarded in the Enea Edge Management instance.</para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>offboardVNF.yml</filename> Ansible Playbook with the
@@ -93,7 +93,7 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
       <title>Device - Add a device</title>
 
       <para><emphasis role="bold">Description:</emphasis> Adding a uCPE device
-      to the uCPE Manager. For details please refer to:</para>
+      to the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -123,10 +123,10 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
     </section>
 
     <section id="device_upload_image">
-      <title>Device - Upload a NFV Access image</title>
+      <title>Device - Upload a Edge image</title>
 
-      <para><emphasis role="bold">Description:</emphasis> Upload a NFV Access
-      image file onto the uCPE Manager. For details please refer to:</para>
+      <para><emphasis role="bold">Description:</emphasis> Upload a Edge
+      image file onto the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -172,7 +172,7 @@ A file with the same name is already uploaded.</programlisting></para>
       <title>Device - Delete Upgraded File</title>
 
       <para><emphasis role="bold">Description:</emphasis> Deleting an uploaded
-      NFV Access image file from the uCPE Manager. For details please refer
+      Edge image file from the Enea Edge Management. For details please refer
       to:</para>
 
       <itemizedlist>
@@ -186,7 +186,7 @@ A file with the same name is already uploaded.</programlisting></para>
       </itemizedlist>
 
       <para><emphasis role="bold">Preconditions:</emphasis> The image file
-      must already be uploaded onto the uCPE Manager.</para>
+      must already be uploaded onto the Enea Edge Management.</para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>deleteUpgradeFile.yml</filename> Ansible Playbook with the
@@ -237,10 +237,10 @@ localhost                  : ok=1    changed=1    unreachable=0    failed=0</pro
     </section>
 
     <section id="dev_inst_activ">
-      <title>Device - Install and Activate a NFV Access image</title>
+      <title>Device - Install and Activate a Edge image</title>
 
       <para><emphasis role="bold">Description:</emphasis> Installing and
-      Activating a NFV Access image on a uCPE device from the uCPE Manager.
+      Activating a Edge image on a uCPE device from the Enea Edge Management.
       For details please refer to:</para>
 
       <itemizedlist>
@@ -255,13 +255,13 @@ localhost                  : ok=1    changed=1    unreachable=0    failed=0</pro
 
       <para><emphasis role="bold">Preconditions:</emphasis> <itemizedlist>
           <listitem>
-            <para>The device must be previously added to the uCPE Manager
+            <para>The device must be previously added to the Enea Edge Management
             instance.</para>
           </listitem>
 
           <listitem>
-            <para>The image file must already be uploaded onto the uCPE
-            Manager.</para>
+            <para>The image file must already be uploaded onto the Enea Edge
+            Management.</para>
           </listitem>
         </itemizedlist></para>
 
@@ -291,11 +291,11 @@ Duplicate entry - Release already installed</programlisting></para>
     </section>
 
     <section id="dev_upload_inst_activ">
-      <title>Device - Upload, Install and Activate a NFV Access image on a
+      <title>Device - Upload, Install and Activate a Edge image on a
       uCPE device</title>
 
       <para><emphasis role="bold">Description:</emphasis> Upload, install and
-      activate a NFV Access image on a uCPE device from the uCPE Manager. For
+      activate a Edge image on a uCPE device from the Enea Edge Management. For
       details please refer to:</para>
 
       <itemizedlist>
@@ -335,7 +335,7 @@ Duplicate entry - Release already installed</programlisting></para>
 
       <itemizedlist>
         <listitem>
-          <para>The device has to be previously added to the uCPE Manager
+          <para>The device has to be previously added to the Enea Edge Management
           instance.</para>
         </listitem>
 
@@ -371,7 +371,7 @@ upgrade_type=xeon_d</programlisting></para>
       <title>Device - Wait a Device</title>
 
       <para><emphasis role="bold">Description:</emphasis> Wait for a uCPE
-      device to connect to the uCPE Manager. For details please refer
+      device to connect to the Enea Edge Management. For details please refer
       to:</para>
 
       <itemizedlist>
@@ -388,7 +388,7 @@ upgrade_type=xeon_d</programlisting></para>
 
       <itemizedlist>
         <listitem>
-          <para>The device has to be previously added to the uCPE Manager
+          <para>The device has to be previously added to the Enea Edge Management
           instance.</para>
         </listitem>
 
@@ -413,7 +413,7 @@ upgrade_type=xeon_d</programlisting></para>
       <title>Device - Remove a Device</title>
 
       <para><emphasis role="bold">Description:</emphasis> Removing a uCPE
-      device from the uCPE Manager. For details please refer to:</para>
+      device from the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -429,7 +429,7 @@ upgrade_type=xeon_d</programlisting></para>
 
       <itemizedlist>
         <listitem>
-          <para>The device has to be previously added to the uCPE Manager
+          <para>The device has to be previously added to the Enea Edge Management
           instance.</para>
         </listitem>
 
@@ -472,7 +472,7 @@ upgrade_type=xeon_d</programlisting></para>
       <itemizedlist>
         <listitem>
           <para>A device must have been previously added and connected to the
-          uCPE Manager instance.</para>
+          Enea Edge Management instance.</para>
         </listitem>
 
         <listitem>
@@ -517,7 +517,7 @@ upgrade_type=xeon_d</programlisting></para>
 
       <itemizedlist>
         <listitem>
-          <para>A NIC is bound to a device in a uCPE Manager instance.</para>
+          <para>A NIC is bound to a device in a Enea Edge Management instance.</para>
         </listitem>
 
         <listitem>
@@ -556,7 +556,7 @@ upgrade_type=xeon_d</programlisting></para>
 
       <para><emphasis role="bold">Preconditions:</emphasis><itemizedlist>
           <listitem>
-            <para>A NIC is bound to a device in a uCPE Manager
+            <para>A NIC is bound to a device in a Enea Edge Management
             instance.</para>
           </listitem>
 
@@ -599,7 +599,7 @@ upgrade_type=xeon_d</programlisting></para>
 
       <para><emphasis role="bold">Preconditions:</emphasis><itemizedlist>
           <listitem>
-            <para>A Bridge exists for a device in a uCPE Manager
+            <para>A Bridge exists for a device in a Enea Edge Management
             instance.</para>
           </listitem>
 
@@ -638,8 +638,8 @@ bridge=&lt;Bridge-name&gt;"</programlisting></para>
 
       <para><emphasis role="bold">Precondition: </emphasis></para>
 
-      <para>A device must have been previously added and connected to the uCPE
-      Manager instance.</para>
+      <para>A device must have been previously added and connected to the Enea Edge
+      Management instance.</para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>configDPDK.yml</filename> Ansible Playbook with the
@@ -657,11 +657,11 @@ DEBUG: Set DPDK state to &lt;enable/disable&gt;</programlisting><emphasis
     </section>
 
     <section id="cs_upload">
-      <title>Custom Scripts - Upload a Custom Script to the uCPE
-      Manager</title>
+      <title>Custom Scripts - Upload a Custom Script to the Enea Edge
+      Management</title>
 
       <para><emphasis role="bold">Description:</emphasis> Upload a Custom
-      Script to the uCPE Manager. For details please refer to:</para>
+      Script to the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -689,15 +689,15 @@ phase=
       run using the Test Harness:</para>
 
       <programlisting># Upload Custom Script task result
-DEBUG: "{{ scriptName }} was uploaded to uCPE Manager!"</programlisting>
+DEBUG: "{{ scriptName }} was uploaded to Enea Edge Management!"</programlisting>
     </section>
 
     <section id="cs_upload_device">
-      <title>Custom Scripts - Upload a Custom Script from the uCPE Manager to
+      <title>Custom Scripts - Upload a Custom Script from the Enea Edge Management to
       a Device</title>
 
       <para><emphasis role="bold">Description:</emphasis> Upload a Custom
-      Script from the uCPE Manager to a Device. For details please refer
+      Script from the Enea Edge Management to a Device. For details please refer
       to:</para>
 
       <itemizedlist>
@@ -715,12 +715,12 @@ DEBUG: "{{ scriptName }} was uploaded to uCPE Manager!"</programlisting>
       <itemizedlist>
         <listitem>
           <para>A device must have been previously added and connected to the
-          uCPE Manager instance.</para>
+          Enea Edge Management instance.</para>
         </listitem>
 
         <listitem>
-          <para>A Custom Script must have been previously added to the uCPE
-          Manager instance.</para>
+          <para>A Custom Script must have been previously added to the Enea Edge
+          Management instance.</para>
         </listitem>
       </itemizedlist>
 
@@ -741,11 +741,11 @@ DEBUG: "{{ scriptName }} was uploaded to {{ device }}!"</programlisting>
     </section>
 
     <section id="cs_remove">
-      <title>Custom Scripts - Remove a Custom Script from the uCPE
-      Manager</title>
+      <title>Custom Scripts - Remove a Custom Script from the Enea Edge
+      Management</title>
 
       <para><emphasis role="bold">Description:</emphasis> Remove a Custom
-      Script from the uCPE Manager. For details please refer to:</para>
+      Script from the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -759,8 +759,8 @@ DEBUG: "{{ scriptName }} was uploaded to {{ device }}!"</programlisting>
 
       <para><emphasis role="bold">Precondition:</emphasis></para>
 
-      <para>A Custom Script must have been previously added to the uCPE
-      Manager.</para>
+      <para>A Custom Script must have been previously added to the Enea Edge
+      Management.</para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>removeCustomScript.yml</filename> Ansible Playbook with the
@@ -772,8 +772,8 @@ phase=
       <para><emphasis role="bold">Result:</emphasis> Output of the test case
       run using the Test Harness:</para>
 
-      <programlisting># Remove Custom Script in phase from uCPE Manager task result
-DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from uCPE Manager!"</programlisting>
+      <programlisting># Remove Custom Script in phase from Enea Edge Management task result
+DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from Enea Edge Management!"</programlisting>
     </section>
 
     <section id="cs_remove_device">
@@ -797,7 +797,7 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from uCPE Manager!"<
       <itemizedlist>
         <listitem>
           <para>A device must have been previously added and connected to the
-          uCPE Manager instance.</para>
+          Enea Edge Management instance.</para>
         </listitem>
 
         <listitem>
@@ -827,7 +827,7 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
       Store</title>
 
       <para><emphasis role="bold">Description:</emphasis> Adding an Offline
-      Config Store to the uCPE Manager. For details please refer to:</para>
+      Config Store to the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -842,7 +842,7 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
       <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
+            the Enea Edge Management. If it exists, the test will report a
             duplicate.</para>
           </listitem>
 
@@ -872,7 +872,7 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
       Store</title>
 
       <para><emphasis role="bold">Description:</emphasis> Removing an Offline
-      Config Store from the uCPE Manager. For details please refer to:</para>
+      Config Store from the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -887,7 +887,7 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
       <para><emphasis role="bold">Precondition:</emphasis></para>
 
       <para>The Offline Configuration Store the user wishes to remove should
-      exist in the uCPE Manager. If it does not, the test will say so.</para>
+      exist in the Enea Edge Management. If it does not, the test will say so.</para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>removeConfigStore.yml</filename> Ansible Playbook with the
@@ -908,7 +908,7 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
       Configuration Store</title>
 
       <para><emphasis role="bold">Description:</emphasis> Adding a network
-      bridge to an Offline Config Store in uCPE Manager. For details please
+      bridge to an Offline Config Store in Enea Edge Management. For details please
       refer to:</para>
 
       <itemizedlist>
@@ -925,8 +925,8 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
 
       <itemizedlist>
         <listitem>
-          <para>The Offline Configuration Store should exist in the uCPE
-          Manager. If it does not, the test will say so.</para>
+          <para>The Offline Configuration Store should exist in the Enea Edge
+          Management. If it does not, the test will say so.</para>
         </listitem>
 
         <listitem>
@@ -980,8 +980,8 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
 
       <para><emphasis role="bold">Precondition:</emphasis></para>
 
-      <para>An empty Offline Configuration Store should exist in uCPE
-      Manager.</para>
+      <para>An empty Offline Configuration Store should exist in Enea Edge
+      Management.</para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>configOfflineDPDK.yml</filename> Ansible Playbook with the
@@ -1022,12 +1022,12 @@ INFO: Done</programlisting>
 
       <itemizedlist>
         <listitem>
-          <para>The Offline Configuration Store should exist in the uCPE
-          Manager.</para>
+          <para>The Offline Configuration Store should exist in the Enea Edge
+          Management.</para>
         </listitem>
 
         <listitem>
-          <para>The device should be connected to the uCPE Manager.</para>
+          <para>The device should be connected to the Enea Edge Management.</para>
         </listitem>
       </itemizedlist>
 
@@ -1078,7 +1078,7 @@ INFO: Done</programlisting>
         </listitem>
 
         <listitem>
-          <para>The device should be connected to the uCPE Manager.</para>
+          <para>The device should be connected to the Enea Edge Management.</para>
         </listitem>
       </itemizedlist>
 
@@ -1109,8 +1109,7 @@ INFO: Done</programlisting>
     <title>VNF Deployment and Lifecycle</title>
 
     <para>The following details the automated suite that handles the testing
-    of the instantiation, lifecycle and destruction of a VNF for Enea NFV
-    Access.</para>
+    of the instantiation, lifecycle and destruction of a VNF for Enea Edge.</para>
 
     <section id="inst_vnfi">
       <title>Instantiating a VNFI</title>
@@ -1131,7 +1130,7 @@ INFO: Done</programlisting>
       <para><emphasis role="bold">Preconditions:</emphasis> <itemizedlist>
           <listitem>
             <para>A VNF Image is onboarded and a device is added and connected
-            to the uCPE Manager. Depending on the VNF, other steps may be
+            to the Enea Edge Management. Depending on the VNF, other steps may be
             required.</para>
           </listitem>
 
@@ -1250,8 +1249,8 @@ vnfi=&lt;VNFI-name&gt;"</programlisting><emphasis
         </listitem>
 
         <listitem>
-          <para>Wait for the uCPE device to be connected in the Enea uCPE
-          Manager.</para>
+          <para>Wait for the uCPE device to be connected in the Enea Edge
+          Management.</para>
         </listitem>
 
         <listitem>
@@ -1272,7 +1271,7 @@ vnfi=&lt;VNFI-name&gt;"</programlisting><emphasis
 
         <listitem>
           <para>Instantiate the FortiGate VNF using the basic Firewall
-          configuration provided with your Enea NFV Access Release, and the
+          configuration provided with your Enea Edge Release, and the
           Fortigate License file.</para>
 
           <note>
@@ -1323,7 +1322,7 @@ vnfi=&lt;VNFI-name&gt;"</programlisting><emphasis
         <itemizedlist>
           <listitem>
             <para>A device must have been previously added and connected to
-            the uCPE Manager instance.</para>
+            the Enea Edge Management instance.</para>
           </listitem>
 
           <listitem>
@@ -1447,7 +1446,7 @@ FortigateFWInstance tested successfully!</programlisting></para>
         <itemizedlist>
           <listitem>
             <para>A device must have been previously added and connected to
-            the uCPE Manager instance.</para>
+            the Enea Edge Management instance.</para>
           </listitem>
 
           <listitem>
@@ -1500,9 +1499,9 @@ FortigateFWInstance tested successfully!</programlisting></para>
               <listitem>
                 <para><olink targetdoc="book_enea_nfv_access_example_usecases"
                 targetptr="fortigate_firewall_uc_1">FortiGate VNF as a
-                Firewall in the <ns:include
+                Firewall in the <xi:include
                 href="../../s_docbuild/olinkdb/pardoc-names.xml"
-                xmlns:ns="http://www.w3.org/2001/XInclude"
+                xmlns:xi="http://www.w3.org/2001/XInclude"
                 xpointer="element(book_enea_nfv_access_example_usecases/1)" /></olink>
                 Manual.</para>
               </listitem>
@@ -1511,8 +1510,8 @@ FortigateFWInstance tested successfully!</programlisting></para>
                 <para><olink
                 targetdoc="book_enea_nfv_access_auto_fw_th_user_guide"
                 targetptr="python_testsuite">Python Unit-Test Suite in
-                <ns:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
-                xmlns:ns="http://www.w3.org/2001/XInclude"
+                <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>
               </listitem>
             </itemizedlist>
@@ -1542,7 +1541,7 @@ FortigateFW Scenario deployed successfully!</programlisting></para>
 
       <para><emphasis role="bold">Description:</emphasis> This sample test
       case corresponds to the "VNF Chaining Example Use-case" from the Enea
-      NFV Access Example Use-cases manual.</para>
+      Edge Example Use-cases manual.</para>
 
       <para>For details please refer to:</para>
 
@@ -1565,7 +1564,7 @@ FortigateFW Scenario deployed successfully!</programlisting></para>
       <itemizedlist>
         <listitem>
           <para>Two devices must have been previously added and connected to
-          the uCPE Manager instance.</para>
+          the Enea Edge Management instance.</para>
         </listitem>
 
         <listitem>
@@ -1726,7 +1725,7 @@ LAN-to-LAN connectivity (through VPN tunnel)tested successfully!</programlisting
 
     <orderedlist spacing="compact">
       <listitem>
-        <para>Upload a Custom Script onto the uCPE Manager.</para>
+        <para>Upload a Custom Script onto the Enea Edge Management.</para>
       </listitem>
 
       <listitem>
@@ -1746,7 +1745,7 @@ LAN-to-LAN connectivity (through VPN tunnel)tested successfully!</programlisting
       </listitem>
 
       <listitem>
-        <para>Remove the Custom Script from the uCPE Manager.</para>
+        <para>Remove the Custom Script from the Enea Edge Management.</para>
       </listitem>
     </orderedlist>
 
@@ -1755,7 +1754,7 @@ LAN-to-LAN connectivity (through VPN tunnel)tested successfully!</programlisting
     <itemizedlist>
       <listitem>
         <para>A device must have been previously added and connected to the
-        uCPE Manager.</para>
+        Enea Edge Management.</para>
       </listitem>
 
       <listitem>
@@ -1792,7 +1791,7 @@ inteld1521-1 ansible_host=172.24.12.73 ansible_port=22 ansible_user=root \
     <para><emphasis role="bold">Result:</emphasis> Output of
     <filename>basicTest.yml</filename>:</para>
 
-    <programlisting>test_success_after_always was uploaded to uCPE Manager!
+    <programlisting>test_success_after_always was uploaded to Enea Edge Management!
 test_success_after_always was uploaded to &lt;Device-name&gt;!
 
 &lt;Device-name&gt; device is connected!
@@ -1800,6 +1799,6 @@ test_success_after_always from phase always-after-startup was removed \
 from &lt;Device-name&gt;!
 
 test_success_after_always from phase always-after-startup was removed \
-from uCPE Manager!</programlisting>
+from Enea Edge Management!</programlisting>
   </section>
 </chapter>
\ No newline at end of file