Merge branch 'feature_CPDX-3570' into develop

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

10 files changed, 57 insertions, 55 deletions

diff --git a/doc/book-enea-edge-example-usecases/doc/appendix_4.xml b/doc/book-enea-edge-example-usecases/doc/appendix_4.xml
index f52e33d..4d30ff6 100644
--- a/doc/book-enea-edge-example-usecases/doc/appendix_4.xml
+++ b/doc/book-enea-edge-example-usecases/doc/appendix_4.xml
@@ -93,7 +93,7 @@
   <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 \
+&gt; python unittestSuite.py -u admin -p admin -H &lt;EneaEdgeManagement 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
diff --git a/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml b/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
index cc6ea9d..84b70ec 100644
--- a/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
+++ b/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
@@ -127,7 +127,7 @@
 
         <para>Installation Configuration File Example:</para>
 
-        <programlisting>image_url = http://192.168.1.100/enea-nfv-access-xeon-d.hddimg.gz
+        <programlisting>image_url = http://192.168.1.100/enea-edge-runtime-xeon-d.hddimg.gz
 install_drive = /dev/sda</programlisting>
 
         <note>
@@ -144,9 +144,9 @@ install_drive = /dev/sda</programlisting>
         <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
+        <programlisting>default enea_edge_runtime
+label enea_edge_runtime
+menu label ^ENEA_EDGE_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; \
@@ -300,7 +300,7 @@ ipmitool -U &lt;user&gt; -P &lt;password&gt; -H &lt;uCPE device IPMI IP address&
       <title>Customizing Automatic Hugepage Reservation</title>
 
       <para>Configuration of Hugepage reservation is done in
-      <literal>/etc/enea-nfv-access/hugepages.cfg</literal>.</para>
+      <literal>/etc/enea/hugepages.cfg</literal>.</para>
 
       <para><emphasis role="bold">Parameters used by the automatic algorithm:
       </emphasis></para>
@@ -428,11 +428,11 @@ node0.1048576kB = 3 </programlisting>
         <literal>Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</literal></para>
 
         <para>The directory in which the archive has been unpacked will be
-        denoted as: <literal>&lt;uCPEM-installerdir&gt;</literal>.</para>
+        denoted as: <literal>&lt;EEMg-installerdir&gt;</literal>.</para>
       </listitem>
 
       <listitem>
-        <para>Enter <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
+        <para>Enter <literal>&lt;EEMg-installerdir&gt;/dist</literal>.</para>
       </listitem>
 
       <listitem>
@@ -440,7 +440,7 @@ node0.1048576kB = 3 </programlisting>
         to the location where the Enea Edge Management application is
         installed:</para>
 
-        <programlisting>./createCertificate.sh ucpemanager &lt;IP_or_domain&gt; \
+        <programlisting>./createCertificate.sh EneaEdgeManagement &lt;IP_or_domain&gt; \
             /opt/ems [&lt;service_username&gt;]</programlisting>
 
         <para>Where the following need to be included:</para>
@@ -965,7 +965,7 @@ galera-4-26.4.6-1.el7.centos.x86_64</programlisting>
 #wsrep_provider_options=
 
 # Logical cluster name. Should be the same for all nodes.
-<emphasis role="bold">wsrep_cluster_name="ucpemanager"</emphasis>
+<emphasis role="bold">wsrep_cluster_name="EneaEdgeManagement"</emphasis>
 
 # Group communication system handle
 <emphasis role="bold">wsrep_cluster_address="gcomm://192.168.10.11,192.168.10.12,..,192.168.10.16"</emphasis>
@@ -1070,11 +1070,11 @@ Thanks for using MariaDB!</programlisting>
             <para>Create the initial database and grant access to it:</para>
 
             <programlisting>[root@localhost application]# mysql --host=localhost --user=root -p
-MariaDB [(none)]&gt; CREATE DATABASE ucpemanager CHARACTER SET='utf8' \
+MariaDB [(none)]&gt; CREATE DATABASE EneaEdgeManagement CHARACTER SET='utf8' \
 COLLATE='utf8_bin';
 Query OK, 1 row affected (0.004 sec)
 
