1 files changed, 221 insertions, 44 deletions

diff --git a/doc/book-enea-nfv-access-system-test-specification/doc/sample_test_cases.xml b/doc/book-enea-nfv-access-system-test-specification/doc/sample_test_cases.xml
index ab611a1..3443883 100644
--- a/doc/book-enea-nfv-access-system-test-specification/doc/sample_test_cases.xml
+++ b/doc/book-enea-nfv-access-system-test-specification/doc/sample_test_cases.xml
@@ -141,10 +141,6 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
       <para><emphasis role="bold">Precondition:</emphasis> The image path must
       already exist.</para>
 
-      <para><emphasis role="bold">Example:</emphasis> <programlisting>ansible-playbook playbooks/uploadImage.yml -e \
-image_path="/tmp/enea-nfv-access-xeon-d6.rootfs.ostree.tar.bz2" -e \
-upgrade_type="xeon_d"</programlisting></para>
-
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>uploadImage.yml</filename> Ansible playbook with the
       <filename>&lt;Image-path&gt;</filename> and
@@ -153,6 +149,10 @@ upgrade_type="xeon_d"</programlisting></para>
       <para><programlisting>ansible-playbook playbooks/deleteUpgradeFile.yml -e \
 image_path="&lt;Image-path&gt;" -e upgrade_type="&lt;Upgrade-type&gt;"</programlisting></para>
 
+      <para><emphasis role="bold">Example:</emphasis> <programlisting>ansible-playbook playbooks/uploadImage.yml -e \
+image_path="/tmp/enea-nfv-access-xeon-d6.rootfs.ostree.tar.bz2" -e \
+upgrade_type="xeon_d"</programlisting></para>
+
       <para><emphasis role="bold">Result:</emphasis> Output of the test case
       run using the Test Harness:</para>
 
@@ -188,16 +188,14 @@ A file with the same name is already uploaded.</programlisting></para>
       <para><emphasis role="bold">Preconditions:</emphasis> The image file
       must already be uploaded onto the uCPE Manager.</para>
 
-      <para><emphasis role="bold">Example:</emphasis></para>
-
-      <programlisting>ansible-playbook playbooks/deleteUpgradeFile.yml -e \
-image_name="enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2"</programlisting>
-
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>deleteUpgradeFile.yml</filename> Ansible Playbook with the
       <literal>&lt;Image-name&gt;</literal> as extra-vars:<programlisting>ansible-playbook playbooks/deleteUpgradeFile.yml -e \
 image_name="&lt;Image-name&gt;"</programlisting></para>
 
+      <para><emphasis role="bold">Example:</emphasis> <programlisting>ansible-playbook playbooks/deleteUpgradeFile.yml -e \
+image_name="enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2"</programlisting></para>
+
       <para><emphasis role="bold">Result:</emphasis> Output of the test case
       run using the Test Harness:<programlisting>TASK [Remove NFVA image -- Run deleteUpgradeFile.py module from automation_framework]
 localhost                  : ok=1    changed=1    unreachable=0    failed=0</programlisting>
@@ -267,12 +265,6 @@ localhost                  : ok=1    changed=1    unreachable=0    failed=0</pro
           </listitem>
         </itemizedlist></para>
 
-      <para><emphasis role="bold">Example:</emphasis></para>
-
-      <programlisting>ansible-playbook playbooks/installAndActivate.yml -e \
-image_name="enea-nfv-access-xeon-d6.rootfs.ostree.tar.bz2" -e \
-upgrade_type=xeon_d -e device=inteld1521-16"</programlisting>
-
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>installAndActivate.yml</filename> Ansible Playbook with the
       <literal>&lt;Image-name&gt;</literal>,
@@ -281,6 +273,10 @@ upgrade_type=xeon_d -e device=inteld1521-16"</programlisting>
 image_name="&lt;Image_name&gt;" -e upgrade_type="&lt;Upgrade_type&gt;" -e \
 device="&lt;Device-name&gt;"</programlisting></para>
 
