Last updates needed.

Change-Id: I9784e1a0c5103364f2e7df60b0c0d2dbd22312fa

4 files changed, 152 insertions, 107 deletions

diff --git a/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml b/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml
index 943e1ef..922be79 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml
@@ -3,11 +3,9 @@
   <title>Prerequisites</title>
 
   <section id="prereq_table">
-    <title>Prerequisites</title>
+    <title>Required Elements</title>
 
     <table>
-      <title>Required Elements</title>
-
       <tgroup cols="2">
         <colspec align="left" />
 
@@ -23,7 +21,7 @@
           <row>
             <entry>Two uCPE whitebox devices containing:<itemizedlist>
                 <listitem>
-                  <para>Processor: Intel xeon-D/atom-C3000 with min. 4
+                  <para>Processor: Intel Xeon D-1500 / Atom C3000 with min. 4
                   CPUs.</para>
                 </listitem>
 
@@ -40,9 +38,14 @@
                 </listitem>
               </itemizedlist></entry>
 
-            <entry><itemizedlist>
+            <entry>
+              <itemizedlist>
                 <listitem>
-                  <para>One network interface connected to WAN.</para>
+                  <para>One network interface connected to WAN.<note>
+                      <para>For this release, only a dynamic IP address is
+                      supported. The WAN interfaces receives the IP address
+                      from the DHCP server.</para>
+                    </note></para>
                 </listitem>
 
                 <listitem>
@@ -51,23 +54,24 @@
 
                 <listitem>
                   <para>NFV Access installed on both uCPE devices. Please see
-                  Enea NFV Access Getting Started Manual, chapter "Enea NFV
-                  Access Installer"<remark>make this into an olink</remark>
-                  for more details.</para>
+                  <emphasis>Enea NFV Access Getting Started</emphasis> Manual,
+                  chapter "Getting Started with Enea NFV Access" for more
+                  details.</para>
                 </listitem>
-              </itemizedlist></entry>
+              </itemizedlist>
+            </entry>
           </row>
 
           <row>
             <entry>Management machine - Linux based (CentOS)</entry>
 
-            <entry><itemizedlist>
+            <entry>
+              <itemizedlist>
                 <listitem>
                   <para>The uCPE Manager is installed on this host or virtual
-                  machine. Pease see the <emphasis>Enea NFV Access Getting
+                  machine. See the <emphasis>Enea NFV Access Getting
                   Started</emphasis> Manual, chapter "Getting Started with
-                  Enea uCPE Manager" for more details <remark>make this into
-                  an olink</remark>.</para>
+                  Enea uCPE Manager" for more details.</para>
                 </listitem>
 
                 <listitem>
@@ -81,7 +85,8 @@
                   from any machine connected on the same network with the uCPE
                   device.</para>
                 </listitem>
-              </itemizedlist></entry>
+              </itemizedlist>
+            </entry>
           </row>
         </tbody>
       </tgroup>
@@ -89,25 +94,66 @@
   </section>
 
   <section id="rel_struc_evalkit221">
-    <title>Release structure</title>
+    <title>Release Structure</title>
 
     <programlisting>|----enea-nfv-access-atom-c3000-20191210210825.hddimg
 |----ea-nfv-access-xeon-d-20191210210913.hddimg
-|----nfvaccess2.2.1_af-th.zip
+|----nfvaccess_evalkit_2.2.1_af-th.zip 
 |----ucpeManager_1.0.1_b3-CentOS.tar.gz
 |----doc
 |----VNFs