-MariaDB [(none)]&gt; GRANT ALL PRIVILEGES ON ucpemanager.* \
+MariaDB [(none)]&gt; GRANT ALL PRIVILEGES ON EneaEdgeManagement.* \
 TO 'enea'@'%' IDENTIFIED BY 'somepassword' WITH GRANT OPTION;</programlisting>
           </listitem>
         </orderedlist>
@@ -1114,7 +1114,7 @@ TO 'enea'@'%' IDENTIFIED BY 'somepassword' WITH GRANT OPTION;</programlisting>
         Management application, and run:</para>
 
         <programlisting>[root@localhost distro]#./install.sh /opt/ \
-Enea_NFV_Access_uCPEManager_2.3.0-build23.tar.gz
+Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz
 This will install the Enea Edge Management application into the /opt/ucpemanager folder.
 Select the following options, while asked by the installation script:
 Are you using the embedded PostgreSQL database? [Y/N]: <emphasis role="bold">N</emphasis>
@@ -1133,12 +1133,12 @@ Creating database configuration file \
 Done .
 …
 Installing ucpemanager service ..
-Specify service username [ucpemanager]: 
-Specify service password [ucpemanager]: somepassword
+Specify service username [EneaEdgeManagement]: 
+Specify service password [EneaEdgeManagement]: somepassword
 …
 Specify the IP address of the local interface: <emphasis role="bold">192.168.10.11</emphasis>
 Is this server part of a cluster? [Y/N]: <emphasis role="bold">Y</emphasis>
-Specify the name of the cluster [ucpemanager]: 
+Specify the name of the cluster [EneaEdgeManagement]: 
 Specify the shared (virtual) cluster IP address: <emphasis role="bold">192.168.10.10</emphasis>
 Specify the netmask for the cluster IP address [255.255.255.0]: 
 Specify the IP address of the (optional) arbiter: <emphasis role="bold">192.168.10.13</emphasis>
diff --git a/doc/book-enea-edge-getting-started/doc/installation_guide.xml b/doc/book-enea-edge-getting-started/doc/installation_guide.xml
index 2297cda..2e1fe7e 100644
--- a/doc/book-enea-edge-getting-started/doc/installation_guide.xml
+++ b/doc/book-enea-edge-getting-started/doc/installation_guide.xml
@@ -480,12 +480,12 @@ userdel postgres</programlisting>
             <literal>Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</literal></para>
 
             <para>The directory in which the archive has been unpacked will be
-            denoted as: <literal>&lt;uCPEM-installerdir&gt;</literal>.</para>
+            denoted as: <literal>&lt;EEMg-installerdir&gt;</literal>.</para>
           </listitem>
 
           <listitem>
             <para>Enter
-            <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
+            <literal>&lt;EEMg-installerdir&gt;/dist</literal>.</para>
           </listitem>
 
           <listitem>
@@ -495,8 +495,8 @@ userdel postgres</programlisting>
             installation folder.</para>
 
             <para>The application files will be installed in
-            <literal>/opt/ems/ucpemanager/application</literal>. The database
-            will be installed in
+            <literal>/opt/ems/ucpemanager/application</literal>. The
+            database will be installed in
             <literal>/opt/ems/ucpemanager/database</literal>.</para>
           </listitem>
 
@@ -504,7 +504,7 @@ userdel postgres</programlisting>
             <para>Run the following interactive command:</para>
 
             <programlisting>./install.sh /opt/ems \
-Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programlisting>
+Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programlisting>
 
             <para>The default configuration values are specified in brackets.
             If no other value is preferred and typed in, pressing
@@ -566,12 +566,12 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
                 <itemizedlist spacing="compact">
                   <listitem>
                     <para>Specify a service username
-                    <literal>[ucpemanager]:</literal></para>
+                    <literal>[EneaEdgeManagement]</literal>:</para>
                   </listitem>
 
                   <listitem>
                     <para>Specify a service password
