ExampleUsecases: Update Example Usecases

 - Update Example Usecases manual each chapter.
 - Add "uCPE system requirements" for all examples, specify  number
   of physical NICs, RAM and cores (not vCPUs!)
 - Remove all figures
 - Remove all tables
 - Remove In-band Management example usecase

Change-Id: Id183ba0cd1e9fca370d992273d797faadfcf9e3b
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>

1 files changed, 62 insertions, 65 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 db4525a..806430a 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
@@ -8,29 +8,47 @@
   <section id="prere_clav_vnf">
     <title>Prerequisites</title>
 
-    <para>The following files provided with your Enea NFV Access release are
-    needed for this example use case: <remark>FIXME - These filenames may need
-    to be updated</remark></para>
+    <para>System requirements for the uCPE devices:</para>
 
     <itemizedlist>
       <listitem>
-        <para><literal>enea-nfv-access-vnf-qemux86-64.wic.qcow2</literal></para>
+        <para>1 Network Interface</para>
       </listitem>
 
       <listitem>
-        <para><literal>clavister-cos-stream-&lt;version&gt;-virtual-x64-generic.qcow2</literal></para>
+        <para>2 GB of RAM memory</para>
       </listitem>
+    </itemizedlist>
+
+    <para>The following files are needed for this example use case:</para>
+
+    <itemizedlist>
+      <para>VNF images:</para>
+
+      <listitem>
+        <para>Enea Test VNF. Please contact Enea to get this image.</para>
+      </listitem>
+
+      <listitem>
+        <para>Clavister VNF. Please contact Clavister to get this
+        image.</para>
+      </listitem>
+    </itemizedlist>
+
+    <itemizedlist>
+      <para>VNF Configuration files, these files are provided with your Enea
+      NFV Access release:</para>
 
       <listitem>
-        <para><literal>clavister-cloudinit.conf</literal></para>
+        <para><filename>clavister-cloudinit.conf</filename>. </para>
       </listitem>
 
       <listitem>
-        <para><literal>enea-vnf-iperf-client.conf</literal></para>
+        <para><filename>enea-vnf-iperf-client.conf</filename>.</para>
       </listitem>
 
       <listitem>
-        <para><literal>enea-vnf-iperf-server.conf</literal></para>
+        <para><filename>enea-vnf-iperf-server.conf</filename>.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -39,22 +57,9 @@
     <title>Clavister VNF using an Open vSwitch Bridge</title>
 
     <para>In this use-case, uCPE device 1 runs the Clavister VNF, while uCPE
-    device 2 runs two Enea NFV Access VNFs with iPerf client and server
-    applications. The uCPE devices are connected using OVS-DPDK bridges.
-    </para>
-
-    <remark>FIXME: New image needed</remark>
-
-    <figure condition="hidden">
-      <title>Clavister VNF using Open vSwitch Bridge Overview</title>
-
-      <mediaobject>
-        <imageobject>
-          <imagedata align="center" fileref="images/clavister_vnf_diagram.png"
-                     scale="50" />
-        </imageobject>
-      </mediaobject>
-    </figure>
+    device 2 runs two Enea Test VNFs with iPerf client and server
+    applications. The uCPE devices are connected using OVS-DPDK
+    bridges.</para>
 
     <section id="clav_vnf_setup_1">
       <title>Use-case Setup</title>
@@ -63,8 +68,9 @@
 
       <orderedlist>
         <listitem>
-          <para>Select uCPE device 1, access <literal>Configuration</literal>, add the network 
-            interface that will be used and configure it for DPDK.</para>
+          <para>Select uCPE device 1, access <literal>Configuration</literal>,
+          add the network interface that will be used and configure it for
+          DPDK.</para>
         </listitem>
 
         <listitem>
@@ -81,8 +87,8 @@
 
       <orderedlist>
         <listitem>
-          <para>Onboard the Clavister VNF by filling the required fields with the following 
-            values:</para>
+          <para>Onboard the Clavister VNF by filling the required fields with
+          the following values:</para>
 
           <itemizedlist spacing="compact">
             <listitem>
@@ -120,11 +126,11 @@
         </listitem>
 
         <listitem>
-          <para>Onboard the Enea VNF by filling the required fields with the following values:
-            <itemizedlist spacing="compact">
+          <para>Onboard the Enea Test VNF by filling the required fields with
+          the following values: <itemizedlist spacing="compact">
               <listitem>
                 <para><emphasis role="bold">VM Image File</emphasis>: Provide
-                the path to the Enea NFV Access VNF qcow2 image</para>
+                the path to the Enea Test VNF qcow2 image</para>
               </listitem>
 
               <listitem>