-   |----EneaVNF
-          |----enea-nfv-access-vnf-qemux86-64.wic.qcow2
-   |----flexiWAN
-          |----flexiWAN_cloudinit.iso
-          |----flexiWAN.qcow2
-          |----flexiwant-cloud-init-example.tar.gz
-   |----pfSense
-          |----pfsense_192_168_1_1.iso
-          |----pfsense_192_168_2_1.iso
-          |----pfsense_config_192_168_1_1.xml
-          |----pfsense_config_192_168_2_1.xml
-          |----pfSense.qcow2</programlisting>
+      |----EneaVNF
+             |----enea-nfv-access-vnf-qemux86-64.wic.qcow2
+      |----flexiWAN
+             |----flexiWAN_cloudinit.iso
+             |----flexiWAN.qcow2
+             |----flexiwant-cloud-init-example.tar.gz
+      |----pfSense
+             |----pfsense_192_168_1_1.iso
+             |----pfsense_192_168_2_1.iso
+             |----pfsense_config_192_168_1_1.xml
+             |----pfsense_config_192_168_2_1.xml
+             |----pfSense.qcow2</programlisting>
+  </section>
+
+  <section id="known_lims">
+    <title>Known Issues and Limitations</title>
+
+    <itemizedlist>
+      <listitem>
+        <para>The flexiWAN VNF image was generated by Enea for use only under
+        the scope of this EvalKit release.</para>
+      </listitem>
+
+      <listitem>
+        <para>The pfSense cloud-init image was configured only for the EvalKit
+        setup.</para>
+      </listitem>
+
+      <listitem>
+        <para>The usage of VNFs images mentioned above outside of the
+        delivered scenario is not guaranteed and not supported.</para>
+      </listitem>
+
+      <listitem>
+        <para>The customer must be aware and follow the pfSense and flexiWAN
+        legal requirements availble in the following links:</para>
+
+        <itemizedlist spacing="compact">
+          <listitem>
+            <para><ulink
+            url="https://flexiwan.com/legal/eula/">https://flexiwan.com/legal/eula/</ulink></para>
+          </listitem>
+
+          <listitem>
+            <para><ulink
+            url="https://github.com/pfsense/pfsense/blob/master/LICENSE">https://github.com/pfsense/pfsense/blob/master/LICENSE</ulink></para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+    </itemizedlist>
+
+    <para>See the Enea NFV Access 2.2.1 Release Information for more
+    details.</para>
   </section>
 </chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-evalkit/doc/run_example_uc_auto_fm.xml b/doc/book-enea-nfv-access-evalkit/doc/run_example_uc_auto_fm.xml
index 725e4e0..d157c06 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/run_example_uc_auto_fm.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/run_example_uc_auto_fm.xml
@@ -2,6 +2,15 @@
 <chapter id="run_example_uc_auto_fm">
   <title>Running Example Use-cases from the Automation Framework</title>
 
+  <note>
+    <para>Before running the EvalKit setup the user must add the designated
+    devices (<literal>device1</literal> and <literal>device2</literal>) under
+    the <literal>lab_config</literal> folder and replace all occurrences of
+    <literal>fwa1021vc-1</literal> with <literal>device1</literal> and
+    <literal>intelc3850-1</literal> with <literal>device2</literal> under
+    <filename>automation_framework/unittestSuite/config/evalkit</filename>.</para>
+  </note>
+
   <para>In order to run example use-cases from the Automation Framework,
   offline configurations need to be added for both uCPE devices and for the
   VNFs to be onboarded.</para>
@@ -12,7 +21,8 @@
     Access System Test Specification manual for more details.</para>
   </note>
 
-  <programlisting>&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.109 \
+  <programlisting>&gt; cd automation_framework/unittestSuite/
+&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.109 \
 -o ucpem -s EvalKit_addOfflineConfig_and_onBoardVNFs.json -d \
 "Set - offline config for uCPE1 and uCPE2"
 
diff --git a/doc/book-enea-nfv-access-evalkit/doc/sdwan_arch.xml b/doc/book-enea-nfv-access-evalkit/doc/sdwan_arch.xml
index 4fcb6df..aeed4ed 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/sdwan_arch.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/sdwan_arch.xml
@@ -175,7 +175,7 @@
             </row>
 
             <row>
-              <entry>Interfaces to add:</entry>
+              <entry>Interfaces to add (click the " + " button):</entry>
 
               <entry>wan and lan</entry>
             </row>
@@ -261,7 +261,7 @@
             </row>
 
             <row>
-              <entry>Interfaces to add:</entry>
+              <entry>Interfaces to add (click the " + " button):</entry>
 
               <entry>wan, lan and mgmt.</entry>
             </row>
@@ -279,7 +279,7 @@
             </row>
 
             <row>
-              <entry>Properties to add:</entry>
+              <entry>Properties to add (click the " + " button):</entry>
 
               <entry>
                 <itemizedlist>
