5 files changed, 112 insertions, 135 deletions

diff --git a/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml b/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml
index 1da91fe..57c79b5 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml
@@ -367,8 +367,8 @@ root@qemux86-64:~# iperf3 -c 192.168.10.10</programlisting>
         <listitem>
           <para>Select uCPE device 1, access <literal>Configuration</literal>,
           add the network interface that will be used and configure it for
-          SR-IOV. For <literal>sriov-mode</literal> select "adapter-pool" and
-          "sriov-num-vfs:2".</para>
+          SR-IOV. For <literal>sriov-mode</literal> select <literal>adapter-pool</literal> and for 
+            <literal>sriov-num-vfs</literal> select "2".</para>
         </listitem>
 
         <listitem>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml b/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml
index 547cda4..a56fc0a 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml
@@ -41,7 +41,7 @@
         </listitem>
       </itemizedlist>
 
-      <para>The following files are needed for this example use-case:</para>
+      <para>The following file(s) are needed for this example use-case:</para>
 
       <itemizedlist>
         <listitem>
@@ -49,12 +49,8 @@
           its license file.</para>
         </listitem>
 
-        <listitem><para>VNF Configuration files, provided with your Enea NFV Access
-        release:</para>
-          <itemizedlist spacing="compact">
-            <listitem><para><filename>fortigate-basic-fw.conf</filename>.</para></listitem>
-            <listitem><para><filename>fortigate-sdwan&lt;x&gt;.conf</filename>.</para></listitem>
-          </itemizedlist>
+        <listitem><para>VNF Configuration file(s), provided with your Enea NFV Access
+        release: <filename>fortigate-basic-fw.conf</filename>.</para>
         </listitem>
         </itemizedlist>
     </section>
@@ -76,12 +72,28 @@
       <para><emphasis role="bold">Network Configuration</emphasis>:</para>
 
       <para>Since the firewall uses three External Network Interfaces, three
-      bridges need to be configured. Each bridge provides the ability to
-      connect a physical network interface to the virtual machines' virtual
-      network interface.</para>
+      bridges need to be configured. Each bridge provides the ability to connect a physical network interface to the virtual network interface of a VM.</para>
+
+        <para><emphasis role="bold">Setup of the uCPE device:</emphasis></para>
 
       <orderedlist>
         <listitem>
+          <para>Connect WAN to the Lab Network.</para>
+        </listitem>
+
+        <listitem>
+          <para>Connect LAN1 to the Test Machine.</para>
+        </listitem>
+
+        <listitem>
+          <para>Leave LAN2 unconnected.</para>
+        </listitem>
+
+        <listitem>
+          <para>Connect ETH0 to the Lab Network (for Enea uCPE Manager communications).</para>
+        </listitem>
+
+        <listitem>
           <para>Select the uCPE device, access
           <literal>Configuration</literal> and bind the three physical network
           interfaces to DPDK.</para>
@@ -90,8 +102,6 @@
         <listitem>
           <para>Create three OVS bridges, one for each DPDK network interface
           (WAN, LAN1 and LAN2).</para>
-        </listitem>
-      </orderedlist>
 
       <para>Alternatively, the firewall can be setup to use bridges as
       connection points for the FortiGate VNF, by replacing the OVS-DPDK
@@ -110,27 +120,8 @@
         each LAN interface, only one will be used for both LAN1 and LAN2, with
         no changes in WAN interface configuration.</para>
       </note>
-
-      <para><emphasis role="bold">Setup of the uCPE device:</emphasis></para>
-
-      <itemizedlist>
-        <listitem>
-          <para>WAN connected to the Lab Network.</para>
-        </listitem>
-
-        <listitem>
-          <para>LAN1 connected to the Test Machine.</para>
-        </listitem>
-
-        <listitem>
-          <para>LAN2 unconnected.</para>
         </listitem>
-
-        <listitem>
-          <para>ETH0 connected to the Lab Network (for Enea uCPE Manager
-          communications).</para>
-        </listitem>
-      </itemizedlist>
+      </orderedlist>
 
       <para><emphasis role="bold">Onboarding the VNF:</emphasis></para>
 