-                    <literal>[ucpemanager]</literal>:</para>
+                    <literal>[EneaEdgeManagement]</literal>:</para>
                   </listitem>
                 </itemizedlist>
               </listitem>
@@ -636,11 +636,13 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
               <listitem>
                 <para>Install the Enea Edge Management application as a
-                service with the name <literal>ucpemanager</literal>.</para>
+                service with the name
+                <literal>ucpemanager</literal>.</para>
               </listitem>
 
               <listitem>
-                <para>Start the <literal>ucpemanager</literal> service.</para>
+                <para>Start the <literal>ucpemanager</literal>
+                service.</para>
               </listitem>
             </itemizedlist>
           </listitem>
@@ -677,8 +679,8 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
         role="bold">System</emphasis> menu, and clicking <emphasis
         role="bold">System Backup</emphasis>, from the Enea Edge Management
         GUI. The resulting zip archive will be located in the
-        <filename>/opt/ems/ucpemanager/application/backup</filename> folder
-        and will be named
+        <filename>/opt/ems/ucpemanager/application/backup</filename>
+        folder and will be named
         <literal>SystemBackup_MMMDD_YYYY_HHMM_SS.zip</literal> (e.g
         System-Backup_Feb19_2013_2257_42.zip). Save the archive to another
         location outside the Enea Edge Management installation folder for
@@ -689,7 +691,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
           GUI (<filename>SystemBackup_MMMDD_YYYY_HHMM_SS.zip</filename>) is
           different from the snapshot obtained during an Enea Edge Management
           Upgrade or Uninstall operation
-          (<filename>ucpemanager-Backup-YYYYddMMHHmm.tar.gz</filename>) needed
+          (<filename>EneaEdgeManagement-Backup-YYYYddMMHHmm.tar.gz</filename>) needed
           for recovery of the Enea Edge Management application. For more
           details, see <olink targetdoc="book_enea_edge_getting_started"
           targetptr="restore_prev_ucpe_install">Restoring a previous Enea Edge
@@ -705,7 +707,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
         installation:</para>
 
         <programlisting>./install.sh \
-/opt/ems Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz \
+/opt/ems Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz \
 SystemBackup_MMMDD_YYYY_HHMM_SS.zip</programlisting>
       </section>
     </section>
@@ -751,11 +753,11 @@ sdb       8:0    0    111.8G  0   disk
           <para>Copy the <filename>.hddimg</filename> image onto the USB
           stick, e.g:</para>
 
-          <programlisting>sudo dd if=./enea-nfv-access-&lt;machine&gt;.hddimg \
+          <programlisting>sudo dd if=./enea-edge-runtime-&lt;machine&gt;.hddimg \
 of=/dev/sdb bs=4M conv=fsync</programlisting>
 
           <para>Where
-          <filename>enea-nfv-access-&lt;machine&gt;.hddimg</filename> is the
+          <filename>enea-edge-runtime-&lt;machine&gt;.hddimg</filename> is the
           <filename>.hddimg</filename> file and <literal>sdb</literal> is the
           assigned USB device name.</para>
         </listitem>
diff --git a/doc/book-enea-edge-getting-started/doc/log_collector.xml b/doc/book-enea-edge-getting-started/doc/log_collector.xml
index 1148dc2..d7d99dd 100644
--- a/doc/book-enea-edge-getting-started/doc/log_collector.xml
+++ b/doc/book-enea-edge-getting-started/doc/log_collector.xml
@@ -341,7 +341,7 @@
       collected uCPE device logs to the support team provides important
       information for troubleshooting (especially in cases of connectivity
       issues with the uCPE device and error popups).</para>
-
+          
       <para>Enea Edge Management log files are located in
       <filename>application/logs/</filename> in the Enea Edge Management
       application's installation folder
@@ -358,7 +358,7 @@
 
         <listitem>
           <para>Select the desired log file
