1 files changed, 123 insertions, 75 deletions

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 477b5c4..da62568 100644
--- a/doc/book-enea-edge-getting-started/doc/installation_guide.xml
+++ b/doc/book-enea-edge-getting-started/doc/installation_guide.xml
@@ -92,14 +92,14 @@
         <para>One or more uCPE devices.</para>
 
         <para>Whitebox devices where the Enea Edge Runtime will be installed,
-        containing a minimum of 2 cores and 4 GB RAM and at least two ethernet
+        containing a minimum of 2 cores and 2 GB RAM and at least two ethernet
         ports that will be configured as WAN and LAN during deployment.</para>
 
         <para>When hosting an entire solution including one or several network
         services, the hardware must also have the resources to host one or
-        more VNFs. During a typical evaluation, a dual VNF service on the Enea
-        Edge Runtime needs a CPU with 4-8 cores and at least 8 GB RAM. The
-        supported Intel CPUs of Enea Edge are documented in the <xi:include
+        more VNFs. A dual VNF service on the Enea Edge Runtime typically needs
+        a CPU with 4-8 cores and at least 8 GB RAM. The supported Intel CPUs
+        of Enea Edge are documented in the <xi:include
         href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xmlns:xi="http://www.w3.org/2001/XInclude"
         xpointer="element(book_enea_edge_release_info/1)" /> Manual.</para>
@@ -121,12 +121,13 @@
 
           <listitem>
             <para>Connecting to the GUI of the Enea Edge Management
-            application for management and configuration. Network access
-            between the CentOS 7 server and the laptop is required. Please see
-            the <xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-            xmlns:xi="http://www.w3.org/2001/XInclude"
-            xpointer="element(book_enea_edge_release_info/1)" /> Manual
-            available with your release, for recommended browsers.</para>
+            application for management and configuration.</para>
+
+            <note>
+              <para>Network access between the CentOS 7 server and the laptop
+              is required. The recommended browser for the current release is
+              Google Chrome.</para>
+            </note>
           </listitem>
         </itemizedlist>
       </listitem>
@@ -479,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>
@@ -503,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
@@ -565,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>
@@ -593,35 +594,51 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
               </listitem>
 
               <listitem>
-                <para>Create the self-signed certificate: <literal>Specify IP or domain name</literal> 
-                  (or press <literal>Enter</literal> to skip):</para>
-
-                  <para>The Tomcat self-signed certificate can be generated
-                  again by running the
-                  <filename>createCertificate.sh</filename>. For more details, please see <olink
-                  targetdoc="book_enea_edge_getting_started"
-                  targetptr="create_certificate">Tomcat Certificate
-                  Generation in the <ns:include
-                  href="../../s_docbuild/olinkdb/pardoc-names.xml"
-                  xpointer="element(book_enea_edge_getting_started/1)"
-                  xmlns:ns="http://www.w3.org/2001/XInclude" /></olink> Manual.</para>
-                
+                <para>Create the self-signed certificate: <literal>Specify IP
+                or domain name</literal> (or press <literal>Enter</literal> to
+                skip):</para>
+
+                <para>The Tomcat self-signed certificate can be generated
+                again by running the
+                <filename>createCertificate.sh</filename>. For more details,
+                please see <olink targetdoc="book_enea_edge_getting_started"
+                targetptr="create_certificate">Tomcat Certificate Generation
+                in the <ns:include
+                href="../../s_docbuild/olinkdb/pardoc-names.xml"
+                xmlns:ns="http://www.w3.org/2001/XInclude"
+                xpointer="element(book_enea_edge_getting_started/1)" /></olink>
+                Manual.</para>
+
                 <note>
-                  <para>The generation of the Tomcat self-signed cerificate
-                  should be skipped only if another certifcate will be
-                  provided.</para>
+                  <para>The generation of the Tomcat self-signed certificate
+                  should be skipped only if another certificate will be
+                  provided. In case a custom certificate is used, not
+                  generated with the <literal>createCertificate.sh</literal>
+                  script, the keystore file containing the certificate must be
+                  manually copied to the <literal>
+                  /opt/ems/ucpemanager/application/config/certificates</literal>
+                  folder, after the installation is done. The application must
+                  then be restarted in order for the certificate to take
+                  effect. The default name of the file is
+                  <filename>.Keystore</filename>.</para>
+
+                  <para>To change the default name, the configuration file
+                  <filename>server.xml</filename> from the
+                  <literal>/opt/ems/ucpemanager/application/3rdParty/apache-tomcat/conf/config</literal>
+                  folder must be copied to
+                  <literal>/opt/ems/ucpemanager/application/config/</literal>.
+                  The <literal>keystoreFile</literal> attribute from the
+                  <literal>&lt;Connector executor="tomcatThreadPool"</literal>
+                  tag must also be changed. Similarly, if a password has been
+                  set, it should be added to the
+                  <literal>keystorePass</literal> attribute:
+                  <literal>keystorePass="NEW_PASSWORD"</literal>.</para>
                 </note>
               </listitem>
 
               <listitem>
