5 files changed, 130 insertions, 77 deletions

diff --git a/doc/book-enea-nfv-access-example-usecases/doc/128t_vnf_router.xml b/doc/book-enea-nfv-access-example-usecases/doc/128t_vnf_router.xml
index 9b63248..d58f101 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/128t_vnf_router.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/128t_vnf_router.xml
@@ -29,6 +29,38 @@
         <para>1 LAN interface for 128T.</para>
       </listitem>
     </itemizedlist>
+
+    <para>The following files are needed for this example use-case:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>128T router VNF image. Please contact 128 Technology to get a
+        VNF image and its license file.</para>
+      </listitem>
+
+      <listitem>
+        <para>cloud-init iso image. Please check <olink
+        targetdoc="book_enea_nfv_access_example_usecases"
+        targetptr="appendix_one_cust">Appendix A: How to create a 128T
+        cloud-init iso image (day-0 configuration) in the <xi:include
+        href="../../s_docbuild/olinkdb/pardoc-names.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_nfv_access_example_usecases/1)" /></olink>
+        Manual for more details.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>For data path validation, it may be required to generate a new
+      cloud-init image to match your network configuration. Please check
+      <olink targetdoc="book_enea_nfv_access_example_usecases"
+      targetptr="appendix_one_cust">Appendix A: How to create 128T cloud-init
+      iso image (day-0 configuration) in the <xi:include
+      href="../../s_docbuild/olinkdb/pardoc-names.xml"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xpointer="element(book_enea_nfv_access_example_usecases/1)" /></olink>
+      Manual for more details.</para>
+    </note>
   </section>
 
   <section id="vnf_router_cust">
@@ -50,11 +82,6 @@
       <para><emphasis role="bold">Configuring Network Interfaces on uCPE
       devices:</emphasis><orderedlist>
           <listitem>
-            <para>Log into the uCPE Manager with both username and password
-            values: <literal>admin</literal>.</para>
-          </listitem>
-
-          <listitem>
             <para>Add the trgt uCPE device into the uCPE Manager:
             <literal>Devices -&gt; Manage -&gt; Add</literal>.</para>
 
@@ -375,8 +402,8 @@
       <para><emphasis role="bold">Onboarding the VNFs:</emphasis></para>
 
       <para>Onboard the VM Image through <literal>VNF -&gt; Descriptors -&gt;
-      On-board -&gt; VM Image</literal>, and fill in the required fields with
-      the following values:</para>
+      On-board</literal>, and fill in the required fields with the following
+      values:</para>
 
       <table>
         <title>VM Image Details</title>
@@ -637,6 +664,11 @@
           </tbody>
         </tgroup>
       </table>
+
+      <note>
+        <para>To procure the VNF image files and their licenses, please
+        contact each respective VNF provider.</para>
+      </note>
     </section>
 
     <section id="uc_test_cust_router">
@@ -661,10 +693,7 @@
       <para>In order to validate the data path, connect a test machine to the
       LAN physical port, assign the static IP and a route:<programlisting>&gt; ifconfig eth3 192.168.64.3 netmask 255.255.255.0
 &gt; ip route add default via 192.168.64.1  dev eth3
-&gt; ping 8.8.8.8</programlisting>For data path validation, it may be required
-      to generate a new cloud-init image to match your network configuration.
-      Please check Appendix A: How to create 128T cloud-init iso image (day-0
-      configuration), for more details.</para>
+&gt; ping 8.8.8.8</programlisting></para>
     </section>
 
     <section id="cleanup_custone">
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/appendix_2.xml b/doc/book-enea-nfv-access-example-usecases/doc/appendix_2.xml
index b0a90b2..2458d99 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/appendix_2.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/appendix_2.xml
@@ -6,8 +6,8 @@
   used as the VNF image on NFV Access.</para>
 
   <note>
