Clarify Web-installer success state

Change-Id: I163f69b7f058010dba7dd54bf199ae332f5d131e
Signed-off-by: Andreas Wellving <andreas.wellving@enea.com>

2 files changed, 68 insertions, 55 deletions

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 552e317..796c386 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
@@ -10,8 +10,8 @@
     <para>The current release supports two methods of installation:</para>
     
     <itemizedlist>
-      <listitem><para>Manual installation using the Enea Installer, which 
-        guarantees a clean installation of NFV Access on a uCPE device.</para></listitem>
+      <listitem><para>Manual installation from a USB stick using the Enea NFV Access Web-installer,
+      which guarantees a clean installation of NFV Access on a uCPE device.</para></listitem>
       <listitem><para>Mass installation and automated deployment using
         Bare Metal Provisioning.</para></listitem>
     </itemizedlist>
@@ -245,9 +245,8 @@ of=/dev/sdb bs=4M conv=fsync</programlisting></para>
 
       <orderedlist>
         <listitem>
-          <para>To install and configure a device using the Web-installer,
-          the user must first connect a laptop directly into one of the LAN ports.
-          No other ports should be connected.</para>
+          <para>Plug the USB stick into the uCPE device. Connect a laptop directly into one of the ports that will
+          not later be chosen as a WAN port. No other ports should be connected.</para>
         </listitem>
 
         <listitem>
@@ -258,10 +257,9 @@ of=/dev/sdb bs=4M conv=fsync</programlisting></para>
         <listitem>
           <para>Once the USB stick is properly booted, the Web-installer application starts
             automatically and can be accessed in a web browser at <literal>http://192.168.1.1</literal> (port 80).
-          A DHCP Server is started on the device to serve the connected LAN port, in order to give
-            the laptop an IP-address.</para>
+          </para>
           
-          <para>From there, the user can configure the device with things such as:</para>
+          <para>On the first page of the Web-installer, the user should fill in:</para>
 
           <itemizedlist>
             <listitem>
@@ -269,53 +267,48 @@ of=/dev/sdb bs=4M conv=fsync</programlisting></para>
             </listitem>
 
             <listitem>
-              <para><emphasis role="bold">The Device ID</emphasis>. The device must be previously 
-                added to the uCPE Manager with a unique ID. The Device ID must be the same as the one 
-                previously added in the uCPE Manager for he device.</para>
-
-              <note>
-                <para>To be able to connect, the same Device ID must first be added for the device
-                in uCPE Manager.</para>
-              </note>         
+              <para><emphasis role="bold">The Device ID</emphasis>. The unique identifier of the
+              uCPE device.</para>
+              
             </listitem>
 
             <listitem>
-              <para><emphasis role="bold">Customer Tags</emphasis>. They can be left empty.</para>
+              <para><emphasis role="bold">Customer Tags</emphasis>. They are used for  
+              <link linkend="zero_touch_prov">Zero Touch Provisining (ZTP)</link> and can be left 
+                empty. What can be entered here (as needed), are the tag(s) specified when 
+                creating an offline configuration in the uCPE Manager.</para>
             </listitem>
+          </itemizedlist>
+
+          <para>On the second page of the Web-installer, the user should fill in:</para>
 
+          <itemizedlist>            
             <listitem>
               <para><emphasis role="bold">The Layer 3 configuration of WAN Interface(s)</emphasis>. 
                 Static or Dynamic IP must be specified.</para>
               
               <para>During network configuration, WAN cables will be plugged into the device
-              in order to identify the ports and make them available for configuration. Each 
-                connected port will automatically be set as a WAN port and must be configured 
-                (DHCP is the default setting).</para>
+              in order to identify ports and make them available for configuration. Each 
+              port with a physically connected cable will be automatically set as a WAN port and must be
+              configured (DHCP is the default setting). The user needs to connect the same quantity of 
+                cables as the number of WAN ports that he wishes to configure. No LAN ports should be 
+                connected nor configured at this time. The configured WAN cables cannot be removed 
+                after being configured.</para>
 
               <note>
-                <para>A WAN cable now needs to be added to the device. The LAN port used to access the Web-installer from the laptop will not be shown and cannot be configured.</para></note>      
+                <para>The LAN port used to access the Web-installer from the laptop will not be shown
+              and cannot be configured.</para></note>      
             </listitem>
 
             <listitem>
               <para><emphasis role="bold">The Management Interface</emphasis>. The interface that 
                 will be used by the uCPE Manager to communicate with the device.</para>
               
