1 files changed, 129 insertions, 142 deletions

diff --git a/doc/book-enea-nfv-access-example-usecases/doc/inband_management.xml b/doc/book-enea-nfv-access-example-usecases/doc/inband_management.xml
index f557cbc..4a5cd06 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/inband_management.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/inband_management.xml
@@ -5,13 +5,13 @@
   <para>In the case of an NFV Access device installed on a network with
   limited access, In-band management can be a solution to manage the device
   and to pass data traffic (through only one physical interface). This example
-  use-case will show how to enable the In-band management on the NFV Access
+  use-case will show how to enable In-band management on the NFV Access
   device and to access a VNF on the same physical interface.</para>
 
   <section id="inband_mg_uc_preq">
     <title>Prerequisites</title>
 
-    <para>This use-case requires the following network configuration:</para>
+    <para>System requirements for the uCPE device:</para>
 
     <itemizedlist>
       <listitem>
@@ -23,6 +23,39 @@
       </listitem>
     </itemizedlist>
 
+    <note>
+      <para>No other physical port for In-band management can be used.
+      <remark>FIXME: What does this mean?</remark></para>
+    </note>
+
+    <para>The following files are needed for this example use case:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>FortiGate VNF image. This file is provided by the local Fortinet
+        sales representatives in your region.</para>
+      </listitem>
+
+      <listitem>
+        <para>FortiGate VNF license file. This file is provided by the local
+        Fortinet sales representatives in your region.</para>
+      </listitem>
+
+      <listitem>
+        <para>FortiGate specific documentation. This is provided by the local
+        Fortinet sales representatives in your region.</para>
+      </listitem>
+
+      <listitem>
+        <para>FortiGate configuration example files. These files are provided
+        with your Enea NFV Access release.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section id="inband_mg_fortivnf_uc">
+    <title>In-band Management Activation</title>
+
     <para>In-band management activation is done by creating a special bridge
     which manages all traffic from the WAN interface. The active physical port
     of the device (used by the device manager to communicate with the uCPE
@@ -31,18 +64,11 @@
     <para>Once the In-band management bridge is activated, communication to
     the uCPE Manager will be reactivated, passing through the bridge.</para>
 
-    <note>
-      <para>No other physical port for In-band management can be used.</para>
-    </note>
-
-    <para>For further details, please see <xref
-    linkend="vnf_fortigate" /><remark>Are these references still
-    valid?</remark>.</para>
-  </section>
-
-  <section id="inband_mg_fortivnf_uc">
-    <title>In-band management activation for FortiGate VNF
-    Instantiation</title>
+    <para>For further details, please see <olink targetdoc="book_enea_nfv_access_getting_started"
+  targetptr="in_band_managemen">in_band_managemen in <xi:include
+  href="../../s_docbuild/olinkdb/pardoc-names.xml"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>.</para>
 
     <figure>
       <title>NFV Access In-band management solution setup</title>
@@ -50,7 +76,7 @@
       <mediaobject>
         <imageobject>
           <imagedata align="center" fileref="images/uc_ibm_solution_test.png"
-                     scale="55" />
+                     contentwidth="600" />
         </imageobject>
       </mediaobject>
     </figure>
@@ -58,156 +84,117 @@
     <section id="inband_examuc_setup">
       <title>Use-case Setup</title>
 
-      <para><emphasis role="bold">Configuring Network Interfaces on uCPE
-      devices:</emphasis></para>
+      <para><emphasis role="bold">Network Configuration:</emphasis></para>
 
       <orderedlist>
         <listitem>
-          <para>Create an In-band management WAN Bridge:</para>
-
-          <itemizedlist spacing="compact">
-            <listitem>
-              <para>Select the <literal>Device</literal> menu.</para>
-            </listitem>
-
-            <listitem>
-              <para>In the Configuration tab select
-              <literal>OpenVSwitch.</literal></para>
-            </listitem>
-
-            <listitem>
-              <para>Select <literal>Bridges</literal> and click
-              <literal>Add</literal>.</para>
-            </listitem>
-
-            <listitem>
-              <para>Use <literal>dpdkWAN</literal> as the
-              <literal>ovs-bridge-type</literal>.</para>
-            </listitem>
-          </itemizedlist>
+          <para>Create an In-band management WAN Bridge (set
+          <literal>dpdkWan</literal> as the bridge type).</para>
         </listitem>
 
         <listitem>
-          <para>Bind the physical port which will be used for LAN access to
-          <literal>dpdk</literal>:</para>
-
-          <itemizedlist spacing="compact">
-            <listitem>
-              <para>Select the <literal>Device</literal> menu.</para>
-            </listitem>
-
-            <listitem>
-              <para>In the Configuration tab select
-              <literal>OpenVSwitch</literal>.</para>
-            </listitem>
-
-            <listitem>
-              <para>Select the <literal>Host Interfaces</literal> menu and
-              click <literal>Add</literal>.</para>
-            </listitem>
-
-            <listitem>
-              <para>Use <literal>dpdk</literal> as the
-              <literal>ovs-bridge-type</literal>.</para>
-            </listitem>
-          </itemizedlist>
+          <para>Bind the physical network interface that will be used for LAN
+          access to the <literal>DPDK</literal>.</para>
         </listitem>
 
         <listitem>
-          <para>Create a LAN Bridge:</para>
-
-          <itemizedlist spacing="compact">
-            <listitem>
-              <para>Select the <literal>Device</literal>.</para>
-            </listitem>
-
-            <listitem>
-              <para>In the Configuration menu select
-              <literal>OpenVSwitch</literal>.</para>
-            </listitem>
-
-            <listitem>
-              <para>Open the <literal>Bridges</literal> menu and click
-              <literal>Add</literal>.</para>
-            </listitem>
-          </itemizedlist>
-
-          <para>At this step the following bridges should exist:</para>
-
-          <figure>
-            <title>Bridges</title>
-
-            <mediaobject>
-              <imageobject>
-                <imagedata align="center" fileref="images/uc_ibm_br2.png"
-                           scale="65" />
-              </imageobject>
-            </mediaobject>
-          </figure>
-
-          <note>
-            <para>The WAN port of the very first VNF instantiated on the
-            device must be connected to the
-            <literal>ibm-wan-br</literal>bridge. All other VNFs must be
-            connected in chain with the first VNF.</para>
-          </note>
+          <para>Create a LAN Bridge and attach the DPDK LAN interface.</para>
         </listitem>
       </orderedlist>
 
-      <para><emphasis role="bold">Onboarding the VNFs:</emphasis></para>
+      <note>
+        <para>The WAN port of the very first VNF instantiated on the device
+        must be connected to the <literal>WAN</literal> bridge. All other VNFs
+        must be connected in chain with the first VNF.</para>
+      </note>
 
-      <orderedlist>
-        <listitem>
-          <para>Select the <literal>Device</literal>.</para>
-        </listitem>
+      <para><emphasis role="bold">Onboarding the VNF:</emphasis></para>
 
-        <listitem>
-          <para>Select the <literal>VNF</literal> menu.</para>
-        </listitem>
+      <para>See onboarding parameters in <xref linkend="fortigate_firewall_uc_1" />.</para>
 
-        <listitem>
-          <para>In the <literal>Descriptors</literal> menu, choose the
-          <literal>VNF Package</literal> option.</para>
-        </listitem>
+      <para><emphasis role="bold">Instantiating the VNF:</emphasis></para>
 
-        <listitem>
-          <para>Browse and select the Fortigate bundle you require, before
-          pressing the <literal>Send</literal> button.</para>
-        </listitem>
-      </orderedlist>
+      <para>Instantiate the FortiGate VNF by filling the required fields with
+      the following values:</para>
 
-      <para><emphasis role="bold">Instantiating the VNFs:</emphasis></para>
+      <table>
+        <title>Instantiation Requirements</title>
 
-      <orderedlist>
-        <listitem>
-          <para>Select the <literal>Device</literal>.</para>
-        </listitem>
+        <tgroup cols="2">
+          <colspec align="center" colwidth="1*" />
 
-        <listitem>
-          <para>Select the <literal>VNF</literal> menu.</para>
-        </listitem>
+          <colspec align="center" colwidth="4*" />
 
-        <listitem>
-          <para>Choose the <literal>Instances</literal> option, select the VNF
-          configuration you desire and press <literal>Add</literal>.</para>
-        </listitem>
+          <thead>
+            <row>
+              <entry align="center">Field</entry>
 
-        <listitem>
-          <para>Browse and select the Fortigate bundle you require, before
-          pressing the <literal>Send</literal> button.</para>
-        </listitem>
-      </orderedlist>
+              <entry align="center">Description</entry>
+            </row>
+          </thead>
+
+          <tbody>
+            <row>
+              <entry align="left">Name</entry>
+
+              <entry align="left">Name of the VM which will be created on the
+              uCPE device.</entry>
+            </row>
+
+            <row>
+              <entry align="left">VNF Type</entry>
+
+              <entry align="left">Name of the onboarded VNF.</entry>
+            </row>
+
+            <row>
+              <entry align="left">uCPE Device</entry>
+
+              <entry align="left">Select the uCPE device where the VNF will be
+              instantiated.</entry>
+            </row>
+
+            <row>
+              <entry align="left">License file</entry>
+
+              <entry align="left">The FortiGate license file provided by
+              Fortinet.</entry>
+            </row>
+
+            <row>
+              <entry align="left">Configuration file</entry>
+
+              <entry align="left">The Firewall example configuration file provided
+              by Enea
+              (<filename>FGVM080000136187_20180828_0353_basic_fw.conf</filename>).</entry>
+            </row>
+
+            <row>
+              <entry align="left">Port1 - WAN</entry>
+
+              <entry align="left">Set the <literal>External Interface</literal> type to 
+                <literal>DPDK</literal> and connect it to the <literal>ibm-wan-br</literal> ovs
+              bridge.</entry>
+            </row>
+
+            <row>
+              <entry align="left">Port2 - LAN1</entry>
+
+              <entry align="left">Set the <literal>Incoming Interface</literal> type to 
+                <literal>DPDK</literal> and connect it to the <literal>lan-br</literal> ovs 
+                bridge.</entry>
+            </row>
 
-      <figure>
-        <title>Instantiate the FortiGate VNF</title>
+            <row>
+              <entry align="left">Port3 - LAN2</entry>
 
-        <mediaobject>
-          <imageobject>
-            <imagedata align="center"
-                       fileref="images/uc_ibm_fg_instantiation.png" scale="65" />
-          </imageobject>
-        </mediaobject>
-      </figure>
+              <entry align="left">Set the <literal>Outgoing Interface</literal> type to 
+                <literal>DPDK</literal> and connect it to the <literal>lan-br</literal> ovs 
+                bridge.</entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
     </section>
 
     <section id="test_fortvnf_inband">