Merge the code from develop to master for 2.4.0Enea_NFV_Access_2.4.0hotfix_EDGESC-6feature_CPDX-3546EE240_HotFix1

Change-Id: Ibc844e001b7d75125d6006fa5333cc65bbf5afa4

1 files changed, 244 insertions, 0 deletions

diff --git a/doc/book-enea-edge-example-usecases/doc/appendix_5.xml b/doc/book-enea-edge-example-usecases/doc/appendix_5.xml
new file mode 100644
index 0000000..abb4be8
--- /dev/null
+++ b/doc/book-enea-edge-example-usecases/doc/appendix_5.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<appendix id="appendix_five_cust">
+  <title>Example Tests Results using the Automation Framework and Test
+  Harness</title>
+
+  <para>In order to run the following example usecases, certain configuration
+  file entries need to be modified according to the network setup that it will
+  be used, for more details see the previous appendix:</para>
+
+  <itemizedlist spacing="compact">
+    <listitem>
+      <para>uCPE Device name: inteld1521-17</para>
+    </listitem>
+
+    <listitem>
+      <para>address: 172.24.8.62</para>
+    </listitem>
+
+    <listitem>
+      <para>version: 2.2.3</para>
+    </listitem>
+
+    <listitem>
+      <para>deviceId: inteld1521-17</para>
+    </listitem>
+  </itemizedlist>
+
+  <para><programlisting>&gt; cat lab_config/trgt-1/target.json
+{
+    "name": "inteld1521-17",
+    "deviceGroupingTags": " ",
+    "description": "trgt",
+    "address": "172.24.8.62",
+    "port": "830",
+    "username": "root",
+    "password": "",
+    "certificate": null,
+    "passphrase": null,
+    "callHome": "false",
+    "maintMode": "false",
+    "version": "2.2.3",
+    "deviceId": "inteld1521-17"
+}</programlisting>The IP address of Enea Edge Management application that will
+  be used in these examples is <literal>172.24.3.92</literal>.</para>
+
+  <para>The FortiGate and 128T VNF images need to be copied into the
+  <literal>vnf_image</literal> directory. The names should be the same as
+  those described in the previous appendix.</para>
+
+  <para>The FortiGate valid license file needs to be copied into the
+  <literal>vnf_config/fortigate/</literal> directory. The name should be the
+  same as that described in the previous appendix.</para>
+
+  <para>The cloud init files that match the network, need to be copied into
+  the <literal>vnf_config/fortigate/</literal> and the
+  <literal>vnf_config/128t/</literal> directories respectively. The names
+  should be the same as those described in the previous appendix.</para>
+
+  <section id="ap_d_uc1">
+    <title>Use-case 1: 128T VNF Router Example Use-case</title>
+
+    <programlisting>&gt; cd automation_framework/unittestSuite/
+&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.92 -n inteld1521-17 \
+-s 128tDeploy.json -d "128T Deployment"
+
+Running 128T Deployment...
+
+test 001: Wait VCPE Agent device be up (__main__.UnittestSuite) ...
+2020-08-26 10:10:05,517 - INFO: Wait uCPE device
+2020-08-26 10:10:36,650 - INFO: Status: Connected
+2020-08-26 10:10:36,651 - INFO: Done
+ok
+test 002: Bind NIC to DPDK for LAN connection (__main__.UnittestSuite) ...
+2020-08-26 10:10:36,686 - INFO: Bind NIC
+2020-08-26 10:10:37,788 - INFO: Done
+ok
+test 003: Creating ibm bridge  (__main__.UnittestSuite) ...
+2020-08-26 10:10:37,818 - INFO: New OVS network bridge
+2020-08-26 10:10:58,762 - INFO: Done
+ok
+test 004: Creating VNF Management bridge  (__main__.UnittestSuite) ...
+2020-08-26 10:10:58,794 - INFO: New OVS network bridge
+2020-08-26 10:10:58,977 - INFO: Done
+ok
+test 005: Creating LAN bridge and attaching lan interface to the bridge  \
+(__main__.UnittestSuite) ...
+2020-08-26 10:10:59,003 - INFO: New OVS network bridge
+2020-08-26 10:10:59,334 - INFO: Done
+ok
+test 006: Onboarding 128T VNF (wizard API) (__main__.UnittestSuite) ...
+2020-08-26 10:10:59,370 - INFO: Onboard wizard
+2020-08-26 10:13:55,775 - INFO: Done
+ok
+test 007: Instantiate 128T VNF   (__main__.UnittestSuite) ...
+2020-08-26 10:13:55,813 - INFO: Instantiate VNF
+2020-08-26 10:14:56,583 - INFO: Done
+ok
+
+----------------------------------------------------------------------
+Ran 7 tests in 291.103s
+
+OK
+
+&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.92 -n inteld1521-17 \
+-s 128tCleanup.json -d "128T Cleanup"
+
+Running 128T Cleanup...
+
+test 001: Destroying 128T VNF     (__main__.UnittestSuite) ...
+2020-08-26 10:15:28,395 - INFO: Destroy VNF
+2020-08-26 10:15:29,452 - INFO: Done
+ok
+test 002: Deleting network bridge LAN  (__main__.UnittestSuite) ...
+2020-08-26 10:15:29,493 - INFO: Delete OVS network bridge
+2020-08-26 10:15:29,734 - INFO: Done
+ok
+test 003: Deleting VNF management bridge  (__main__.UnittestSuite) ...
+2020-08-26 10:15:29,765 - INFO: Delete OVS network bridge
+2020-08-26 10:15:30,080 - INFO: Done
+ok
+test 004: Deleting ibm(In Band Management) bridge  (__main__.UnittestSuite) ...
+2020-08-26 10:15:30,110 - INFO: Delete OVS network bridge
+2020-08-26 10:15:46,907 - INFO: Done
+ok
+test 005: Unbind LAN NIC from DPDK target (__main__.UnittestSuite) ...
+2020-08-26 10:15:46,967 - INFO: Unbind NIC
+2020-08-26 10:15:48,489 - INFO: Done
+ok
+test 006: Offboarding 128t VNF    (__main__.UnittestSuite) ...
+2020-08-26 10:15:48,531 - INFO: Offboard VNF
+2020-08-26 10:15:49,171 - INFO: Done
+ok
+
+----------------------------------------------------------------------
+Ran 6 tests in 20.808s
+
+OK</programlisting>
+  </section>
+
+  <section id="ap_d_uc2">
+    <title>Use-case 2: Service Chaining 128T - Fortigate Example
+    Use-case</title>
+
+    <programlisting>&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.92 -n inteld1521-17 \
+-s 128t_FG_SFCDeploy.json -d "128T - Fortigate SFC Deployment"
+
+Running 128T - Fortigate SFC Deployment...
+
+test 001: Wait VCPE Agent device be up (__main__.UnittestSuite) ...
+2020-08-26 10:17:29,361 - INFO: Wait uCPE device
+2020-08-26 10:18:00,473 - INFO: Status: Connected
+2020-08-26 10:18:00,474 - INFO: Done
+ok
+test 002: Bind NIC to DPDK for LAN connection (__main__.UnittestSuite) ...
+2020-08-26 10:18:00,634 - INFO: Bind NIC
+2020-08-26 10:18:01,805 - INFO: Done
+ok
+test 003: Creating ibm bridge  (__main__.UnittestSuite) ...
+2020-08-26 10:18:01,863 - INFO: New OVS network bridge
+2020-08-26 10:18:30,640 - INFO: Done
+ok
+test 004: Creating VNF Management bridge  (__main__.UnittestSuite) ...
+2020-08-26 10:18:30,670 - INFO: New OVS network bridge
+2020-08-26 10:18:30,876 - INFO: Done
+ok
+test 005: Creating LAN bridge and attaching lan interface to the bridge  \
+(__main__.UnittestSuite) ...
+2020-08-26 10:18:30,908 - INFO: New OVS network bridge
+2020-08-26 10:18:31,243 - INFO: Done
+ok
+test 006: Creating SFC(service function chaining) bridge  (__main__.UnittestSuite) ...
+2020-08-26 10:18:31,273 - INFO: New OVS network bridge
+2020-08-26 10:18:31,416 - INFO: Done
+ok
+test 007: Onboarding 128T VNF (wizard API) (__main__.UnittestSuite) ...
+2020-08-26 10:18:31,448 - INFO: Onboard wizard
+2020-08-26 10:21:21,569 - INFO: Done
+ok
+test 008: Onboarding Fortigate VNF (wizard API) (__main__.UnittestSuite) ...
+2020-08-26 10:21:21,608 - INFO: Onboard wizard
+2020-08-26 10:21:27,199 - INFO: Done
+ok
+test 009: Instantiate 128T VNF   (__main__.UnittestSuite) ...
+2020-08-26 10:21:27,226 - INFO: Instantiate VNF
+2020-08-26 10:22:27,067 - INFO: Done
+ok
+test 010: Instantiate Fortigate VNF    (__main__.UnittestSuite) ...
+2020-08-26 10:22:27,121 - INFO: Instantiate VNF
+2020-08-26 10:22:31,310 - INFO: Done
+ok
+
+----------------------------------------------------------------------
+Ran 10 tests in 301.989s
+
+OK
+
+&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.92 -n inteld1521-17 \
+-s 128t_FG_SFCCleanup.json -d "128T - Fortigate SFC Cleanup"
+
+Running 128T - Fortigate SFC Cleanup...
+
+test 001: Destroying Fortigate VNF     (__main__.UnittestSuite) ...
+2020-08-26 10:23:29,308 - INFO: Destroy VNF
+2020-08-26 10:23:30,026 - INFO: Done
+ok
+test 002: Destroying 128T VNF     (__main__.UnittestSuite) ...
+2020-08-26 10:23:30,065 - INFO: Destroy VNF
+2020-08-26 10:23:30,917 - INFO: Done
+ok
+test 003: Deleting network bridge SFC  (__main__.UnittestSuite) ...
+2020-08-26 10:23:30,960 - INFO: Delete OVS network bridge
+2020-08-26 10:23:31,123 - INFO: Done
+ok
+test 004: Deleting network bridge LAN  (__main__.UnittestSuite) ...
+2020-08-26 10:23:31,156 - INFO: Delete OVS network bridge
+2020-08-26 10:23:31,381 - INFO: Done
+ok
+test 005: Deleting VNF management bridge  (__main__.UnittestSuite) ...
+2020-08-26 10:23:31,412 - INFO: Delete OVS network bridge
+2020-08-26 10:23:31,596 - INFO: Done
+ok
+test 006: Deleting ibm(In Band Management) bridge  (__main__.UnittestSuite) ...
+2020-08-26 10:23:31,621 - INFO: Delete OVS network bridge
+2020-08-26 10:23:47,980 - INFO: Done
+ok
+test 007: Unbind LAN NIC from DPDK target (__main__.UnittestSuite) ...
+2020-08-26 10:23:48,019 - INFO: Unbind NIC
+2020-08-26 10:23:49,547 - INFO: Done
+ok
+test 008: Offboarding 128t VNF    (__main__.UnittestSuite) ...
+2020-08-26 10:23:49,575 - INFO: Offboard VNF
+2020-08-26 10:23:50,252 - INFO: Done
+ok
+test 009: Offboarding Fortigate VNF    (__main__.UnittestSuite) ...
+2020-08-26 10:23:50,295 - INFO: Offboard VNF
+2020-08-26 10:23:50,589 - INFO: Done
+ok
+
+----------------------------------------------------------------------
+Ran 9 tests in 21.326s
+
+OK</programlisting>
+  </section>
+</appendix>
\ No newline at end of file