-          (<filename>ucpemanager.log</filename> or
+          (<filename>EneaEdgeManagement.log</filename> or
           <filename>watchdog.log</filename>) and press the <emphasis
           role="bold">Download</emphasis> button.</para>
         </listitem>
diff --git a/doc/book-enea-edge-getting-started/doc/troubleshooting.xml b/doc/book-enea-edge-getting-started/doc/troubleshooting.xml
index fcf991e..3145f32 100644
--- a/doc/book-enea-edge-getting-started/doc/troubleshooting.xml
+++ b/doc/book-enea-edge-getting-started/doc/troubleshooting.xml
@@ -96,7 +96,7 @@
 
           <entry>If a working snapshot obtained during a previous Upgrade or
           Uninstall is available
-          (<filename>ucpemanager-Backup-YYYYddMMHHmm.tar.gz</filename>):
+          (<filename>EneaEdgeManagement-Backup-YYYYddMMHHmm.tar.gz</filename>):
           <orderedlist>
               <listitem>
                 <para>Cleanup the current upgrade attempt with:</para>
diff --git a/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml b/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml
index ac2ebb6..7c9c1f9 100644
--- a/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml
+++ b/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml
@@ -24,11 +24,11 @@
         folder.</para>
 
         <para>The directory in which the archive has been unpacked will be
-        denoted as <literal>&lt;uCPEM-installerdir&gt;</literal>.</para>
+        denoted as <literal>&lt;EEMg-installerdir&gt;</literal>.</para>
       </listitem>
 
       <listitem>
-        <para>Enter <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
+        <para>Enter <literal>&lt;EEMg-installerdir&gt;/dist</literal>.</para>
       </listitem>
 
       <listitem>
@@ -37,7 +37,7 @@
         Management installation:</para>
 
         <programlisting>./upgrade.sh /opt/ems \
-Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programlisting>
+Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programlisting>
       </listitem>
     </orderedlist>
 
@@ -52,9 +52,9 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
       <listitem>
         <para>Create a compressed file of the <literal>ucpemanager</literal>
         application folder
-        (<filename>ucpemanager-Back-up-YYYYddMMHHmm.tar.gz</filename>), which
+        (<filename>EneaEdgeManagement-Backup-YYYYddMMHHmm.tar.gz</filename>), which
         contains a snapshot of the existing installation in the
-        <literal>&lt;uCPEM-installerdir&gt;/dist</literal> directory.</para>
+        <literal>&lt;EEMg-installerdir&gt;/dist</literal> directory.</para>
 
         <note>
           <para>The snapshot file created during the upgrade can be used for
@@ -104,19 +104,19 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
         <listitem>
           <para>The directory in which the archive has been unpacked will be
-          denoted as <literal>&lt;uCPEM-installerdir&gt;</literal>.</para>
+          denoted as <literal>&lt;EEMg-installerdir&gt;</literal>.</para>
         </listitem>
 
         <listitem>
           <para>Copy the snapshot file
-          (<filename>ucpemanager-Backup-YYYYddMMHHmm.tar.gz</filename>)
+          (<filename>EneaEdgeManagement-Backup-YYYYddMMHHmm.tar.gz</filename>)
           created during a previous Enea Edge Management Upgrade or Enea Edge
           Management Uninstall Operation into the
-          <literal>&lt;uCPEM-installerdir&gt;/dist</literal> directory.</para>
+          <literal>&lt;EEMg-installerdir&gt;/dist</literal> directory.</para>
         </listitem>
 
         <listitem>
-          <para>Enter <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
+          <para>Enter <literal>&lt;EEMg-installerdir&gt;/dist</literal>.</para>
         </listitem>
 
         <listitem>
@@ -124,7 +124,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
           <literal>/opt/ems</literal> to the correct location of the Enea Edge
           Management installation:</para>
 
-          <programlisting>./restore.sh /opt/ems ucpemanager-Backup-YYYYddMMHHmm.tar.gz</programlisting>
+          <programlisting>./restore.sh /opt/ems EneaEdgeManagement-Backup-YYYYddMMHHmm.tar.gz</programlisting>
         </listitem>
       </orderedlist>
 
@@ -158,12 +158,12 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
         <listitem>
           <para>Navigate to the folder where the Enea Edge Management
           application is unpacked:
-          <filename>&lt;uCPEM-installerdir&gt;</filename>.</para>
+          <filename>&lt;EEMg-installerdir&gt;</filename>.</para>
         </listitem>
         
         <listitem>
           <para>Enter
-          <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
+          <literal>&lt;EEMg-installerdir&gt;/dist</literal>.</para>
         </listitem>
 
         <listitem>
@@ -186,7 +186,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
         <listitem>
           <para>Create a compressed file of the <literal>ucpemanager</literal>
           application folder:
-          <filename>ucpemanager-Back-up-YYYYddMMHHmm.tar.gz</filename>, which
+          <filename>EneaEdgeManagement-Backup-YYYYddMMHHmm.tar.gz</filename>, which
           contains a snapshot of the existing installation and functions as a
           restore point.</para>
 
diff --git a/doc/book-enea-edge-management-open-source/doc/README b/doc/book-enea-edge-management-open-source/doc/README
index 1077acb..cb17733 100644
--- a/doc/book-enea-edge-management-open-source/doc/README
+++ b/doc/book-enea-edge-management-open-source/doc/README
@@ -1,4 +1,4 @@
-The licenses.xml in the git repository of Enea NFV Access Open Source Report
-is the frozen version belonging to the last official release of Enea NFV Access.
+The licenses.xml in the git repository of the Enea Edge Open Source Report
+is the frozen version belonging to the last official release of Enea Edge.
 The contents must be generated from the release script to obtain the latest
 lists of packages and licenses.
diff --git a/doc/book-enea-edge-runtime-open-source/doc/README b/doc/book-enea-edge-runtime-open-source/doc/README
index 607ce67..6aeccc9 100644
--- a/doc/book-enea-edge-runtime-open-source/doc/README
+++ b/doc/book-enea-edge-runtime-open-source/doc/README
@@ -1,4 +1,4 @@
-The licenses.xml in the git repository of Enea NFV Access Runtime Platform Open Source Report
-is the frozen version belonging to the last official release of Enea NFV Access.
+The licenses.xml in the git repository of the Enea Edge Runtime Platform Open Source Report
+is the frozen version belonging to the last official release of Enea Edge.
 The contents must be generated from the release script to obtain the latest
-lists of packages and licenses.
+lists of packages and licenses.
\ No newline at end of file
diff --git a/doc/book-enea-edge-runtime-open-source/doc/licenses.xml b/doc/book-enea-edge-runtime-open-source/doc/licenses.xml
index 6f9aa06..45e6076 100644
--- a/doc/book-enea-edge-runtime-open-source/doc/licenses.xml
+++ b/doc/book-enea-edge-runtime-open-source/doc/licenses.xml
@@ -1786,7 +1786,7 @@ specific documentation.-->
 <row>
  <entry>ntp-user-stub</entry>
  <entry>1.0</entry>
- <entry>The NTP user/group were added in previous NFVA releases and are needed for OSTree upgrades to ensure backwards compatibility.</entry>
+ <entry>The NTP user/group were added in previous Enea Edge releases and are needed for OSTree upgrades to ensure backwards compatibility.</entry>
  <entry>Enea</entry>
 </row>
 <row>
diff --git a/doc/book-enea-edge-telemetry-open-source/doc/README b/doc/book-enea-edge-telemetry-open-source/doc/README
index 1077acb..e5cb471 100644
--- a/doc/book-enea-edge-telemetry-open-source/doc/README
+++ b/doc/book-enea-edge-telemetry-open-source/doc/README
@@ -1,4 +1,4 @@
-The licenses.xml in the git repository of Enea NFV Access Open Source Report
-is the frozen version belonging to the last official release of Enea NFV Access.
+The licenses.xml in the git repository of Enea Edge Open Source Report
+is the frozen version belonging to the last official release of Enea Edge.
 The contents must be generated from the release script to obtain the latest
 lists of packages and licenses.