+      <para><emphasis role="bold">Example:</emphasis> <programlisting>ansible-playbook playbooks/installAndActivate.yml -e \
+image_name="enea-nfv-access-xeon-d6.rootfs.ostree.tar.bz2" -e \
+upgrade_type=xeon_d -e device=inteld1521-16"</programlisting></para>
+
       <para><emphasis role="bold">Result:</emphasis> Output of the test case
       run using the Test Harness:<programlisting>TASK \
 [Install And Activate -- Run installAndActivate.py module from automation_framework]
@@ -311,10 +307,6 @@ Duplicate entry - Release already installed</programlisting></para>
           <para>The playbook imports the previously described
           playbooks:<itemizedlist spacing="compact">
               <listitem>
-                <para><filename>playbook/addDevice.yml</filename></para>
-              </listitem>
-
-              <listitem>
                 <para><filename>playbook/uploadImage.yml</filename></para>
               </listitem>
 
@@ -329,24 +321,23 @@ Duplicate entry - Release already installed</programlisting></para>
               <listitem>
                 <para><filename>playbook/clearCompletedUpgradesInfo.yml</filename></para>
               </listitem>
-
-              <listitem>
-                <para><filename>playbook/removeDevice.yml</filename></para>
-              </listitem>
             </itemizedlist></para>
         </listitem>
       </itemizedlist>
 
-      <para><emphasis role="bold">Precondition:</emphasis> A device JSON
-      configuration file must be created:<programlisting>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/&lt;Device-name&gt;.json</programlisting></para>
+      <para><emphasis role="bold">Preconditions:</emphasis></para>
 
-      <para><emphasis role="bold">Example:</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para>The device has to be previously added to the uCPE Manager
+          instance.</para>
+        </listitem>
 
-      <programlisting>ansible-playbook playbooks/installNFVAImage.yml -e \
-device="inteld1521-16" -e \
-image_path=/tmp/enea-nfv-access-xeon-d5.rootfs.ostree.tar.bz2 -e \
-image_name=enea-nfv-access-xeon-d5.rootfs.ostree.tar.bz2 -e \
-upgrade_type=xeon_d</programlisting>
+        <listitem>
+          <para>A device JSON configuration file must be created:
+          <programlisting>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/&lt;Device-name&gt;.json</programlisting></para>
+        </listitem>
+      </itemizedlist>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>installNFVAImage.yml</filename> Ansible Playbook with the
@@ -357,6 +348,12 @@ upgrade_type=xeon_d</programlisting>
 device="&lt;Device-name&gt;" -e image_path="&lt;Image-path&gt;" -e \
 image_name="&lt;Image-name&gt;" -e upgrade_type="&lt;Upgrade-type&gt;"</programlisting></para>
 
+      <para><emphasis role="bold">Example:</emphasis> <programlisting>ansible-playbook playbooks/installNFVAImage.yml -e \
+device="inteld1521-16" -e \
+image_path=/tmp/enea-nfv-access-xeon-d5.rootfs.ostree.tar.bz2 -e \
+image_name=enea-nfv-access-xeon-d5.rootfs.ostree.tar.bz2 -e \
+upgrade_type=xeon_d</programlisting></para>
+
       <para><emphasis role="bold">Result:</emphasis> Output of the test case
       run using the Test Harness:<programlisting>localhost                  : ok=1    changed=1    unreachable=0    failed=0</programlisting>
       <emphasis role="bold">Note:</emphasis> The test will fail if the one
@@ -595,7 +592,8 @@ image_name="&lt;Image-name&gt;" -e upgrade_type="&lt;Upgrade-type&gt;"</programl
 
       <para><emphasis role="bold">Preconditions:</emphasis><itemizedlist>
           <listitem>
-            <para>A Bridge exists in a uCPE Manager instance.</para>
+            <para>A Bridge exists for a device in a uCPE Manager
+            instance.</para>
           </listitem>
 
           <listitem>
@@ -623,7 +621,7 @@ bridge=&lt;Bridge-name&gt;"</programlisting></para>
 
       <itemizedlist>
         <listitem>
-          <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/network/configDPDK.yml</filename>.</para>
+          <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/configDPDK.yml</filename>.</para>
         </listitem>
 
         <listitem>