-    <para>Follow the <filename>128tISO-Install.pdf</filename> document and
-    keep in mind a Virtual Machine was used instead of a physical host.</para>
+    <para>Keep in mind a Virtual Machine was used instead of a physical
+    host.</para>
   </note>
 
   <para><emphasis role="bold">Prerequisites:</emphasis><itemizedlist>
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 b5e7803..36c7114 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
@@ -166,7 +166,7 @@
 
         <listitem>
           <para><emphasis role="bold">Cloud-init content file</emphasis>: Add
-          a license file entry.</para>
+          a file entry where Path: license.</para>
         </listitem>
       </itemizedlist>
 
@@ -249,13 +249,13 @@
 
       <para>The FortiGate VNF management interface is accessible through the
       WAN interface. The WAN IP address can be used from a web browser on the
-      Lab Machine to access the FortiGate VNF Management Web UI. Please check
+      Lab Machine to access the FortiGate VNF Management Web UI. See section
       <olink targetdoc="book_enea_nfv_access_example_usecases"
-      targetptr="fortigate_webmg">FortiGate VNF web management<xi:include
-      href="../../s_docbuild/olinkdb/pardoc-names.xml"
+      targetptr="fortigate_webmg">FortiGate VNF web management in the
+      <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
       xmlns:xi="http://www.w3.org/2001/XInclude"
       xpointer="element(book_enea_nfv_access_example_usecases/1)" /></olink>
-      for more information.</para>
+      Manual for more information.</para>
     </section>
   </section>
 
@@ -343,13 +343,13 @@
 
       <orderedlist>
         <listitem>
-          <para>Connect the <literal>VNFMgr</literal> interfaces to the Lab
-          Network for VNF management access.</para>
+          <para>Connect the <literal>VNF Management</literal> interfaces to
+          the Lab Network for VNF management access.</para>
         </listitem>
 
         <listitem>
-          <para>Directly connect the <literal>WAN</literal> interfaces back to
-          back (using a cable) or connected via VPN.</para>
+          <para>Connect the <literal>WAN</literal> interfaces back to back or
+          via VPN.</para>
         </listitem>
 
         <listitem>
@@ -434,7 +434,7 @@
 
         <listitem>
           <para><emphasis role="bold">Cloud-init content file</emphasis>: Add
-          a license file entry.</para>
+          a file entry where Path: license.</para>
         </listitem>
       </itemizedlist>
 
@@ -502,9 +502,8 @@
       <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>
+      device 2</literal> in the same way as <literal>uCPE device
+      1</literal>.</para>
 
       <note>
         <para>The names of the ports used during instantiation need to be the
@@ -520,15 +519,13 @@
       be established between the two uCPE devices. The Test Machines can be
       connected to the LAN interface on each uCPE device.</para>
 
-      <para>The connected Test Machine can be a laptop or a uCPE device that
-      has one interface configured to get a dynamic IP from a DHCP server. The
-      <command>dhclient &lt;interface&gt;</command> command can be used to
-      request an IP address.</para>
-
       <note>
-        <para>The received IP must be in the 172.16.1.2 - 172.16.1.255 range
-        for Test Machine-1 and in the 172.16.2.2 - 172.16.2.255 range for Test
-        Machine-2.</para>
+        <para>The connected Test Machine can be a laptop or a uCPE device that
+        has one interface configured to get a dynamic IP from a DHCP server.
+        The <command>dhclient &lt;interface&gt;</command> command can be used
+        to request an IP address.The received IP must be in the 172.16.1.2 -
+        172.16.1.255 range for Test Machine-1 and in the 172.16.2.2 -
+        172.16.2.255 range for Test Machine-2.</para>
       </note>
 
       <para>The Test Machine connected to <literal>uCPE device 1</literal>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/service_chaining_128t_fortigate.xml b/doc/book-enea-nfv-access-example-usecases/doc/service_chaining_128t_fortigate.xml
index 4719399..43c3fce 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/service_chaining_128t_fortigate.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/service_chaining_128t_fortigate.xml
@@ -2,12 +2,9 @@
 <chapter id="service_chaining_128t_fortigate">
   <title>Service Chaining 128T - Fortigate Example Use-case</title>
 