@@ -392,8 +392,9 @@
                     <literal>deviceId</literal>
                   </entry>
 
-                  <entry>The ID extracted from device1 after running
-                  <filename>list_deviceID.sh</filename>.</entry>
+                  <entry>The ID extracted from <literal>device1</literal>
+                  after running <filename>list_deviceID.sh</filename> on the
+                  NFV Access CLI. </entry>
                 </row>
               </tbody>
             </tgroup>
@@ -430,23 +431,16 @@
               <para><emphasis role="bold">Source</emphasis>:
               <literal>enp7s0f1</literal>. <note>
                   <para>This is just an example interface. The user must
-                  select the interface needed for use with the LAN
-                  connection.</para>
+                  select the interface needed for use with the LAN connection.
+                  To locate the name of the interface, run
+                  <command>ifconfig</command> on the NFV Access CLI.</para>
                 </note></para>
             </listitem>
 
             <listitem>
-              <para><emphasis role="bold">Type</emphasis>: N/A.</para>
-            </listitem>
-
-            <listitem>
               <para><emphasis role="bold">networking-type</emphasis>:
               standard.</para>
             </listitem>
-
-            <listitem>
-              <para><emphasis role="bold">dpdk-type</emphasis>: N/A.</para>
-            </listitem>
           </itemizedlist>
 
           <para>Click <literal>Create</literal>, and the
@@ -616,8 +610,9 @@
                     <literal>deviceId</literal>
                   </entry>
 
-                  <entry>The ID extracted from device2 after running
-                  <filename>list_deviceID.sh</filename>.</entry>
+                  <entry>The ID extracted from <literal>device2</literal>
+                  after running <filename>list_deviceID.sh</filename> on the
+                  NFV Access CLI. </entry>
                 </row>
               </tbody>
             </tgroup>
@@ -654,23 +649,16 @@
               <para><emphasis role="bold">Source</emphasis>:
               <literal>eno4</literal>. <note>
                   <para>This is just an example interface. The user must
-                  select the interface needed for use with the LAN
-                  connection.</para>
+                  select the interface needed for use with the LAN connection.
+                  To locate the name of the interface, run
+                  <command>ifconfig</command> on the NFV Access CLI.</para>
                 </note></para>
             </listitem>
 
             <listitem>
-              <para><emphasis role="bold">Type</emphasis>: standard.</para>
-            </listitem>
-
-            <listitem>
               <para><emphasis role="bold">networking-type</emphasis>:
               standard.</para>
             </listitem>
-
-            <listitem>
-              <para><emphasis role="bold">dpdk-type</emphasis>: N/A.</para>
-            </listitem>
           </itemizedlist>
 
           <para>Click <literal>Create</literal>, and the
@@ -778,7 +766,9 @@
 
                 <listitem>
                   <para><emphasis role="bold">Sub-type</emphasis>:
-                  communication. Name: <literal>eno4</literal></para>
+                  communication.</para>
+
+                  <para>Name: <literal>eno4</literal></para>
                 </listitem>
               </itemizedlist>
 
@@ -806,8 +796,8 @@
         </listitem>
 
         <listitem>
-          <para>Reset the ZTP: <literal>device</literal> -&gt; Configure -&gt;
-          Host -&gt; initial-config-complete: false -&gt; Apply.</para>
+          <para>Reset the ZTP: <literal>device</literal> -&gt; Configuration
+          -&gt; Host -&gt; initial-config-complete: false -&gt; Apply.</para>
         </listitem>
 
         <listitem>
@@ -839,7 +829,7 @@
           <row>
             <entry>Release</entry>
 
-            <entry>1.0</entry>
+            <entry>2.2.1</entry>
           </row>
 
           <row>
@@ -897,7 +887,7 @@
                 </listitem>
 
                 <listitem><para>To add the device on the map: Right-Click on
-                the Map -&gt; Place Device -&gt; ucpe1</para>.</listitem>
+                the Map -&gt; Place Device -&gt; Ucpe1</para>.</listitem>
               </itemizedlist>
             </entry>
           </row>
@@ -928,7 +918,7 @@
           <row>
             <entry>Release</entry>
 