@@ -187,16 +193,16 @@
               </listitem>
 
               <listitem>
-                <para><emphasis role="bold">Interfaces</emphasis>: Set the interface type 
-                  to <literal>DPDK</literal> and select the OVS bridge created 
-                  above, for both interfaces.</para>
+                <para><emphasis role="bold">Interfaces</emphasis>: Set the
+                interface type to <literal>DPDK</literal> and select the OVS
+                bridge created above, for both interfaces.</para>
               </listitem>
             </itemizedlist>
           </listitem>
 
           <listitem>
-            <para>Instantiate the Enea iPerf server VNF on uCPE device 2 by filling 
-              the required fields with the values below:</para>
+            <para>Instantiate the Enea iPerf server VNF on uCPE device 2 by
+            filling the required fields with the values below:</para>
 
             <itemizedlist spacing="compact">
               <listitem>
@@ -206,7 +212,7 @@
 
               <listitem>
                 <para><emphasis role="bold">VNF Type</emphasis>: Select Enea
-                NFV Access VNF</para>
+                Test VNF</para>
               </listitem>
 
               <listitem>
@@ -221,15 +227,16 @@
               </listitem>
 
               <listitem>
-                <para><emphasis role="bold">Interfaces</emphasis>: Set the interface type to
-                  <literal>DPDK</literal> and select the OVS bridge created above.</para>
+                <para><emphasis role="bold">Interfaces</emphasis>: Set the
+                interface type to <literal>DPDK</literal> and select the OVS
+                bridge created above.</para>
               </listitem>
             </itemizedlist>
           </listitem>
 
           <listitem>
-            <para>Instantiate the Enea iPerf client VNF on uCPE device 2 by 
-              filling the required fields with the values below:</para>
+            <para>Instantiate the Enea iPerf client VNF on uCPE device 2 by
+            filling the required fields with the values below:</para>
 
             <itemizedlist spacing="compact">
               <listitem>
@@ -239,7 +246,7 @@
 
               <listitem>
                 <para><emphasis role="bold">VNF Type</emphasis>: Select Enea
-                NFV Access VNF</para>
+                Test VNF</para>
               </listitem>
 
               <listitem>
@@ -254,8 +261,9 @@
               </listitem>
 
               <listitem>
-                <para><emphasis role="bold">Interfaces</emphasis>: Set the interface 
-                  type to <literal>DPDK</literal> and select the OVS bridge created above.</para>
+                <para><emphasis role="bold">Interfaces</emphasis>: Set the
+                interface type to <literal>DPDK</literal> and select the OVS
+                bridge created above.</para>
               </listitem>
             </itemizedlist>
           </listitem>
@@ -282,22 +290,9 @@ root@qemux86-64:~# iperf3 -c 192.168.10.10</programlisting>
   <section id="clav_example_sriov">
     <title>Clavister VNF using SR-IOV</title>
 
-    <para>The following use-case is essentially the same as the one detailed above, 
-      in this scenario however, the uCPE devices are connected using SR-IOV, 
-      with two virtual functions.</para>
-
-    <remark>FIXME: New image needed</remark>
-
-    <figure condition="hidden">
-      <title>Clavister VNF using SR-IOV Overview</title>
-
-      <mediaobject>
-        <imageobject>
-          <imagedata align="center" fileref="images/clav_VNF_demo_SR-IOV.png"
-                     scale="60" />
-        </imageobject>
-      </mediaobject>
-    </figure>
+    <para>The following use-case is essentially the same as the one detailed
+    above, in this scenario however, the uCPE devices are connected using
+    SR-IOV, with two virtual functions.</para>
 
     <section id="clav_vnf_setup_2">
       <title>Use-case Setup</title>
@@ -306,9 +301,10 @@ root@qemux86-64:~# iperf3 -c 192.168.10.10</programlisting>
 
       <orderedlist>
         <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>
+          <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>
         </listitem>
 
         <listitem>
@@ -323,13 +319,14 @@ root@qemux86-64:~# iperf3 -c 192.168.10.10</programlisting>
       <para><emphasis role="bold">Instantiating the VNFs:</emphasis></para>
 
       <para>Use the same instantiation parameters as above, but select
-        interface type <literal>SrIovAdapterPool</literal> instead.</para>
+      interface type <literal>SrIovAdapterPool</literal> instead.</para>
     </section>
 
     <section id="test_clav_uc_2">
       <title>Testing the Use-case</title>
 
-      <para>Use the same test instructions as detailed in the use-case above.</para>
+      <para>Use the same test instructions as detailed in the use-case
+      above.</para>
     </section>
   </section>
 </chapter>