-  <para>The term service chaining or service function chaining (SFC) is used
-  to describe the definition and instantiation of an ordered list of instances
-  of such service functions and the subsequent "steering" of traffic flows
-  through those service functions. The set of enabled service function chains
-  reflects operator service offerings and is designed in conjunction with
-  application delivery and service and network policy.</para>
+  <para>The following is an example of how to setup and configure a service
+  chain on top of the Enea NFV Access virtualization platform, using the
+  following commercial VNFs: 128T router and FortiGate.</para>
 
   <section id="prereq_serv_chain_cust">
     <title>Prerequisites</title>
@@ -45,6 +42,36 @@
         Firewall and vRouter.</para>
       </listitem>
     </itemizedlist>
+
+    <para>The following files are needed for this example use-case:</para>
+
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>FortiGate VNF image. Please contact Fortinet to get a VNF image
+        and its license file.</para>
+      </listitem>
+
+      <listitem>
+        <para>128T router VNF image. Please contact 128 Technology to get a
+        VNF image and its license file.</para>
+      </listitem>
+
+      <listitem>
+        <para>Cloud-init iso image. Please check <olink
+        targetdoc="book_enea_nfv_access_example_usecases"
+        targetptr="appendix_one_cust">Appendix A: How to create a 128T
+        cloud-init iso image (day-0 configuration) in the <xi:include
+        href="../../s_docbuild/olinkdb/pardoc-names.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_nfv_access_example_usecases/1)" /></olink>
+        Manual for more details.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>To procure the VNF image files and their licenses, please contact
+      each respective VNF provider.</para>
+    </note>
   </section>
 
   <section id="ser_chain_uc">
@@ -66,11 +93,6 @@
       <para><emphasis role="bold">Configuring Network Interfaces on uCPE
       devices:</emphasis><orderedlist>
           <listitem>
-            <para>Log into the uCPE Manager with both username and password
-            values: <literal>admin</literal>.</para>
-          </listitem>
-
-          <listitem>
             <para>Add the trgt uCPE device into the uCPE Manager:
             <literal>Devices -&gt; Manage -&gt; Add</literal>, and fill in the
             required fields with the following data:</para>
@@ -225,10 +247,8 @@
 
             <para>Add the OVS bridges by selecting the trgt device then:
             <literal>Configuration -&gt; OpenVSwitch -&gt; Bridges -&gt;
-            Add</literal>.</para>
-
-            <para>Fill in the required fields for each bridge with the
-            following data from each table:</para>
+            Add</literal>. Fill in the required fields for each bridge with
+            the following data from each table:</para>
 
             <table>
               <title>ibm_br Bridge Details</title>
@@ -276,6 +296,8 @@
               </tgroup>
             </table>
 
+            <para></para>
+
             <table>
               <title>vnf_mgmt_br Bridge Details</title>
 
@@ -443,8 +465,8 @@
       <para><emphasis role="bold">Onboarding the VNFs:</emphasis></para>
 
       <para>Onboard the 128T VNF VM Image through <literal>VNF -&gt;
-      Descriptors -&gt; On-board -&gt; VM Image</literal>, and fill in the
-      required fields with the following values:</para>
+      Descriptors -&gt; On-board</literal>, and fill in the required fields
+      with the following values:</para>
 
       <table>
         <title>128T VM Image Details</title>
@@ -600,8 +622,8 @@
       </note>
 
       <para>Onboard the Fortigate VNF VM Image through <literal>VNF -&gt;
-      Descriptors -&gt; On-board -&gt; VM Image</literal>, and fill in the
-      required fields with the following values:</para>
+      Descriptors -&gt; On-board</literal>, and fill in the required fields
+      with the following values:</para>
 
       <table>
         <title>Fortigate VM Image Details</title>
@@ -626,7 +648,7 @@
               <entry>VM image file</entry>
 
               <entry><literal>fortios.qcow2</literal>. Please make sure to