@@ -670,15 +668,15 @@ DEBUG: Set DPDK state to &lt;enable/disable&gt;</programlisting><emphasis
 
       <para><emphasis role="bold">Precondition:</emphasis></para>
 
-      <para><literal>lab_config/customScripts</literal> must contain a Custom
-      Script file.</para>
+      <para><literal>&lt;AF-TH-install-dir&gt;/lab_config/customScripts</literal>
+      must contain a Custom Script file.</para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>uploadCustomScript.yml</filename> Ansible Playbook with the
       <literal>&lt;scriptName&gt;</literal> and
       <literal>&lt;phase&gt;</literal> as extra-vars: <programlisting>ansible-playbook playbooks/uploadCustomScript.yml -e "scriptName=&lt;scriptName&gt; \
 phase=
-&lt;always-after-startup/once-after-startup/always-before-startup/once-before-startup&gt;"</programlisting></para>
+&lt;always-after-startup|once-after-startup|always-before-startup|once-before-startup&gt;"</programlisting></para>
 
       <para><emphasis role="bold">Result:</emphasis> Output of the test case
       run using the Test Harness:</para>
@@ -725,7 +723,7 @@ DEBUG: "{{ scriptName }} was uploaded to uCPE Manager!"</programlisting>
       <literal>&lt;phase&gt;</literal> and
       <literal>&lt;deviceName&gt;</literal> as extra-vars: <programlisting>ansible-playbook playbooks/uploadCustomScriptOnDevice.yml -e "scriptName=&lt;scriptName&gt; \
 phase=
-&lt;always-after-startup/once-after-startup/always-before-startup/once-before-startup&gt; \
+&lt;always-after-startup|once-after-startup|always-before-startup|once-before-startup&gt; \
 device=&lt;deviceName&gt;"</programlisting></para>
 
       <para><emphasis role="bold">Result:</emphasis> Output of the test case
@@ -762,7 +760,7 @@ DEBUG: "{{ scriptName }} was uploaded to {{ device }}!"</programlisting>
       <literal>&lt;scriptName&gt;</literal> and
       <literal>&lt;phase&gt;</literal> as extra-vars: <programlisting>ansible-playbook playbooks/removeCustomScript.yml -e "scriptName=&lt;scriptName&gt; \
 phase=
-&lt;always-after-startup/once-after-startup/always-before-startup/once-before-startup&gt;"</programlisting></para>
+&lt;always-after-startup|once-after-startup|always-before-startup|once-before-startup&gt;"</programlisting></para>
 
       <para><emphasis role="bold">Result:</emphasis> Output of the test case
       run using the Test Harness:</para>
@@ -804,10 +802,10 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from uCPE Manager!"<
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>removeCustomScriptOnDevice.yml</filename> Ansible Playbook
       with the <literal>&lt;scriptName&gt;</literal>,
-      <literal>&lt;phase&gt;</literal> and and
+      <literal>&lt;phase&gt;</literal> and
       <literal>&lt;deviceName&gt;</literal> as extra-vars: <programlisting>ansible-playbook playbooks/removeCustomScriptOnDevice.yml -e "scriptName=&lt;scriptName&gt; \
 phase=
-&lt;always-after-startup/once-after-startup/always-before-startup/once-before-startup&gt; \
+&lt;always-after-startup|once-after-startup|always-before-startup|once-before-startup&gt; \
 device=&lt;deviceName&gt;"</programlisting></para>
 
       <para><emphasis role="bold">Result:</emphasis> Output of the test case
@@ -816,6 +814,169 @@ device=&lt;deviceName&gt;"</programlisting></para>
       <programlisting># Remove Custom Script in phase from Device task result
 DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"</programlisting>
     </section>