-                <para>Heap Configuration:</para> 
-                
-                <itemizedlist spacing="compact">
-                    <listitem>
-                      <para>Please enter the new Maximum Heap Size
-                      [4g]:</para>
-                    </listitem>
-                  </itemizedlist>
+                <para>Heap Configuration: <literal>Please enter the new
+                Maximum Heap Size [4g]</literal>:</para>
               </listitem>
             </itemizedlist>
 
@@ -649,16 +666,17 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
           </listitem>
 
           <listitem>
-            <para>Using the IPv4 address of the CentOS 7 Server in a web
-            browser, running on the laptop, log into the Enea Edge Management
-            GUI using the default username and password:
+            <para>Using the IPv4 address or the FQDN of the CentOS 7 Server in
+            a web browser, running on the laptop, log into the Enea Edge
+            Management GUI using the default username and password:
             <literal>admin/admin</literal>.</para>
           </listitem>
         </orderedlist>
 
         <note>
-          <para>The IPv4 address of the CentOS 7 Server will be used as a configuration
-          parameter when setting up the uCPE devices.</para>
+          <para>The IPv4 address or the FQDN of the CentOS 7 Server will be
+          used as a configuration parameter when setting up the uCPE
+          devices.</para>
 
           <para>If the CentOS 7 Server is installed behind NAT, the IPv4
           address used will be the public IP of the NAT device and port