-              contact Fortigate for an official Fortigate KVM image.</entry>
+              contact Fortinet for an official FortiGate KVM image.</entry>
             </row>
 
             <row>
@@ -822,10 +844,7 @@
             <row>
               <entry>Cloud Init File</entry>
 
-              <entry><literal>centos_128t_internet_ci.iso</literal>. Example
-              image provided. Please see Appendix A for details on how to
-              change the configuration and create a new cloud-init iso
-              image.</entry>
+              <entry><literal>centos_128t_internet_ci.iso</literal>.</entry>
             </row>
 
             <row>
@@ -873,6 +892,11 @@
         </tgroup>
       </table>
 
+      <note>
+        <para>To procure the VNF image files and their licenses, please
+        contact each respective VNF provider.</para>
+      </note>
+
       <para>Instantiate the Fortigate VNF by selecting the trgt device, then
       <literal>VNF -&gt; Instances -&gt; Add</literal>.</para>
 
@@ -936,8 +960,7 @@
             <row>
               <entry>License File</entry>
 
-              <entry><literal>FGVM08TM00001.lic</literal>. Please make sure to
-              use a valid license file (.lic) received from Fortinet.</entry>
+              <entry>The FortiGate license file provided by Fortinet.</entry>
             </row>
 
             <row>
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 b8b0d5e..8b82337 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
@@ -2,6 +2,13 @@
 <chapter id="vnf_chaining">
   <title>VNF Chaining Example Use-case</title>
 
+  <para>The term service chaining or service function chaining (SFC) is used
+  to describe the definition and instantiation of an ordered list of instances
+  of such service functions and the subsequent "steering" of traffic flows
+  through those service functions. The set of enabled service function chains
+  reflects operator service offerings and is designed in conjunction with
+  application delivery and service and network policy.</para>
+
   <para>The following is an example of how to setup and configure a
   branch-to-branch service comprised on two commercial VNFs (SD-WAN +
   Firewall). This service will run in a service chain on top of the Enea NFV
@@ -40,11 +47,6 @@
 
       <para>The following files are needed for this example use-case:</para>
 
-      <note>
-        <para>To procure the VNF image files and their licenses, please
-        contact each respective VNF provider.</para>
-      </note>
-
       <itemizedlist>
         <listitem>
           <para>Fortigate VNF image file.</para>
@@ -55,6 +57,10 @@
         </listitem>
 
         <listitem>
+          <para>vSRX-Site&lt;x&gt;.iso Cloud-init files.</para>
+        </listitem>
+
+        <listitem>
           <para>VNF Configuration files, provided with your Enea NFV Access
           Release:</para>
 
@@ -64,15 +70,18 @@
             </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>
       </itemizedlist>
+
+      <note>
+        <para>To procure the VNF image files and their licenses, please
+        contact each respective VNF provider. To create the
+        vSRX-Site&lt;x&gt;.iso file, please follow the documentation provided
+        by Juniper.</para>
+      </note>
     </section>
 
     <section id="exam_setup_chain">
@@ -205,8 +214,8 @@
             </listitem>
 
             <listitem>
-              <para>Add <literal>license</literal> as the Cloud-Init content
-              in the Cloud-Init tab files.</para>
+              <para>In the Cloud-init content files field add an entry where
+              <literal>Path: license</literal>.</para>
             </listitem>
           </itemizedlist>
         </listitem>
@@ -222,11 +231,6 @@
             <listitem>
               <para>Use <filename>vSRX-Site1.iso</filename> as the Cloud-Init
               file.</para>
-
-              <note>
-                <para>Please follow Juniper's documentation to create the
-                <filename>vSRX-Site1.iso</filename> file.</para>
-              </note>
             </listitem>
 
             <listitem>
@@ -239,7 +243,7 @@
             <listitem>
               <para>Add virtual interfaces:</para>
 
-              <itemizedlist>
+              <itemizedlist spacing="compact">
                 <listitem>
                   <para>Management interface added to
                   <literal>vnf_mgmt_br</literal>.</para>