5 files changed, 107 insertions, 40 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 eca3c99..ac27ba8 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
@@ -24,8 +24,8 @@
     VNF and an Open vSwitch Bridge</emphasis></para>
 
     <orderedlist>
-      <para><emphasis role="bold">Network Configuration for target_1 and
-      target_2</emphasis></para>
+      <para><emphasis role="bold">Configure the Network on target_1 and
+    target_2:</emphasis></para>
 
       <listitem>
         <para>From the uCPE Manager select the target_1:
@@ -264,4 +264,4 @@ root@qemux86-64:~# iperf3 -c 192.168.10.10</programlisting></para>
       </listitem>
     </orderedlist>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/enea_vnf_examples.xml b/doc/book-enea-nfv-access-example-usecases/doc/enea_vnf_examples.xml
index 9ec4861..cfb9b72 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/enea_vnf_examples.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/enea_vnf_examples.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="enea_vnf_examples">
   <title>Enea VNF Example Use-cases</title>
 
@@ -23,12 +23,15 @@
     <para><emphasis role="bold">How to setup the Enea VNF
     Example</emphasis></para>
 
+    <para><emphasis role="bold">Configure the Network on target_1 and
+    target_2:</emphasis></para>
+
     <orderedlist>
       <listitem>
-        <para>Bind the host interfaces to the DPDK by selecting the target_1:
-        <literal>Configuration</literal> -&gt; <literal>OpenVSwitch</literal>
-        -&gt; <literal>Host Interfaces</literal> -&gt;
-        <literal>Add</literal>:</para>
+        <para>Bind the host interfaces to the DPDK by selecting the target
+        first, then accessing <literal>Configuration</literal> -&gt;
+        <literal>OpenVSwitch</literal> -&gt; <literal>Host
+        Interfaces</literal> -&gt; <literal>Add</literal>:</para>
 
         <figure>
           <title>Adding OVS Host Interfaces</title>
@@ -61,16 +64,25 @@
 
       <listitem>
         <para>Select the <literal>Create</literal> button to send the
-        configuration to the target. The same steps must also be performed on
-        the target_2.</para>
+        configuration to the target.</para>
       </listitem>
 
       <listitem>
+        <para>Repeat the same steps on the target_2.</para>
+      </listitem>
+    </orderedlist>
+
+    <para><emphasis role="bold">Create an OpenVSwitch bridge on
+    target_1:</emphasis></para>
+
+    <orderedlist>
+      <listitem>
         <para>Create an OpenVSwitch bridge (<literal>ovsbr0</literal>) on
         target_1 that uses one DPDK interface, by selecting the
-        <literal>Add</literal> button from the Bridges tab and then selcting:
-        <literal>Configuration</literal> -&gt;
-        <literal>OpenVSwitch</literal>-&gt; <literal>Bridges</literal>:</para>
+        <literal>Add</literal> button from the Bridges tab and then selecting
+        the target first, then accessing <literal>Configuration</literal>
+        -&gt; <literal>OpenVSwitch</literal>-&gt;
+        <literal>Bridges</literal>:</para>
 
         <figure>
           <title>OVS Bridge Table</title>
@@ -94,18 +106,35 @@
           </mediaobject>
         </figure>
       </listitem>
+    </orderedlist>
+
+    <para><emphasis role="bold">Onboard the TestPMD VNF on
+    target_2:</emphasis></para>
+
+    <para>Onboard the TestPMD VNF on target_2 by selecting the target, then accessing
+    <literal>VNF</literal> -&gt; <literal>Descriptor</literal> -&gt; <literal>Add</literal>.</para>
+
+    <para><emphasis role="bold">Instantiate the TestPMD VNF on
+    target_2:</emphasis></para>
+
+    <orderedlist>
+      <listitem>
+        <para>Instantiate TestPMD VNF (testpmd_fwd) on target_2 by selecting
+        the target first, then accessing <literal>VNF</literal> -&gt;
+        <literal>Instances</literal> -&gt; <literal>Add</literal>.</para>
+      </listitem>
 
       <listitem>
-        <para>Instantiate the TestPMD VNFs on target_1 by selecting:
-        <literal>VNF</literal> -&gt; <literal>Instances</literal> -&gt;
-        <literal>Add</literal>.</para>
+        <para>Instantiate TestPMD VNF (testpmd_term) on target_2 by selecting
+        the target first, then accessing <literal>VNF</literal> -&gt;
+        <literal>Instances</literal> -&gt; <literal>Add</literal>.</para>
       </listitem>
 
       <listitem>
-        <para>Configure the VNF that forwards traffic:</para>
+        <para>Configure the VNF (testpmd_fwd) to forward trafic:</para>
 
         <figure>
-          <title>Configuring the fwdVNF</title>
+          <title>Configuring the VNF (testpmd_fwd)</title>
 
           <mediaobject>
             <imageobject>
@@ -117,7 +146,7 @@
       </listitem>
 
       <listitem>
-        <para>Configure the VNF that terminates traffic:</para>
+        <para>Configure the VNF (testpmd_term) to terminate traffic:</para>
 
         <figure>
           <title>Configuring the termVNF</title>
@@ -158,30 +187,31 @@
       </listitem>
 
       <listitem>