-            <entry>1.0</entry>
+            <entry>2.2.1</entry>
           </row>
 
           <row>
@@ -986,7 +976,7 @@
                 </listitem>
 
                 <listitem><para>To add the device on the map: Right-Click on
-                the Map -&gt; Place Device -&gt; ucpe2</para>.</listitem>
+                the Map -&gt; Place Device -&gt; Ucpe2</para>.</listitem>
               </itemizedlist>
             </entry>
           </row>
@@ -997,14 +987,14 @@
     <para>After the two devices are added into the uCPE Manager all offline
     configuration data prepared for them is pushed automatically onto the
     devices. To check if a device is configured, add the device onto the map
-    and select &lt;ucpe1&gt; -&gt; <literal>Configuration</literal> -&gt;
+    and select &lt;Ucpe1&gt; -&gt; <literal>Configuration</literal> -&gt;
     <literal>OpenVSwitch</literal> -&gt; <literal>Bridges</literal>.</para>
   </section>
 
   <section id="flexiwan_inst_device1">
     <title>FlexiWAN VNF Instantiation on device1</title>
 
-    <para>Instantiate the FlexiWAN VNF by selecting the ucpe1 device, then the
+    <para>Instantiate the FlexiWAN VNF by selecting the Ucpe1 device, then the
     VNF menu -&gt; <literal>Instances</literal> -&gt;
     <literal>Add</literal>.</para>
 
@@ -1057,7 +1047,8 @@
         <para><emphasis role="bold">IF Name:</emphasis> Bridge:
         <literal>ibm_br</literal>.</para>
 
-        <para>Click <literal>Create</literal>.</para>
+        <para><emphasis role="bold">NIC Model</emphasis>:
+        <literal>virtio</literal>.</para>
       </listitem>
 
       <listitem>
@@ -1126,7 +1117,8 @@
         <para><emphasis role="bold">IF Name:</emphasis> Bridge:
         <literal>sfc_br</literal>.</para>
 
-        <para>Click <literal>Create</literal>.</para>
+        <para><emphasis role="bold">NIC Model</emphasis>:
+        <literal>virtio</literal>.</para>
       </listitem>
 
       <listitem>
@@ -1141,7 +1133,8 @@
         <para><emphasis role="bold">IF Name:</emphasis> Bridge:
         <literal>lan_br</literal>.</para>
 
-        <para>Click <literal>Create</literal>.</para>
+        <para><emphasis role="bold">NIC Model</emphasis>:
+        <literal>virtio</literal>.</para>
       </listitem>
 
       <listitem>
@@ -1217,7 +1210,8 @@
         <para><emphasis role="bold">IF Name:</emphasis> Bridge:
         <literal>ibm_br</literal>.</para>
 
-        <para>Click <literal>Create</literal>.</para>
+        <para><emphasis role="bold">NIC Model</emphasis>:
+        <literal>virtio</literal>.</para>
       </listitem>
 
       <listitem>
@@ -1232,6 +1226,9 @@
         <para><emphasis role="bold">IF Name:</emphasis> Bridge:
         <literal>sfc_br</literal>.</para>
 
+        <para><emphasis role="bold">NIC Model</emphasis>:
+        <literal>virtio</literal>.</para>
+
         <para>Click <literal>Create</literal>.</para>
       </listitem>
     </itemizedlist>
@@ -1286,7 +1283,8 @@
         <para><emphasis role="bold">IF Name:</emphasis> Bridge:
         <literal>sfc_br</literal>.</para>
 
-        <para>Click <literal>Create</literal>.</para>
+        <para><emphasis role="bold">NIC Model</emphasis>:
+        <literal>virtio</literal>.</para>
       </listitem>
 
       <listitem>
@@ -1301,7 +1299,8 @@
         <para><emphasis role="bold">IF Name:</emphasis> Bridge:
         <literal>lan_br</literal>.</para>
 
-        <para>Click <literal>Create</literal>.</para>
+        <para><emphasis role="bold">NIC Model</emphasis>:
+        <literal>virtio</literal>.</para>
       </listitem>
 
       <listitem>
@@ -1316,6 +1315,9 @@
         <para><emphasis role="bold">IF Name:</emphasis> Bridge:
         <literal>vnf_mgmt_br</literal>.</para>
 