@@ -157,7 +148,7 @@
 
         <listitem>
           <para><emphasis role="bold">Interfaces</emphasis>: Add 3
-          interfaces.</para>
+          interfaces (wan, lan1 and lan2).</para>
         </listitem>
 
         <listitem>
@@ -212,21 +203,21 @@
           <para><emphasis role="bold">Port1 - WAN</emphasis>: Set the
           <literal>External Interface</literal> type to
           <literal>DPDK</literal> and connect it to the
-          <literal>wanmgrbr</literal> ovs bridge.</para>
+          <literal>wan_br</literal> ovs bridge.</para>
         </listitem>
 
         <listitem>
           <para><emphasis role="bold">Port2 - LAN1</emphasis>: Set the
           <literal>Incoming Interface</literal> type to
           <literal>DPDK</literal> and connect it to the
-          <literal>lan1</literal> ovs bridge.</para>
+          <literal>lan1_br</literal> ovs bridge.</para>
         </listitem>
 
         <listitem>
           <para><emphasis role="bold">Port3 - LAN2</emphasis>: Set the
           <literal>Outgoing Interface</literal> type to
           <literal>DPDK</literal> and connect it to the
-          <literal>lan2</literal> ovs bridge.</para>
+          <literal>lan2_br</literal> ovs bridge.</para>
 
           <note>
             <para>The names of the ports used during instantiation need to be
@@ -307,13 +298,8 @@
           its license file.</para>
         </listitem>
 
-        <listitem><para>VNF Configuration files, provided with your Enea NFV Access
-        release:</para>
-          <itemizedlist spacing="compact">
-            <listitem><para><filename>fortigate-basic-fw.conf</filename>.</para></listitem>
-            <listitem><para><filename>fortigate-sdwan&lt;x&gt;.conf</filename>.</para></listitem>
-          </itemizedlist>
-        </listitem>
+        <listitem><para>VNF Configuration file(s), provided with your Enea NFV Access
+        release: <filename>fortigate-sdwan&lt;x&gt;.conf</filename>.</para></listitem>
         </itemizedlist>
     </section>
 
@@ -347,45 +333,39 @@
       <para>Each VNF instance will have a virtual interface for VNF
       management, for the WAN network and for LAN communication.</para>
 
+      <para><emphasis role="bold">Setup of an Intel Whitebox uCPE device</emphasis>:</para>
+
       <orderedlist>
-        <listitem>
-          <para>Select uCPE Device 1, access <literal>Configuration</literal>
-          and bind the three physical network interfaces to the DPDK.</para>
+           <listitem>
+          <para>Connect the <literal>VNFMgr</literal> interfaces to the Lab Network for VNF management access.</para>
         </listitem>
 
         <listitem>
-          <para>Create three OVS bridges, one for each DPDK network interface
-          (VNF management, WAN and LAN).</para>
+          <para>Directly connect the <literal>WAN</literal> interfaces back to back (using a cable) or connected via VPN.</para>
         </listitem>
 
         <listitem>
-          <para>Repeat the steps above for uCPE device 2.</para>
+          <para>Connect the <literal>LAN</literal> interfaces to the Test Machine.</para>
         </listitem>
-      </orderedlist>
-
-      <para><emphasis role="bold">Setup of an Intel Whitebox uCPE
-      device</emphasis>:</para>
 
-      <itemizedlist>
         <listitem>
-          <para><literal>VNFMgr</literal>. Connected to the Lab Network for
-          VNF management access.</para>
+          <para>Connect the <literal>ETH0</literal> interfaces to the Lab Network (for Enea uCPE Manager communications).</para>
         </listitem>
 
         <listitem>
-          <para><literal>WAN interfaces</literal>. Directly connected through
-          the Ethernet cable.</para>
+          <para>Select uCPE Device 1, access <literal>Configuration</literal>
+          and bind the three physical network interfaces to the DPDK.</para>
         </listitem>
 
         <listitem>