-              <para>The IP address of this interface will be listed for the device in the uCPE 
-                Manager. The WAN and management interfaces will be marked as such in the 
-                <literal>capabilities</literal> view and are restricted in use. The user can change 
-                the Layer 3 configuration of WAN interfaces and add new ones from the uCPE manager 
-                as needed.</para>
             </listitem>
           </itemizedlist>
         </listitem>
 
         <listitem>
-          <para>The Web-installer stores the user provided configuration in a json metadata file located
-          in <filename>/boot/enea/install_data.json</filename>. There is also a command line tool that can
-          be used to access metadata entries: <literal>nfva-cfgtool</literal>.</para>
-        </listitem>
-
-        <listitem>
           <para>When the user has completed the configuration steps in the Web-installer, NFV Access
           is installed on the hard drive. The largest drive found on the device will be used for
           installation.</para>
@@ -328,31 +321,30 @@ of=/dev/sdb bs=4M conv=fsync</programlisting></para>
       <title>Booting NFV Access</title>
 
       <para>When the installation has finished successfully, the user should remove the USB stick 
-        and ensure that BIOS is configured to boot from the hard drive.</para>
-
-      <para>When the NFV Access installation is booted from the hard drive, it will first check 
-        that the configuration metadata is complete. If any mandatory information is missing, the 
-        Web-installer will be launched on port 82 for post-installation configuration: <literal>
-        http://192.168.1.1:82</literal>. The WAN cable needs to be removed and the device rebooted,
-        enabling the device's DHCP server to give the laptop an IP address over the LAN connection.</para>
-      
-      <para>When all mandatory fields have been filled in, the new configuration is saved, stored 
-        and the device will be rebooted.</para>
-
+      before confirming the reboot of the device in Web-installer and ensure that BIOS is configured
+      to boot from the hard drive.</para>
+
+      <para>When configured with the Web-installer GUI, the uCPE device start-up sequence will 
+        configure the interfaces accordingly and try to register the device in the uCPE manager. 
+        If connectivity is established with the uCPE manager server and a device with a matching 
+        Device ID is found, the configuration is successful, and the connection is established.</para>
+              
       <note>
-        <para>If NFV Access was installed by some other means, such as a PXE mass installation or by
-        simply writing an image to a partition, no <filename>/boot/enea/install_data.json</filename>
-        metadata file will exist and the Web-installer will launch at start-up expecting the
-        user to provide the post-installation configuration.</para>
+        <para>If NFV Access was installed by Bare Metal Provisioning, the Web-installer will launch at
+        start-up expecting the user to provide the post-installation configuration. The Web-installer will
+        be launched on port 82 for post-installation configuration: <literal>
+        http://192.168.1.1:82</literal>.</para>
       </note>
-      
-      <para>Once the configuration is complete, the system proceeds to launch the ODM/vCPE which will
-      configure the interfaces accordingly and try to register the device in the uCPE manager. If
-      connectivity is established with the uCPE manager server and a device with a matching Device ID is
-      found, the configuration is marked as successful, and the connection is established. In case of
-      failure, the Web-installer will be launched for reconfiguration.
-      </para>
 
+      <para>In case of failure, the user should remove all WAN cables, re-attach the laptop, reboot 
+        the device and then access the Web-installer on <literal>http://192.168.1.1:82</literal>.
+      </para>
+      
+      <note>      
+        <para>After having established a successful connection with the uCPE Manager, the user will 
+        connect any LAN cable(s) that should be connected to the device.
+        </para>
+      </note>      
     </section>
 
     <section condition="hidden" id="examples">
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 186c304..27a5632 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
@@ -936,7 +936,28 @@
           device, to be wiped out. Selecting <literal>Replace</literal> will
           set the entire device configuration to match values in the offline
           configuration.</para>
-
+                
+          <para>When a device connects to the uCPE Manager for the first time, it checks the 
+          device to see if it has been Zero Touch Provisioned (ZTP). If not, it looks for 
+          an offline configuration that matches these values, in the following order:</para>
+
+          <itemizedlist>
+            <listitem>
+              <para>The Device ID.</para>
+            </listitem>       
+            
+            <listitem>
+              <para>The set of tags.</para>
+            </listitem>
+            
+            <listitem>
+              <para>A "*" for Device ID (wildcard).</para>
+            </listitem>         
+          </itemizedlist>
+              
+          <para>If a match is found, the offline configuration is sent to the device as part 
+          of Zero-Touch-Provisioning.</para>
+          
           <para>After creating the Offline Config Store, access the device
           through <literal>Applications</literal> -&gt; <literal>offline
           config</literal> -&gt; <literal>Config App</literal> and provision