+        <para><emphasis role="bold">NIC Model</emphasis>:
+        <literal>virtio</literal>.</para>
+
         <para>Click <literal>Create</literal>.</para>
       </listitem>
     </itemizedlist>
@@ -1373,11 +1375,11 @@
                 </row>
 
                 <row>
-                  <entry>Description: Set IPv4 for the second interface
-                  (ens3): 10.0.1.1/24.</entry>
+                  <entry>Description (set IPv4 for the second interface
+                  (ens3)): <literal>10.0.1.1/24</literal></entry>
 
-                  <entry>Description: Set IPv4 for the second interface
-                  (ens3): 10.0.2.1/24.</entry>
+                  <entry>Description (set IPv4 for the second interface
+                  (ens3)): <literal>10.0.2.1/24</literal></entry>
                 </row>
 
                 <row>
diff --git a/doc/book-enea-nfv-access-evalkit/doc/setup_cleanup.xml b/doc/book-enea-nfv-access-evalkit/doc/setup_cleanup.xml
index 6a129e8..3a7e72d 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/setup_cleanup.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/setup_cleanup.xml
@@ -3,47 +3,28 @@
   <title>Setup Clean-up</title>
 
   <para>In order to remove the setup all components need to be deleted in
-  reverse order:</para>
+  reverse order.</para>
 
-  <orderedlist spacing="compact">
-    <listitem>
-      <para>Select the ucpe1 device, access the <emphasis>VNF</emphasis> menu
-      then <literal>Instances FlexiWAN and pfSense</literal> and press
-      Delete.</para>
-    </listitem>
+  <para>Perform the following steps for both Ucpe1 and Ucpe2
+  respectively:</para>
 
+  <orderedlist>
     <listitem>
-      <para>Select the ucpe1 device, access the
-      <emphasis>Configuration</emphasis> menu, then
-      <literal>OpenVSwitch</literal> -&gt; <literal>Bridges</literal>. Select
-      all bridges and press Delete.</para>
-    </listitem>
-
-    <listitem>
-      <para>Select the ucpe1 device, access the
-      <emphasis>Configuration</emphasis> menu, then
-      <literal>OpenVSwitch</literal> -&gt; <literal>Host Interfaces</literal>.
-      Select all interfaces and press Delete.</para>
-    </listitem>
-
-    <listitem>
-      <para>Select the ucpe2 device, access the <emphasis>VNF</emphasis> menu
-      then <literal>Instances FlexiWAN and pfSense</literal> and press
+      <para>Select the device, access the <emphasis>VNF</emphasis> menu then
+      <literal>Instances FlexiWAN and pfSense</literal> and press
       Delete.</para>
     </listitem>
 
     <listitem>
-      <para>Select the ucpe2 device, access the
-      <emphasis>Configuration</emphasis> menu, then
-      <literal>OpenVSwitch</literal> -&gt; <literal>Bridges</literal>. Select
-      all bridges and press Delete.</para>
+      <para>Select the device, access the <emphasis>Configuration</emphasis>
+      menu, then <literal>OpenVSwitch</literal> -&gt;
+      <literal>Bridges</literal>. Select all bridges and press Delete.</para>
     </listitem>
 
     <listitem>
-      <para>Select the ucpe2 device, access the
-      <emphasis>Configuration</emphasis> menu, then
-      <literal>OpenVSwitch</literal> -&gt; <literal>Host Interfaces</literal>.
-      Select all interfaces and press Delete.</para>
+      <para>Select the device, access the <emphasis>Configuration</emphasis>
+      menu, then <literal>OpenVSwitch</literal> -&gt; <literal>Host
+      Interfaces</literal>. Select all interfaces and press Delete.</para>
     </listitem>
 
     <listitem>
@@ -57,5 +38,11 @@
       <literal>Offline Config</literal>. Select both device configurations and
       delete them.</para>
     </listitem>
+
+    <listitem>
+      <para>Access the <emphasis>Device</emphasis> menu, select
+      <emphasis>Manager</emphasis>. Select both uCPE devices and remove
+      them.</para>
+    </listitem>
   </orderedlist>
 </chapter>
\ No newline at end of file