-          <para><literal>LAN</literal>. Connected to the Test Machine.</para>
+          <para>Create three OVS bridges, one for each DPDK network interface
+          (VNF management, WAN and LAN).</para>
         </listitem>
 
         <listitem>
-          <para><literal>ETH0</literal>. Connected to the Lab Network (for
-          Enea uCPE Manager communications).</para>
+          <para>Repeat the steps above for uCPE device 2.</para>
         </listitem>
-      </itemizedlist>
+      </orderedlist>
 
       <para><emphasis role="bold">Onboarding the VNF</emphasis>:</para>
 
@@ -417,17 +397,17 @@
           <itemizedlist spacing="compact">
             <listitem>
               <para><emphasis role="bold">vnfmgr</emphasis>: to connect it to
-              the <literal>vnfmgrbr</literal> bridge.</para>
+              the <literal>vnfmgmt_br</literal> bridge.</para>
             </listitem>
 
             <listitem>
               <para><emphasis role="bold">wan:</emphasis> to connect it to the
-              <literal>wanbr</literal> bridge.</para>
+              <literal>wan_br</literal> bridge.</para>
             </listitem>
 
             <listitem>
               <para><emphasis role="bold">lan:</emphasis> to connect it to the
-              <literal>lanbr</literal> bridge.</para>
+              <literal>lan_br</literal> bridge.</para>
             </listitem>
           </itemizedlist>
         </listitem>
@@ -454,11 +434,9 @@
         will fail.</para>
       </note>
 
-      <para><emphasis role="bold">Instantiating the FortiGate
-      VNF</emphasis>:</para>
+      <para><emphasis role="bold">Instantiating the FortiGate VNF</emphasis>:</para>
 
-      <para>Instantiate the FortiGate VNF by filling the required fields with
-      the following values:</para>
+      <para>Instantiate the FortiGate VNF by filling the required fields with the following values:</para>
 
       <itemizedlist spacing="compact">
         <listitem>
@@ -484,42 +462,42 @@
         <listitem>
           <para><emphasis role="bold">Configuration file</emphasis>: The
           SD-WAN example configuration files provided by Enea:
-          <literal>fortigate-sdwan1.conf</literal> and
-          <literal>fortigate-sdwan2.conf</literal>.</para>
+          <literal>fortigate-sdwan1.conf</literal> for the FortiGate VNF on uCPE device 1 and
+          <literal>fortigate-sdwan2.conf</literal> for the FortiGate VNF on uCPE device 2.</para>
         </listitem>
 
         <listitem>
           <para><emphasis role="bold">Port1 - VNF Mgr</emphasis>: Set the type
           to <literal>DPDK</literal> and connect it to the
-          <literal>vnfmgrbr</literal> bridge.</para>
+          <literal>vnfmgmt_br</literal> bridge.</para>
         </listitem>
 
         <listitem>
           <para><emphasis role="bold">Port2 - WAN</emphasis>: Set the type to
           <literal>DPDK</literal> and connect it to the
-          <literal>wanbr</literal> bridge.</para>
+          <literal>wan_br</literal> bridge.</para>
         </listitem>
 
         <listitem>
           <para><emphasis role="bold">Port3 - LAN</emphasis>: Set the type to
           <literal>DPDK</literal> and connect it to the
-          <literal>lanbr</literal> bridge.</para>
+          <literal>lan_br</literal> bridge.</para>
         </listitem>
       </itemizedlist>
 
       <para>Instantiate the FortiGate VNF on uCPE device 1 using the
       <literal>sdwan1</literal> example configuration file.</para>
 
+      <para>To complete the branch-to-branch setup, configure <literal>uCPE
+      device 2</literal> in the same way as <literal>uCPE device 1</literal>.
+      Make sure to use the <literal>sdwan2</literal> configuration file for
+      the second VNF instantiation.</para>
+
       <note>
         <para>The names of the ports used during instantiation need to be the 
           same as the ones described above, as the same names will be used in 
           the configuration files provided for this example use-case.</para>
           </note>