-        <para>Start pktgen on target_2. Connect to the target by using:
-        <literal>SSH</literal> -&gt; <literal>user</literal> (root) and
-        perform the following:</para>
-
-        <programlisting>killall ovsdb-server ovs-vswitchd
-rm -rf /etc/openvswitch/*
-mkdir -p /var/run/openvswitch
-modprobe igb_uio
-dpdk-devbind --bind=igb_uio 0000:05:00.3
-cd /usr/share/apps/pktgen/
+        <para>Start pktgen on target_1. Connect to the target by selecting the
+        target first, then accessing <literal>SSH</literal> -&gt;
+        <literal>user</literal> (root) and perform the following:</para>
+
+        <programlisting>cd /usr/share/apps/pktgen/
 ./pktgen -c 0x7 -n 4 --proc-type auto --socket-mem 256 -w 0000:05:00.3 -- \
    -P -m "[1:2].0"
 Pktgen:/&gt; start 0</programlisting>
+
+        <note>
+          <para>The PCI address &lt;0000:05:00.3&gt; used in this example
+          varies depending on the target. To determine the exact PCI address
+          used, look in the target specific Network configuration.</para>
+        </note>
       </listitem>
 
       <listitem>
         <para>Connect to the forwarder VNF in order to check the traffic
-        statistics by selecting target_1: <literal>SSH</literal> -&gt;
-        <literal>user</literal> (root):</para>
+        statistics by selecting the target first, then accessing
+        <literal>SSH</literal> -&gt; <literal>user</literal> (root):</para>
 
         <programlisting>Virsh list
 Virsh console 1
 # Qemux86-64 login: root
-tail -f /opt/testpmd-out</programlisting>
+tail -f /var/log/testpmd-out</programlisting>
 
         <figure>
           <title>Traffic Statistics</title>
@@ -198,7 +228,7 @@ tail -f /opt/testpmd-out</programlisting>
     </orderedlist>
   </section>
 
-  <section id="vnf_pci">
+  <section condition="hidden" id="vnf_pci">
     <title>TestPMD VNF using PCI passthrough</title>
 
     <para>In this use case, target 1 will run the Pktgen and target 2 will run
@@ -271,4 +301,4 @@ Run: tail -f /opt/testpmd-out</programlisting>
       </listitem>
     </orderedlist>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/traffic_forward.png b/doc/book-enea-nfv-access-example-usecases/doc/images/traffic_forward.png
index b9206ca..9c2ca82 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/traffic_forward.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/traffic_forward.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/traffic_terminate.png b/doc/book-enea-nfv-access-example-usecases/doc/images/traffic_terminate.png
index 545827f..9decd36 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/traffic_terminate.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/traffic_terminate.png
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 70d7add..3de347d 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
@@ -39,6 +39,42 @@
     </note>
   </section>
 
+  <section id="prere">
+    <title>Prerequisites</title>
+
+    <para>The following files are needed for this example use case:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Juniper vSRX VNF image, vSRX-Site&lt;x&gt;.iso as the Cloud-Init
+        files. This VNF/image is not provided by Enea. Please contact Juniper
+        to get this image.</para>
+      </listitem>
+
+      <listitem>
+        <para>Fortigate VNF image. This VNF can be downloaded from <ulink
+        url="https://portal.enea.com/">Enea portal</ulink>.</para>
+      </listitem>
+
+      <listitem>
+        <para>vSRX-domain-update-script. This file can be downloaded from
+        <ulink url="https://portal.enea.com/">Enea portal</ulink>.</para>
+      </listitem>
+
+      <listitem>
+        <para>FortiFW-Site&lt;x&gt;.conf as Cloud-Init files. This file can be
+        downloaded from <ulink url="https://portal.enea.com/">Enea
+        portal</ulink>.</para>
+      </listitem>
+
+      <listitem>
+        <para>license as the Cloud-Init content in the Cloud-Init tab files.
+        For license files for the VNFs, please contact the VNF
+        provider.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
   <section id="crateing_setup">
     <title>Creating the setup</title>
 
@@ -65,9 +101,9 @@
           </listitem>
 
           <listitem>
-            <para><literal>wan_br</literal>. Used by the service uplink connection. In our case,
-            Juniper vSRX will have its WAN virtual interface in this
-            bridge.</para>
+            <para><literal>wan_br</literal>. Used by the service uplink
+            connection. In our case, Juniper vSRX will have its WAN virtual
+            interface in this bridge.</para>
           </listitem>
 
           <listitem>
@@ -102,7 +138,7 @@
         <itemizedlist>
           <listitem>
             <para>The Flavor selected must have at least 2 vCPUs and 4 GB RAM
-            since vSRX is quite resource consuming. </para>
+            since vSRX is quite resource consuming.</para>
 
             <para>Tested-inhouse with 4 vCPUs/ 6 GB RAM.</para>
           </listitem>
@@ -246,7 +282,8 @@
     accordingly. After the service is deployed on both branches, the VPN
     tunnel is established and LAN to LAN visibility can be verified by
     connecting one device on each uCPE LAN port. See <link
-    linkend="test_setup">Testing the setup</link> for details on how to proceed.</para>
+    linkend="test_setup">Testing the setup</link> for details on how to
+    proceed.</para>
   </section>
 
   <section id="test_setup">
@@ -358,4 +395,4 @@ PING 172.10.10.1 (172.10.10.2): 56 data bytes
       </listitem>
     </itemizedlist>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>