+
+    <section id="add_offline_config">
+      <title>Offline Configuration - Add an Offline Configuration
+      Store</title>
+
+      <para><emphasis role="bold">Description:</emphasis> Adding an Offline
+      Config Store to the uCPE Manager. For details please refer to:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/addConfigStore.yml</filename>.</para>
+        </listitem>
+
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/device/addConfigStore.py</filename>.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para><emphasis role="bold">Precondition:</emphasis></para>
+
+      <para>The Offline Configuration Store should not already exist on the
+      uCPE Manager. If it exists, the test will report a duplicate.</para>
+
+      <para><emphasis role="bold">Action:</emphasis> Run the
+      <filename>addConfigStore.yml</filename> Ansible Playbook with the
+      <literal>&lt;device-name&gt;</literal> as extra-vars: <programlisting>ansible-playbook playbooks/addConfigStore.yml -e \
+"device=&lt;device-name&gt;"</programlisting></para>
+
+      <para><emphasis role="bold">Result:</emphasis> Output of the test case
+      run using the Test Harness:</para>
+
+      <programlisting># Add Config Store task result
+**********************************************************
+**********************************
+  * localhost                  - changed=False 
+--------------------------------------------------
+    Config store for intelc3850-2 device was added!</programlisting>
+    </section>
+
+    <section id="remove_offline_config">
+      <title>Offline Configuration - Remove an Offline Configuration
+      Store</title>
+
+      <para><emphasis role="bold">Description:</emphasis> Removing an Offline
+      Config Store from the uCPE Manager. For details please refer to:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/removeConfigStore.yml</filename>.</para>
+        </listitem>
+
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/device/removeConfigStore.py</filename>.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para><emphasis role="bold">Precondition:</emphasis></para>
+
+      <para>The Offline Configuration Store the user wishes to remove should
+      exist in the uCPE Manager. If it does not, the test will say so.</para>
+
+      <para><emphasis role="bold">Action:</emphasis> Run the
+      <filename>removeConfigStore.yml</filename> Ansible Playbook with the
+      <literal>&lt;store-name&gt;</literal> as extra-vars: <programlisting>ansible-playbook playbooks/removeConfigStore.yml -e \
+"store=&lt;store-name&gt;"</programlisting></para>
+
+      <para><emphasis role="bold">Result:</emphasis> Output of the test case
+      run using the Test Harness:</para>
+
+      <programlisting># Remove Config Store task result **********************************
+*******************************************************
+  * localhost                  - changed=False 
+  -- intelc3850-2 config store was removed! ---------</programlisting>
+    </section>
+
+    <section id="offline_config_add_bridge">
+      <title>Offline Configuration - Add a network bridge to an Offline
+      Configuration Store</title>
+
+      <para><emphasis role="bold">Description:</emphasis> Adding a network
+      bridge to an Offline Config Store in uCPE Manager. For details please
+      refer to:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/addOfflineBridge.yml</filename>.</para>
+        </listitem>
+
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/network/newNetworkBridge.py</filename>.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para><emphasis role="bold">Precondition:</emphasis></para>
+
+      <para>The Offline Configuration Store should exist in the uCPE Manager.
+      If it does not, the test will say so.</para>
+
+      <para><emphasis role="bold">Action:</emphasis> Run the
+      <filename>addOfflineBridge.yml</filename> Ansible Playbook with the
+      <literal>&lt;device-name&gt;</literal>,
+      <literal>&lt;store-name&gt;</literal> and
+      <literal>&lt;bridge-name&gt;</literal> as extra-vars: <programlisting>ansible-playbook playbooks/addOfflineBridge.yml -e \
+"device=&lt;device-name&gt; store=&lt;store-name&gt; bridge=&lt;bridge-name&gt;"</programlisting></para>
+
+      <para><emphasis role="bold">Result:</emphasis> Output of the test case
+      run using the Test Harness:</para>
+
+      <programlisting># debug *************************************************************
+******************************************************
+  * localhost                  - changed=False 
+--------------------------------------------------
+    lan_br bridge already exists 
+  --- will be deleted to create it with the provided configuration
+..
+# Add Bridge task result ********************************************
+******************************************************
+  * localhost                  - changed=False 
+  -- lan_br network bridge was added! ------------</programlisting>
+
+      <para><emphasis role="bold">Note:</emphasis> if the bridge exists, it
+      will be removed and then re-added, as the output above shows.</para>
+    </section>
+
+    <section id="offline_config_dpdk">
+      <title>Offline Configuration - Configure a DPDK</title>
+
+      <para><emphasis role="bold">Description:</emphasis> Adding an "enable"
+      or "disable" DPDK state to an Offline Config Store. For details please
+      refer to:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/configOfflineDPDK.yml</filename>.</para>
+        </listitem>
+
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/network/configDPDK.py</filename>.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para><emphasis role="bold">Precondition:</emphasis></para>
+
+      <para>An empty Offline Configuration Store should exist in uCPE
+      Manager.</para>
+
+      <para><emphasis role="bold">Action:</emphasis> Run the
+      <filename>configOfflineDPDK.yml</filename> Ansible Playbook with the
+      <literal>&lt;store-name&gt;</literal> and
+      <literal>&lt;enable/disable&gt;</literal> as extra-vars:
+      <programlisting>ansible-playbook playbooks/configOfflineDPDK.yml -e \
+"store=&lt;store-name&gt; state=&lt;enable/disable&gt;"</programlisting></para>
+
+      <para><emphasis role="bold">Result:</emphasis> Output of the test case
+      run using the Test Harness:</para>
+
+      <programlisting>DEBUG: Set DPDK state to disable
+INFO: Done</programlisting>
+
+      <para><emphasis role="bold">Note:</emphasis> the DPDK state cannot be
+      changed. Recreate the Offline Config Store and set the DPDK again if you
+      want to change the state.</para>
+    </section>
   </section>
 
   <section id="vnf_deploy_lifecycle">
