3 files changed, 203 insertions, 42 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 5088e9c..08fb569 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
@@ -490,7 +490,9 @@ OK</programlisting>
         <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>
+        <para>Setting the console logging level to INFO:</para>
+          
+          <programlisting>consoleLoggingLevel = logging.INFO</programlisting>
 
         <para><emphasis role="bold">Expected Output:</emphasis></para>
 
@@ -580,7 +582,9 @@ Options:
         file:</emphasis></para>
 
         <programlisting>{
- "name": " intelc3850-2",
+ "name": "intelc3850-2",
+ "deviceId": "intelc3850-2",
+ "deviceGroupingTags": " ",
  "description": "",
  "address": "192.168.1.100",
  "port": "22",
@@ -588,8 +592,10 @@ Options:
  "password": "root",
  "certificate": null,
  "passphrase": null,
+ "callHome": "false",
  "maintMode": "false"
-}</programlisting>
+}
+</programlisting>
       </section>
 
       <section id="run_py_mod">
@@ -796,18 +802,22 @@ Mandatory options:
         <para><emphasis role="bold">Sample
         <filename>intelc3850-2.json</filename> configuration
         file:</emphasis></para>
-
+        
         <programlisting>{
-"name": "intelc3850-2",
-"description": "",
-"address": "172.24.12.114",
-"port": "22",
-"username": "root",
-"password": "root",
-"certificate": null,
-"passphrase": null,
-"maintMode": "false"
-              }</programlisting>
+ "name": "intelc3850-2",
+ "deviceId": "intelc3850-2",
+ "deviceGroupingTags": " ",
+ "description": "",
+ "address": "192.168.1.100",
+ "port": "22",
+ "username": "root",
+ "password": "root",
+ "certificate": null,
+ "passphrase": null,
+ "callHome": "false",
+ "maintMode": "false"
+}
+</programlisting>
       </section>
 
       <section id="runpy_mod_log">
@@ -1631,11 +1641,11 @@ License("vnf_config/fortigateImage/fortigateLicense.lic")
 
       <note>
         <para>If a sequence of commands aiming to change the state of the VNF
-        (start/stop/suspend/shutdown) is issued rapidly, certain VNFs might become
-        unresponsive. Depending on the actual VNF, the time required between
-        life-cycle operations may vary from several seconds to half a minute
-        or even more. If a VNF becomes unresponsive, the only possible action
-        is to "Force Delete" the instance from the uCPE Manager.</para>
+        (start/stop/suspend/shutdown) is issued rapidly, certain VNFs might
+        become unresponsive. Depending on the actual VNF, the time required
+        between life-cycle operations may vary from several seconds to half a
+        minute or even more. If a VNF becomes unresponsive, the only possible
+        action is to "Force Delete" the instance from the uCPE Manager.</para>
       </note>
 
       <section id="script_opts_control">
@@ -2444,6 +2454,52 @@ Options:
   Mandatory options:
     -H/--host, -f/--file</programlisting>
 