-
-      <para>To complete the branch-to-branch setup, configure <literal>uCPE
-      device 2</literal> in the same way as <literal>uCPE device 1</literal>.
-      Make sure to use the <literal>sdwan2</literal> configuration file for
-      the second VNF instantiation.</para>
     </section>
 
     <section id="forti_test_uc2">
@@ -540,9 +518,7 @@
         Machine-2.</para>
       </note>
 
-      <para><literal>uCPE device 1</literal> should be able to ping Test
-      <literal>uCPE device 2</literal> in this setup over the WAN connection.
-      The FortiGate VNF management interface can be accessed from a web
+      <para>The Test Machine connected to <literal>uCPE device 1</literal> should be able to ping the Test Machine connected to <literal>uCPE device 2</literal> in this setup, over the WAN connection.  The FortiGate VNF management interface can be accessed from a web
       browser on the Lab Machine. For more details please see <olink
       targetdoc="book_enea_nfv_access_example_usecases"
       targetptr="fortigate_webmg">FortiGate VNF Web Management, <xi:include
@@ -611,7 +587,7 @@ virsh console &lt;id of FortiGate VNF&gt;</programlisting>
         <orderedlist>
           <listitem>
             <para>Deploy the FortiGate Firewall in its default
-            settings.</para>
+            settings.</para><remark>Maybe more info about how to do it should be added here.</remark>
           </listitem>
 
           <listitem>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png
index acc3e53..cd82461 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.svg
index ff65f57..4255bf6 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.svg
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.svg
@@ -15,9 +15,9 @@
    width="830.0929"
    height="482.41965"
    viewBox="0 0 830.09292 482.41966"
-   sodipodi:docname="uc_fortigate_sdwan_new.svg"
+   sodipodi:docname="uc_fortigate_sdwan.svg"
    inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   inkscape:export-filename="E:\Documents\ENEA Work files\ENFV work\ENA 2.2.2\Example Usecase pics\uc_fortigate_sdwan_new.png"
+   inkscape:export-filename="L:\docu_work\el_releases-nfv-access\doc\book-enea-nfv-access-example-usecases\doc\images\uc_fortigate_sdwan.png"
    inkscape:export-xdpi="65.519997"
    inkscape:export-ydpi="65.519997">
   <metadata
@@ -430,17 +430,17 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1618"
-     inkscape:window-height="1027"
+     inkscape:window-width="1366"
+     inkscape:window-height="713"
      id="namedview4"
      showgrid="false"
      inkscape:zoom="1.0074671"
-     inkscape:cx="428.14055"
-     inkscape:cy="175.87748"
-     inkscape:window-x="1358"
+     inkscape:cx="429.30796"
+     inkscape:cy="215.58101"
+     inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layer5"
+     inkscape:current-layer="layer3"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
@@ -979,41 +979,37 @@
        id="path8471-3-2-5-5-2-3-0"
        inkscape:connector-curvature="0" />
     <g
-       id="g1493"
-       transform="translate(3.8164101,8.5139425)">
-      <g
-         id="g1485">
-        <rect
-           ry="9.5899591"
-           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.44231871;stroke-opacity:1"
-           id="rect6098-9-0-8-7"
-           width="69.460823"
-           height="40.235157"
-           x="-856.21503"
-           y="-3.7047772"
-           rx="9.5899591"
-           transform="scale(-1,1)" />
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
-           x="820.87134"
-           y="20.54952"
-           id="text892-7-06-6"><tspan
-             sodipodi:role="line"
-             id="tspan890-2-0-48"
-             x="820.87134"
-             y="20.54952"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">lan_br</tspan></text>
-      </g>
+       id="g1360">
+      <rect
+         transform="scale(-1,1)"
+         rx="9.5899591"
+         y="4.8091655"
+         x="-860.03143"
+         height="40.235157"
+         width="69.460823"
+         id="rect6098-9-0-8-7"
+         style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.44231871;stroke-opacity:1"
+         ry="9.5899591" />
+      <text
+         id="text892-7-06-6"
+         y="29.063463"
+         x="824.68774"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994"
+           y="29.063463"
+           x="824.68774"
+           id="tspan890-2-0-48"
+           sodipodi:role="line">wan_br</tspan></text>
       <text
          id="text265-1"
