2 files changed, 83 insertions, 71 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 9f9930a..f32e5b7 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
@@ -95,63 +95,59 @@ Options:
         Fortigate <emphasis role="bold">deployment</emphasis> scenario
         <filename>fortigateDeploy.json</filename>:</para>
 
-        <para><programlisting>[
- {
- "config": "config/addDevice.json",
- "module": "../device/addDevice.py"
- },
- {
- "config": "config/waitDeviceUp.json",
- "module": "../device/waitDeviceUp.py"
- },
- {
- "config": "config/bindNetworkInterface.json",
- "module": "../network/bindNetworkInterface.py"
- },
- {
- "config": "config/newNetworkBridge.json",
- "module": "../network/newNetworkBridge.py"
- },
- {
- "config": "config/onboardVNFRaw.json",
- "module": "../vnf/onboardVNFRaw.py"
- },
- {
- "config": "config/instantiateVNFI.json",
- "module": "../vnf/instantiateVNFI.py"
- },
- {
- "config": "config/controlVNFI.json",
- "module": "../vnf/controlVNFI.py"
- }
-]</programlisting></para>
+        <para><programlisting>
+[
+   {
+      "config": "config/waitDeviceUp.json",
+      "module": "../device/waitDeviceUp.py"
+   },
+   {
+      "config": "config/bindNetworkInterface.json",
+      "module": "../network/bindNetworkInterface.py"
+   },
+   {
+      "config": "config/newNetworkBridge.json",
+      "module": "../network/newNetworkBridge.py"
+   },
+   {
+      "config": "config/onboardVNFRaw.json",
+      "module": "../vnf/onboardVNFRaw.py"
+   },
+   {
+      "config": "config/instantiateVNFI.json",
+      "module": "../vnf/instantiateVNFI.py"
+   },
+   {
+      "config": "config/controlVNFI.json",
+      "module": "../vnf/controlVNFI.py"
+   }
+]
+</programlisting></para>
 
         <para>Below is a sample unit-test configuration file, describing the
         Fortigate <emphasis role="bold">cleanup</emphasis> scenario
         <filename>fortigateCleanup.json</filename>:</para>
 
-        <programlisting>[
- {
- "config": "config/destroyVNFI.json",
- "module": "../vnf/destroyVNFI.py"
- },
- {
- "config": "config/delNetworkBridge.json",
- "module": "../network/delNetworkBridge.py"
- },
- {
- "config": "config/unbindNetworkInterface.json",
- "module": "../network/unbindNetworkInterface.py"
- },
- {
- "config": "config/offboardVNF.json",
- "module": "../vnf/offboardVNF.py"
- },
- {
- "config": "config/removeDevice.json",
- "module": "../device/removeDevice.py"
- }
-]</programlisting>
+        <programlisting>
+[
+   {
+      "config": "config/destroyVNFI.json",
+      "module": "../vnf/destroyVNFI.py"
+   },
+   {
+      "config": "config/delNetworkBridge.json",
+      "module": "../network/delNetworkBridge.py"
+   },
+   {
+      "config": "config/unbindNetworkInterface.json",
+      "module": "../network/unbindNetworkInterface.py"
+   },
+   {
+      "config": "config/offboardVNF.json",
+      "module": "../vnf/offboardVNF.py"
+   }
+]
+</programlisting>
 
         <para>The <literal>config</literal> key contains the path to the test
         case's configuration file.</para>
@@ -165,12 +161,15 @@ Options:
 
         <para>Unit-test behavior can be tweaked through setting any of the
         following options. This is done through the
-        <filename>eneaUcpeMgr.py</filename> file:<programlisting># Defaults for the framework
+        <filename>eneaUcpeMgr.py</filename> file:</para>
+                
+                <programlisting>
+# Defaults for the framework
 username = "admin"
 password = "admin"
 host = None
 deviceName = None
-directory = "."
+directory =  "."
 ftpUsername = "ftp"
 ftpPassword = "ftp"
 ftpPort = "2021"
@@ -179,16 +178,17 @@ ftpPort = "2021"
 failfast = True
 
 # Logging levels ordered by the highest severity:
-# CRITICAL 50
-# ERROR 40
-# WARNING 30
-# INFO 20
-# DEBUG 10
-# NOTSET 0
+#  CRITICAL      50
+#  ERROR         40
+#  WARNING       30
+#  INFO          20
+#  DEBUG         10
+#  NOTSET        0
 fileLoggingLevel = logging.DEBUG
-consoleLoggingLevel = logging.INFO</programlisting></para>
+consoleLoggingLevel = logging.INFO
+</programlisting>
 
-        <para><table>
+        <table>
             <title>eneaUcpeMgr.py Options</title>
 
             <tgroup cols="2">
@@ -287,7 +287,7 @@ consoleLoggingLevel = logging.INFO</programlisting></para>
                 </row>
               </tbody>
             </tgroup>
-          </table></para>
+          </table>
       </section>
 
       <section id="ut_suite_log">
@@ -323,10 +323,18 @@ NOTSET 0</programlisting></para>
         running the Fortigate <emphasis role="bold">deployment</emphasis>
         scenario:</para>
 
-        <para><programlisting>$ python unittestSuite.py -u admin -p admin -H localhost -n intelc3850-2 -s
-fortigateDeploy.json -d "Fortigate deployment scenario"</programlisting>Setting
-        the console logging level to DEBUG:<programlisting>consoleLoggingLevel = logging.DEBUG</programlisting><emphasis
-        role="bold">Expected Output:</emphasis><programlisting>2019-03-07 18:03:20,791 - DEBUG: Started logging
+<programlisting>
+$ python unittestSuite.py -u admin -p admin -H localhost -n intelc3850-2 -s
+fortigateDeploy.json -d "Fortigate deployment scenario"
+</programlisting>
+
+<para>Setting the console logging level to DEBUG:</para>
+
+<para><programlisting>consoleLoggingLevel = logging.DEBUG</programlisting>
+<emphasis role="bold">Expected Output:</emphasis>
+
+<programlisting>
+2019-03-07 18:03:20,791 - DEBUG: Started logging
 
 Running Fortigate deployment scenario...
 
@@ -459,8 +467,12 @@ OK</programlisting></para>
 
         <para>Below you'll find sample unit-test command line options for
         running the Fortigate <emphasis role="bold">cleanup</emphasis>
-        scenario:<programlisting>$ python unittestSuite.py -u admin -p admin -H localhost -n intelc3850-2 -s
-fortigateCleanup.json -d "Fortigate cleanup scenario"</programlisting></para>
+        scenario:</para>
+                
+<programlisting>
+$ python unittestSuite.py -u admin -p admin -H localhost -n intelc3850-2 -s
+fortigateCleanup.json -d "Fortigate cleanup scenario"
+</programlisting>
 
         <para>Setting the console logging level to INFO: <programlisting>consoleLoggingLevel = logging.INFO</programlisting></para>
 
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 a63dfda..b1ec97a 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
@@ -216,8 +216,8 @@
     <para>Subsequent use of the installation requires activating the Python
     virtual enviroment before using the Automation Framework and Test Harness:
     <literal>source
-    &lt;AF-THinstall-dir&gt;/testHarness/bin/activate</literal>.</para>
-
+    &lt;AF-TH-install-dir&gt;/testHarness-venv/bin/activate</literal>.</para>
+        
     <para>Furthermore, if a user wants to use a new uCPE Manager instance for
     a new session, the user also has to re-run the
     <filename>setupuCPEManager.yml</filename> playbook with the corresponding