+        <para>Uploading an offline configuration store to a uCPE Device 
+          using the command line:</para>
+
+        <programlisting>python uploadConfigStore.py -h
+Usage: uploadConfigStore.py [options]
+
+Upload offline configuration to uCPE Device.
+
+Options:
+  --version             show program's version number and exit
+  -h, --help            show this help message and exit
+  -u USERNAME, --username=USERNAME
+                        Enea uCPE Manager login username
+  -p PASSWORD, --password=PASSWORD
+                        Enea uCPE Manager login password
+  -H HOST, --host=HOST  Enea uCPE Manager host name or IP address
+  -s STORE, --store=STORE
+                        Offline config store name
+  -d DEVICE, --device=DEVICE
+                        Device Name
+
+  Mandatory options:
+    -H/--host, -s/--store, -d/--device</programlisting>
+
+        <para>Checking the upload of an offline configuration store to a uCPE
+        Device using the command line:</para>
+
+        <programlisting>python getUploadStatus.py -h
+Usage: getUploadStatus.py [options]
+
+Get upload offline configure status on uCPE Device.
+
+Options:
+  --version             show program's version number and exit
+  -h, --help            show this help message and exit
+  -u USERNAME, --username=USERNAME
+                        Enea uCPE Manager login username
+  -p PASSWORD, --password=PASSWORD
+                        Enea uCPE Manager login password
+  -H HOST, --host=HOST  Enea uCPE Manager host name or IP address
+  -d DEVICE, --device=DEVICE
+                        Device Name
+
+  Mandatory options:
+    -H/--host, -d/--device</programlisting>
+
         <para>Removing a config store in the Enea uCPE Manager using the
         command line:</para>
 
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/appendix_5.xml b/doc/book-enea-nfv-access-example-usecases/doc/appendix_5.xml
index ea99e4f..71dee09 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/appendix_5.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/appendix_5.xml
@@ -27,6 +27,7 @@
   <para><programlisting>&gt; cat lab_config/trgt-1/target.json
 {
     "name": "inteld1521-17",
+    "deviceGroupingTags": " ",
     "description": "trgt",
     "address": "172.24.8.62",
     "port": "830",
@@ -34,6 +35,7 @@
     "password": "",
     "certificate": null,
     "passphrase": null,
+    "callHome": "false",
     "maintMode": "false",
     "version": "2.2.3",
     "deviceId": "inteld1521-17"
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 b55b9bc..6e54bd4 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
@@ -304,29 +304,30 @@ Duplicate entry - Release already installed</programlisting></para>
         </listitem>
 
         <listitem>
-          <para>The playbook imports the previously described playbooks:</para>
-            
-            <itemizedlist spacing="compact">
-              <listitem>
-                <para><filename>playbooks/waitDeviceUp.yml</filename></para>
-              </listitem>
-              
-              <listitem>
-                <para><filename>playbook/uploadImage.yml</filename></para>
-              </listitem>
+          <para>The playbook imports the previously described
+          playbooks:</para>
 
-              <listitem>
-                <para><filename>playbook/installAndActivate.yml</filename></para>
-              </listitem>
+          <itemizedlist spacing="compact">
+            <listitem>
+              <para><filename>playbooks/waitDeviceUp.yml</filename></para>
+            </listitem>
 
-              <listitem>
-                <para><filename>playbook/deleteUpgradeFile.yml</filename></para>
-              </listitem>
+            <listitem>
+              <para><filename>playbook/uploadImage.yml</filename></para>
+            </listitem>
 
-              <listitem>
-                <para><filename>playbook/clearCompletedUpgradesInfo.yml</filename></para>
-              </listitem>
-            </itemizedlist>
+            <listitem>
+              <para><filename>playbook/installAndActivate.yml</filename></para>
+            </listitem>
+
+            <listitem>
+              <para><filename>playbook/deleteUpgradeFile.yml</filename></para>
+            </listitem>
+
+            <listitem>
+              <para><filename>playbook/clearCompletedUpgradesInfo.yml</filename></para>
+            </listitem>
+          </itemizedlist>
         </listitem>
       </itemizedlist>
 
@@ -340,6 +341,7 @@ Duplicate entry - Release already installed</programlisting></para>
 
         <listitem>
           <para>A device JSON configuration file must be created:</para>
+
           <programlisting>&lt;AF-TH-install-dir&gt;/lab_config/&lt;Device-name&gt;/&lt;Device-name&gt;.json</programlisting>
         </listitem>
       </itemizedlist>
@@ -349,9 +351,7 @@ Duplicate entry - Release already installed</programlisting></para>
       <literal>&lt;Image-path&gt;</literal>,
       <literal>&lt;Image-name&gt;</literal>,
       <literal>&lt;Upgrade-type&gt;</literal>, and the
-      <literal>&lt;Device-name&gt;</literal> as extra-vars:
-        
-        <programlisting>ansible-playbook playbooks/installNFVAImage.yml -e \
+      <literal>&lt;Device-name&gt;</literal> as extra-vars: <programlisting>ansible-playbook playbooks/installNFVAImage.yml -e \
 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>
 
@@ -1000,6 +1000,109 @@ INFO: Done</programlisting>
       changed. Recreate the Offline Config Store and set the DPDK again if you
       want to change the state.</para>
     </section>
+
+    <section id="offline_config_ucpe">
+      <title>Offline Configuration - Upload an offline configuration onto a
+      uCPE Device</title>
+
+      <para><emphasis role="bold">Description:</emphasis> Uploading an offline
+      configuration to a uCPE Device. For details please refer to:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/uploadConfigStore.yml</filename>.</para>
+        </listitem>
+
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/device/uploadConfigStore.py</filename>.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para><emphasis role="bold">Precondition:</emphasis></para>
+
+      <itemizedlist>
+        <listitem>
+          <para>The Offline Configuration Store should exist in the uCPE
+          Manager.</para>
+        </listitem>
+
+        <listitem>
+          <para>The device should be connected to the uCPE Manager.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para><emphasis role="bold">Action:</emphasis> Run the
+      <filename>uploadConfigStore.yml</filename> Ansible Playbook with the
+      <literal>&lt;store-name&gt;</literal> and
+      <literal>&lt;device-name&gt;</literal> as extra-vars:</para>
+
+      <programlisting>ansible-playbook playbooks/uploadConfigStore.yml -e \
+"store=&lt;store-name&gt; device=&lt;device-name&gt;"</programlisting>
+
+      <para><emphasis role="bold">Result:</emphasis> Output of the test case
+      run using the Test Harness:</para>
+
+      <programlisting># Upload Config Store task result ****************************
+  * localhost                  - changed=False ---------------
+    2020-10-08 13:29:41,062 - INFO: Upload offline \
+    configuration to uCPE Device
+    2020-10-08 13:30:01,315 - INFO: The '&lt;store-name&gt;' config \
+    store was successfully uploaded on device!
+    2020-10-08 13:30:01,316 - INFO: Done</programlisting>
+    </section>
+
+    <section id="offline_config_status">
+      <title>Offline Configuration - Get the offline configuration upload
+      status on the uCPE Device</title>
+
+      <para><emphasis role="bold">Description:</emphasis> Get the offline
+      configuration upload status to a uCPE Device. For details please refer
+      to:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/playbooks/getUploadStatus.yml</filename>.</para>
+        </listitem>
+
+        <listitem>
+          <para><filename>&lt;AF-TH-install-dir&gt;/automation_framework/device/getUploadStatus.py</filename>.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para><emphasis role="bold">Precondition:</emphasis></para>
+
+      <itemizedlist>
+        <listitem>
+          <para>An upload of the offline configuration should be done on the
+          uCPE Device.</para>
+        </listitem>
+
+        <listitem>
+          <para>The device should be connected to the uCPE Manager.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para><emphasis role="bold">Action:</emphasis> Run the
+      <filename>getUploadStatus.yml</filename> Ansible Playbook with the
+      <literal>&lt;device-name&gt;</literal> as extra-vars:</para>
+
+      <programlisting>ansible-playbook playbooks/getUploadStatus.yml -e \
+"device=&lt;device-name&gt;"</programlisting>
+
+      <para><emphasis role="bold">Result:</emphasis> Output of the test case
+      run using the Test Harness:</para>
+
+      <programlisting># Upload Config Store task result ****************************
+  * localhost                  - changed=False ---------------
+    2020-10-08 14:13:24,422 - INFO: Get upload offline configure \
+    status on uCPE Device
+    2020-10-08 14:13:24,521 - INFO: Successful: True
+    2020-10-08 14:13:24,522 - INFO: Store name: &lt;store-name&gt;
+    2020-10-08 14:13:24,523 - INFO: In progress: False
+    2020-10-08 14:13:24,524 - INFO: A config store was successfully \
+    uploaded on device!
+    2020-10-08 14:13:24,525 - INFO: Done</programlisting>
+    </section>
   </section>
 
   <section id="vnf_deploy_lifecycle">