@@ -895,8 +1056,7 @@ vnfd=&lt;VNF-Descriptor-name&gt; vnfi=&lt;VNFI-name&gt;"</programlisting></para>
       <literal>&lt;Device-name&gt;</literal>,
       <literal>&lt;VNFI-name&gt;</literal> and the
       <literal>&lt;Command&gt;</literal> as extra-vars: <programlisting>ansible-playbook playbooks/controlVNFI.yml -e "device=&lt;Device-name&gt; \
-vnfi=&lt;VNFI-name&gt; status=&lt;Command&gt;"</programlisting>Where Command =
-      { pause | resume | stop | start }</para>
+vnfi=&lt;VNFI-name&gt; status=&lt;pause|resume|start|stop&gt;"</programlisting></para>
 
       <para><emphasis role="bold">Result:</emphasis> Output of the test case
       run using the Test Harness: <programlisting># Change VNFI Status task result
@@ -1036,9 +1196,15 @@ vnfi=&lt;VNFI-name&gt;"</programlisting><emphasis
 
         <itemizedlist>
           <listitem>
+            <para>A device must have been previously added and connected to
+            the uCPE Manager instance.</para>
+          </listitem>
+
+          <listitem>
             <para>Add the Fortigate VNF Image
             (<filename>fortios.qcow2</filename>) to the
-            <literal>vnf_image</literal> folder.</para>
+            <literal>&lt;AF-TH-install-dir&gt;/vnf_image</literal>
+            folder.</para>
           </listitem>
 
           <listitem>
@@ -1154,9 +1320,15 @@ FortigateFWInstance tested successfully!</programlisting></para>
 
         <itemizedlist>
           <listitem>
+            <para>A device must have been previously added and connected to
+            the uCPE Manager instance.</para>
+          </listitem>
+
+          <listitem>
             <para>Add the FortiGate VNF Image
             (<filename>fortios.qcow2</filename>) to the
-            <literal>vnf_image</literal> folder.</para>
+            <literal>&lt;AF-TH-install-dir&gt;/vnf_image</literal>
+            folder.</para>
           </listitem>
 
           <listitem>
@@ -1267,6 +1439,11 @@ FortigateFW Scenario deployed successfully!</programlisting></para>
 
       <itemizedlist>
         <listitem>
+          <para>Two devices must have been previously added and connected to
+          the uCPE Manager instance.</para>
+        </listitem>
+
+        <listitem>
           <para>Add the Fortigate VNF Image
           (<filename>fortios.qcow2</filename>) to the
           <literal>vnf_image</literal> folder.</para>