-         y="47.526051"
-         x="807.96118"
+         y="56.039993"
+         x="811.77759"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
-           y="47.526051"
-           x="807.96118"
+           y="56.039993"
+           x="811.77759"
            id="tspan263-0"
            sodipodi:role="line">dpdk</tspan></text>
     </g>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/vnf_chaining.xml b/doc/book-enea-nfv-access-example-usecases/doc/vnf_chaining.xml
index 83dd51e..b003629 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/vnf_chaining.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/vnf_chaining.xml
@@ -52,11 +52,10 @@
           <para>Juniper vSRX VNF image file.</para>
         </listitem>
         
-        <listitem><para>VNF Configuration files, provided with your Enea NFV Access
-          Release:</para>
+        <listitem><para>VNF Configuration files, provided with your Enea NFV Access Release:</para>
           <itemizedlist spacing="compact">
             <listitem><para><filename>vSRX-domain-update-script</filename>.</para></listitem>
-            <listitem><para><filename>vSRX-Site&lt;x&gt;.conf</filename>.</para></listitem>
+            <listitem><para><filename>vSRX-Site&lt;x&gt;.iso</filename>.</para></listitem>
             <listitem><para><filename>FortiFW-Site&lt;x&gt;.conf</filename>.</para></listitem>
           </itemizedlist>      
         </listitem>
@@ -75,7 +74,7 @@
                        fileref="images/uc_vnf_chaining.png" />
           </imageobject>
         </mediaobject>
-      </figure>
+      </figure><remark>No info about vnf_mgmt_br?</remark>
 
       <para><emphasis role="bold">Network Configuration</emphasis>:</para>
 
@@ -143,10 +142,10 @@
 
           <itemizedlist spacing="compact">
             <listitem>
-              <para>The Flavor selected must have at least 2 CPUs and 3 GB RAM
-              since vSRX is quite resource consuming.</para>
+              <para>The Flavor selected must have at least 2 vCPUs and 4 GB RAM since vSRX is 
+                quite resource consuming.</para>
 
-              <para>Tested in-house with 4 vCPUs/ 3 GB RAM.</para>
+              <para>Tested in-house with 4 vCPUs/ 6 GB RAM.</para>
             </listitem>
 
             <listitem>
@@ -155,9 +154,12 @@
             </listitem>
 
             <listitem>
-              <para>Select <literal>ISO</literal> on the Cloud-Init
-              tab.</para>
+              <para>Select <literal>ISO</literal> as the Cloud-Init Datasource in the Cloud-Init 
+                tab.</para>
             </listitem>
+            <listitem>
+            <para>Select <literal>cdrom</literal> as the Cloud-Init Disk Type in the Cloud-Init 
+              tab.</para></listitem>
           </itemizedlist>
         </listitem>
 
@@ -176,10 +178,13 @@
             </listitem>
 
             <listitem>
-              <para>Select <literal>ConfigDrive</literal> on the Cloud-Init
-              tab.</para>
+              <para>Select <literal>ConfigDrive</literal> as the Cloud-Init Datasource in the 
+                Cloud-Init tab.</para>
             </listitem>
 
+                        <listitem><para>Select <literal>cdrom</literal> as the Cloud-Init Disk 
+                          Type in the Cloud-Init tab.</para></listitem>
+
             <listitem>
               <para>Add <literal>license</literal> as the Cloud-Init content
               in the Cloud-Init tab files.</para>
@@ -285,7 +290,7 @@
       </orderedlist>
 
       <para>At this point the service will be up and running on Site1. Repeat
-      the necessary steps for Site2, by changing the configuration files
+      the steps to instantiate a VNF for Site2, by changing the configuration files
       accordingly.</para>
 
       <para>After the service is deployed on both branches, the VPN tunnel is