af_th: replace target with uCPE device

- Replace WhiteBox with uCPE device, no where else in the
  documentation we use whitebox
- Remove references to solution
- Replace "Enea NFV Access" with "Enea NFV Access Runtime Platform"
- Some minor corrections

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

7 files changed, 52 insertions, 53 deletions

diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
index 85d8dbf..3a154fa 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
@@ -130,7 +130,7 @@
     Manager.</para>
 
     <para>The <literal>/network</literal> folder contains Python scripts for
-    binding or unbinding a network interface to/from a target (DPDK or
+    binding or unbinding a network interface to/from a uCPE device (DPDK or
     SR-IOV), creating or deleting an OVS network bridge, or dumping network
     interface information about the available interfaces.</para>
 
@@ -384,21 +384,21 @@ test 002: Wait VCPE Agent device be up (__main__.UnittestSuite) ...
 2019-03-07 18:03:29,356 - INFO: Done
 2019-03-07 18:03:29,365 - DEBUG: Logging out and exiting...
 ok
-test 003: Bind lan NIC to DPDK target (__main__.UnittestSuite) ...
+test 003: Bind lan NIC to DPDK (__main__.UnittestSuite) ...
 2019-03-07 18:03:29,366 - INFO: Bind NIC
 2019-03-07 18:03:29,406 - DEBUG: Login successful on host 'localhost'
 2019-03-07 18:03:29,406 - DEBUG: Session token is: 8c719cb0-40f2-11e9-a81f525400d08e1d
 2019-03-07 18:03:29,415 - DEBUG: Found device with name 'intelc3850-2'
-2019-03-07 18:03:29,415 - DEBUG: Bind NIC '0000:01:00.1' to dpdk target
+2019-03-07 18:03:29,415 - DEBUG: Bind NIC '0000:01:00.1'
 2019-03-07 18:03:30,030 - INFO: Done
 2019-03-07 18:03:30,067 - DEBUG: Logging out and exiting...
 ok
-test 004: Bind wan NIC to DPDK target (__main__.UnittestSuite) ...
+test 004: Bind wan NIC to DPDK (__main__.UnittestSuite) ...
 2019-03-07 18:03:30,068 - INFO: Bind NIC
 2019-03-07 18:03:30,086 - DEBUG: Login successful on host 'localhost'
 2019-03-07 18:03:30,087 - DEBUG: Session token is: 8cd95f32-40f2-11e9-a81f525400d08e1d
 2019-03-07 18:03:30,095 - DEBUG: Found device with name 'intelc3850-2'
-2019-03-07 18:03:30,096 - DEBUG: Bind NIC '0000:03:00.2' to dpdk target
+2019-03-07 18:03:30,096 - DEBUG: Bind NIC '0000:03:00.2'
 2019-03-07 18:03:30,729 - INFO: Done
 2019-03-07 18:03:30,767 - DEBUG: Logging out and exiting...
 ok
@@ -513,11 +513,11 @@ test 003: Deleting network bridge WAN (__main__.UnittestSuite) ...
 2019-03-07 18:04:57,931 - INFO: Delete OVS network bridge
 2019-03-07 18:04:59,464 - INFO: Done
 ok
-test 004: Unbind lan NIC from DPDK target (__main__.UnittestSuite) ...
+test 004: Unbind lan NIC from DPDK uCPE device (__main__.UnittestSuite) ...
 2019-03-07 18:04:59,477 - INFO: Unbind NIC
 2019-03-07 18:05:00,639 - INFO: Done
 ok
-test 005: Unbind wan NIC from DPDK target (__main__.UnittestSuite) ...
+test 005: Unbind wan NIC from DPDK uCPE device (__main__.UnittestSuite) ...
 2019-03-07 18:05:00,658 - INFO: Unbind NIC
 2019-03-07 18:05:01,533 - INFO: Done
 ok
@@ -767,10 +767,10 @@ Options:
     </section>
 
     <section id="bind_ucpe_device">
-      <title>Bind a uCPE Device</title>
+      <title>Bind a network interface</title>
 
-      <para>Binds a physical network interface to a DPDK or SR-IOV
-      target.</para>
+      <para>Binds a physical network interface to a DPDK or SR-IOV.
+      </para>
 
       <section id="script_opts_bind">
         <title>Script Options</title>
@@ -778,7 +778,7 @@ Options:
         <programlisting>$ python bindNetworkInterface.py -h
 Usage: bindNetworkInterface.py [options]
 
-Binds a physical network interface to a DPDK or SR-IOV target.
+Binds a physical network interface to a DPDK or SR-IOV.
 
 Options:
  --version show program's version number and exit
@@ -809,11 +809,11 @@ format
         <para><emphasis role="bold">Sample unit-test JSON file
         format:</emphasis><programlisting>[
  {
- "name": "Bind lan NIC to DPDK target ",
+ "name": "Bind lan NIC to DPDK",
  "args": "-f ../../lab_config/intelc3850-2/lan_nic.json"
  },
  {
- "name": "Bind wan NIC to DPDK target ",
+ "name": "Bind wan NIC to DPDK ",
  "args": "-f ../../lab_config/intelc3850-2/wan_nic.json"
  }
 ]</programlisting><emphasis role="bold">Sample lan_nic.json configuration
@@ -842,17 +842,16 @@ format
 2019-03-07 18:03:29,406 - DEBUG: Login successful on host 'localhost'
 2019-03-07 18:03:29,406 - DEBUG: Session token is: 8c719cb0-40f2-11e9-a81f525400d08e1d
 2019-03-07 18:03:29,415 - DEBUG: Found device with name 'intelc3850-2'
-2019-03-07 18:03:29,415 - DEBUG: Bind NIC '0000:01:00.1' to dpdk target
+2019-03-07 18:03:29,415 - DEBUG: Bind NIC '0000:01:00.1'
 2019-03-07 18:03:30,030 - INFO: Done
 2019-03-07 18:03:30,067 - DEBUG: Logging out and exiting...</programlisting>
       </section>
     </section>
 
     <section id="unbind_ucpe_device">
-      <title>Unbind a uCPE Device</title>
+      <title>Unbind a network interface</title>
 
-      <para>Unbinds a physical network interface from a DPDK or SR-IOV
-      target.</para>
+      <para>Unbinds a physical network interface from DPDK or SR-IOV.</para>
 
       <section id="script_opts_unbind">
         <title>Script Options</title>
@@ -860,7 +859,7 @@ format
         <programlisting>$ python unbindNetworkInterface.py -h
 Usage: unbindNetworkInterface.py [options]
 
-Unbinds a physical network interface from a DPDK or SR-IOV target.
+Unbinds a physical interface to the DPDK or SR-IOV.
 
 Options:
  --version show program's version number and exit
@@ -891,11 +890,12 @@ Options:
         <para><emphasis role="bold">Sample unit-test JSON file
         format:</emphasis><programlisting>[
  {
- "name": "Unbind lan NIC from DPDK target",
+ "name": "Unbind lan NIC",
  "args": "-f ../../lab_config/intelc3850-2/lan_nic.json"
  },
  {
- "name": "Unbind wan NIC from DPDK target",
+  name": "Unbind wan NIe",
+Unbinds a physical interface to the DPDK or SR-IOV
  "args": "-f ../../lab_config/intelc3850-2/wan_nic.json"
  }
 ]</programlisting></para>
@@ -931,7 +931,7 @@ Options:
 2019-03-07 17:33:54,431 - DEBUG: Login successful on host 'localhost'
 2019-03-07 17:33:54,432 - DEBUG: Session token is: 6a77a1d1-40ee-11e9-a81f525400d08e1d
 2019-03-07 17:33:54,467 - DEBUG: Found device with name 'intelc3850-2'
-2019-03-07 17:33:54,468 - DEBUG: Unbind NIC '0000:01:00.1' from dpdk target
+2019-03-07 17:33:54,468 - DEBUG: Unbind NIC '0000:01:00.1'
 2019-03-07 17:33:55,616 - INFO: Done
 2019-03-07 17:33:55,659 - DEBUG: Logging out and exiting...</programlisting>
       </section>
@@ -1664,4 +1664,4 @@ fortigateFWInstance
       the TH code source.</para>
     </section>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/components.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/components.xml
index 8b98ca2..bbfccd7 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/components.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/components.xml
@@ -2,7 +2,7 @@
 <chapter id="components">
   <title>Components</title>
 
-  <para>An overview of the Enea NFV Access solution and the uCPE Manager in
+  <para>An overview of the Enea NFV Access Run Time Platform and the uCPE Manager in
   cooperation with the Automation Framework and Test Harness, will be
   presented in detail.</para>
 
@@ -17,11 +17,11 @@
     </mediaobject>
   </figure>
 
-  <section id="enfva_solution">
-    <title>Enea NFV Access Solution</title>
+  <section id="enfva_runtime_plt">
+    <title>Enea NFV Access</title>
 
-    <para>The Enea NFV Access Solution is comprised of the Enea NFV Access
-    Runtime Platform and the Enea uCPE Manager.</para>
+    <para>The Enea NFV Access is comprised of the Enea NFV Access
+    Run time Platform and the Enea uCPE Manager.</para>
 
     <section id="eucpe_manager">
       <title>Enea uCPE Manager</title>
@@ -37,10 +37,10 @@
     </section>
 
     <section id="ena_plat">
-      <title>Enea NFV Access</title>
+      <title>Enea NFV Access Run time Platform</title>
 
-      <para>One or more NFV Access devices are required as target hosts
-      running the VNF(s). The NFV Access device is known to the uCPE Manager
+      <para>One or more uCPE devices running the NFV Access Run Time Platform  are 
+      required as hosts running the VNF(s). The uCPE device is known to the uCPE Manager
       as the "VcpeAgent" device module.</para>
 
       <para>Adding a VcpeAgent device can be done via one of two
@@ -94,14 +94,14 @@
     <itemizedlist>
       <listitem>
         <para>VNF, Device and Network Smoke Test Cases. A sample test suite
-        that acts as basic smoke tests for the Enea NFV Access Solution and
+        that acts as basic smoke tests for the Enea NFV Access and
         also as a sanity-check test suite for the AF and TH.</para>
       </listitem>
 
       <listitem>
         <para>VNF Deployment and Lifecycle. A sample test suite that verifies
         the instantiation, lifecycle control and destruction of a VNF for the
-        Enea NFV Access Solution.</para>
+        Enea NFV Access.</para>
       </listitem>
 
       <listitem>
@@ -115,4 +115,4 @@
     chapter "Sample Test Cases" from the Enea NFV Access System Test
     Specification document.</para>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml
index b7ff8f4..b3386b8 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml
@@ -83,8 +83,8 @@
       </listitem>
     </itemizedlist>
 
-    <para><emphasis role="bold">1<superscript>st</superscript> Intel Whitebox
-    target device</emphasis><itemizedlist>
+    <para><emphasis role="bold">1<superscript>st</superscript> uCPE
+    device</emphasis><itemizedlist>
         <listitem>
           <para>Minimum 4 Physical Network Devices.</para>
         </listitem>
@@ -98,13 +98,12 @@
         </listitem>
 
         <listitem>
-          <para>Enea NFV Access installed.</para>
+          <para>Enea NFV Access Run Time Platform installed.</para>
 
           <note>
-            <para>For information on how to install Enea NFV Access<remark>the
-            solution or the platform?</remark>, refer to "Getting Started with
-            Enea NFV Access" from the Enea NFV Access Getting Started
-            manual.</para>
+            <para>For information on how to install Enea NFV Access
+            refer to "Getting Started with Enea NFV Access" from the
+            Enea NFV Access Getting Started manual.</para>
           </note>
         </listitem>
       </itemizedlist><figure>
@@ -119,8 +118,8 @@
         </mediaobject>
       </figure></para>
 
-    <para><emphasis role="bold">Changes to 1st Intel Whitebox target
-    device</emphasis></para>
+    <para><emphasis role="bold">Changes to 1<superscript>st</superscript>
+    uCPE device</emphasis></para>
 
     <itemizedlist>
       <listitem>
@@ -128,13 +127,13 @@
       </listitem>
 
       <listitem>
-        <para>1 Physical connection back to back with the 2nd Intel Whitebox
-        target device.</para>
+        <para>1 Physical connection back to back with the 
+         2<superscript>nd</superscript> uCPE device.</para>
       </listitem>
     </itemizedlist>
 
-    <para><emphasis role="bold">2<superscript>nd</superscript> Intel Whitebox
-    target device</emphasis><itemizedlist>
+    <para><emphasis role="bold">2<superscript>nd</superscript> uCPE
+    device</emphasis><itemizedlist>
         <listitem>
           <para>Minimum 4 Physical Network Devices.</para>
         </listitem>
@@ -149,7 +148,7 @@
 
         <listitem>
           <para>1 Physical connection back to back with the
-          1<superscript>st</superscript> Intel Whitebox target device.</para>
+          1<superscript>st</superscript> uCPE device.</para>
         </listitem>
 
         <listitem>
@@ -220,4 +219,4 @@
     <filename>setupuCPEManager.yml</filename> playbook with the corresponding
     JSON config for the new uCPE Manager instance.</para>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png
index fad8009..a345989 100755
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png
index 7599ead..a597a91 100755
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/environment_basicsetup.png b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/environment_basicsetup.png
index 0b92f7a..6bd35d4 100755
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/environment_basicsetup.png
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/environment_basicsetup.png
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml
index 9b9eaaa..045ceef 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml
@@ -3,7 +3,7 @@
   <title>Overview</title>
 
   <para>This document describes the Automation Framework and Test Harness for
-  the Enea NFV Access Solution, a long with providing instructions regarding
+  the Enea NFV Access, a long with providing instructions regarding
   the necessary steps to run these software tools.</para>
 
   <section id="descrip">
@@ -16,8 +16,8 @@
 
     <para>The Test Harness is based on running Ansible Playbooks to complete
     different test cases, which make use of the Automation Framework Python
-    modules and/or direct commands on the boards running Enea NFV
-    Access.</para>
+    modules and/or direct commands on the uCPE devices running Enea NFV
+    Access Run Time Platform.</para>
   </section>
 
   <section id="def_acro">
@@ -39,7 +39,7 @@
 
         <tbody>
           <row>
-            <entry>Enea NFV Access Solution</entry>
+            <entry>Enea NFV Access</entry>
 
             <entry>Enea NFV Access (with ODM) Runtime Platform and Enea uCPE
             Manager.</entry>
@@ -193,4 +193,4 @@
       </tgroup>
     </table>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>