@@ -692,9 +710,9 @@ 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
-          for recovery of the Enea Edge Management application. For more
-          details, see <olink targetdoc="book_enea_edge_getting_started"
+          (<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
           Management installation in the <xi:include
           href="../../s_docbuild/olinkdb/pardoc-names.xml"
@@ -708,7 +726,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>
@@ -754,10 +772,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;processor&gt;.hddimg \
 of=/dev/sdb bs=4M conv=fsync</programlisting>
 
-          <para>Where <filename>enea-nfv-access-&lt;machine&gt;.hddimg</filename> is
+          <para>Where
+          <filename>enea-edge-runtime-&lt;processor&gt;.hddimg</filename> is
           the <filename>.hddimg</filename> file and <literal>sdb</literal> is
           the assigned USB device name.</para>
         </listitem>
@@ -767,7 +786,7 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
     <section id="prep_phys_deploy">
       <title>Preparing Physical Deployment for Installation</title>
 
-      <figure>
+      <figure id="prep_hw_installation">
         <title>Preparing for Hardware Installation</title>
 
         <mediaobject>
@@ -911,15 +930,16 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
               be entered here (if needed), are the tag(s) specified when
               creating an offline configuration in the Enea Edge Management
               application. A later addition of customer tags can only be done
-              by reinstalling the uCPE devices.</para>
+              by re-installing the uCPE devices.</para>
             </listitem>
           </itemizedlist>
         </listitem>
 
         <listitem>
-          <para>Connect the WAN cable to the uCPE device (see Figure 2). This
-          will be used as the uCPE management network interface, as described
-          below.</para>
+          <para>Connect the WAN cable to the uCPE device (see <link
+          linkend="prep_hw_installation">Figure 2.1 Preparing for Hardware
+          Installation</link>). This will be used as the uCPE management
+          network interface, as described below.</para>
         </listitem>
 
         <listitem>
@@ -934,8 +954,31 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
             </listitem>
 
             <listitem>
-              <para>Plug-in additional WAN interfaces (if applicable) and
-              provide their Layer 3 configuration.</para>
+              <para>Plug in additional WAN interfaces (if applicable) and
+              provide their Layer 3 configuration. An interface can be
+              configured in <literal>dhcp</literal> or
+              <literal>static</literal> mode. When configured in static mode,
+              the following options are available:</para>
+
+              <itemizedlist spacing="compact">
+                <listitem>
+                  <para>Static IP (mandatory)</para>
+                </listitem>
+
+                <listitem>
+                  <para>Netmask (mandatory)</para>
+                </listitem>
+
+                <listitem>
+                  <para>Gateway (mandatory)</para>
+                </listitem>
+
+                <listitem>
+                  <para>DNS Server List (a comma separated list of IPv4
+                  addresses) (optional). If left empty it will use the Gateway
+                  as the DNS, with 1.1.1.1 as fallback.</para>
+                </listitem>
+              </itemizedlist>
             </listitem>
           </itemizedlist>
         </listitem>
@@ -963,7 +1006,7 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
     <section id="prep_phys_exec">
       <title>Preparing Physical Deployment for Execution</title>
 
-      <figure>
+      <figure id="prep_deploy_execution">
         <title>Preparing for Deployment Execution</title>
 
         <mediaobject>
@@ -1138,8 +1181,9 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
       (disconnected) in the Enea Edge Management application. The uCPE device
       configuration can be corrected by removing the WAN cable(s),
       reconnecting the laptop to the LAN interface of the uCPE device and
-      rebooting it. At this point, the Web-installer can be accessed from the
-      laptop as described in <olink targetdoc="book_enea_edge_getting_started"
+      rebooting it. After a timeout of a few minutes, the Web-installer can be
+      accessed from the laptop as described in <olink
+      targetdoc="book_enea_edge_getting_started"
       targetptr="install_ena_device">Installing Enea Edge - uCPE Device
       installation in the <xi:include
       href="../../s_docbuild/olinkdb/pardoc-names.xml"
@@ -1156,7 +1200,8 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
     application, it is ready for central management. Two important functions
     available in the Enea Edge Management GUI are alarm checking and resource
     allocation. Additionally, the device can be rebooted, the factory settings
-    can be restored or simply the vCPE service can be restarted.</para>
+    can be restored or simply the Enea Edge Management Agent service can be
+    restarted.</para>
 
     <section id="check_alarms">
       <title>Checking Alarms</title>
@@ -1182,17 +1227,17 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
       in use.</para>
 
       <para>To check CPU, RAM and disk utilization simply select the uCPE
-      device and go to the <emphasis role="bold">Virtual Machines</emphasis>
-      tab in the map view. The same view will show active VNFs running on the
-      uCPE device once instantiated.</para>
+      device and go to the device view tab (the tab bears the device name 
+        as its title). The same view will show active VNFs running on the 
+        uCPE device once instantiated.</para>
     </section>
 
     <section id="basic_oper_device">
-      <title>Basic operations for uCPE device Managememt</title>
+      <title>Basic operations for uCPE device Management</title>
 
       <para>When the uCPE device is connected to the Enea Edge Management
       application, it can be rebooted, the factory settings can be restored or
-      simply the vCPE service can be restarted.</para>
+      simply the Enea Edge Management Agent service can be restarted.</para>
 
       <para>Select the uCPE device and go to the <emphasis
       role="bold">Operations</emphasis> menu, where the following options are
@@ -1207,20 +1252,23 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
         <listitem>
           <para><emphasis role="bold">Factory reset</emphasis>. Resets the
           device to its default factory settings. All current configuration
-          settings are lost. All running VNFs are destroyed. Any installed
-          custom scripts will be removed and they will need to be
-          reinstalled.</para>
+          settings are lost. All running VNFs are destroyed. All uploaded VM
+          image files are deleted. Existing log files will be kept.</para>
 
-          <para>Only the vCPE service will be restarted, the device will not
-          be rebooted. No reboot is needed.</para>
+          <para>This command will only restart the Enea Edge Management Agent
+          service, the device will not be rebooted. No reboot is
+          needed.</para>
 
-          <para>Once the vCPE service restart completes, appropriate day-0
-          provisioning will take place.</para>
+          <para>Once the service restart completes, appropriate day-0
+          provisioning will take place. Previously installed custom scripts
+          will be reinstalled on the uCPE device, and upon receiving the
+          custom script(s), the device will reboot.</para>
         </listitem>
 
         <listitem>
           <para><emphasis role="bold">Restart Vcpe</emphasis>. Restarts the
-          vCPE service on the device. The device will not be rebooted.</para>
+          Enea Edge Management Agent service. The device will not be
+          rebooted.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -1252,4 +1300,4 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
       </note>
     </section>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file