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

Change-Id: Ibc844e001b7d75125d6006fa5333cc65bbf5afa4

5 files changed, 157 insertions, 0 deletions

diff --git a/doc/book-enea-edge-auto-fw-th-open-source/doc/README b/doc/book-enea-edge-auto-fw-th-open-source/doc/README
new file mode 100644
index 0000000..a2c3d63
--- /dev/null
+++ b/doc/book-enea-edge-auto-fw-th-open-source/doc/README
@@ -0,0 +1,3 @@
+The licenses.xml in the git repository of Enea Edge AFTH Open Source Report
+is the frozen version belonging to the last official release of Enea Edge.
+
diff --git a/doc/book-enea-edge-auto-fw-th-open-source/doc/about.xml b/doc/book-enea-edge-auto-fw-th-open-source/doc/about.xml
new file mode 100644
index 0000000..24f674d
--- /dev/null
+++ b/doc/book-enea-edge-auto-fw-th-open-source/doc/about.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<chapter id="enea-linux-open-source-packages-and-licenses">
+  <title>About this Report</title>
+
+  <para>This document contains the open source and license information
+  pertaining to the Enea Edge Automation Framework and Test Harness provided with
+  Enea Edge <xi:include
+  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xpointer="element(EneaLinux_REL_VER/1)" />.</para>
+  
+</chapter>
diff --git a/doc/book-enea-edge-auto-fw-th-open-source/doc/book.xml b/doc/book-enea-edge-auto-fw-th-open-source/doc/book.xml
new file mode 100644
index 0000000..df5e029
--- /dev/null
+++ b/doc/book-enea-edge-auto-fw-th-open-source/doc/book.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
+]>
+<book id="book_enea_edge_auto_fw_th_open_source">
+  <title><trademark class="registered">Enea</trademark> Edge Automation Framework and Test Harness Open Source Report</title>
+  
+  <subtitle>Release Version
+         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
+         xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
+                 
+  <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
+  
+  <xi:include href="../../s_docbuild/template/docsrc_common/bookinfo_userdoc.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+  <xi:include href="about.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+  <xi:include href="licenses.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</book>
diff --git a/doc/book-enea-edge-auto-fw-th-open-source/doc/licenses.xml b/doc/book-enea-edge-auto-fw-th-open-source/doc/licenses.xml
new file mode 100644
index 0000000..397e2b8
--- /dev/null
+++ b/doc/book-enea-edge-auto-fw-th-open-source/doc/licenses.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<chapter id="enea_linux_packages">
+  <title>Packages and Licenses</title>
+
+  <section id="licenses_packages">
+    <title>Packages</title>
+
+    <!--This chapter contains only AFTH-->
+
+    <informaltable>
+      <tgroup cols="4">
+        <colspec colwidth="2*" />
+
+        <colspec colwidth="1*" />
+
+        <colspec colwidth="5*" />
+
+        <colspec colwidth="2*" />
+
+        <thead>
+          <row>
+            <entry align="center">Package Name</entry>
+
+            <entry align="center">Version</entry>
+
+            <entry align="center">Description</entry>
+
+            <entry align="center">License</entry>
+          </row>
+        </thead>
+
+        <tbody valign="top">
+          <row>
+            <entry>Enea Edge Automation Framework and Test Harness</entry>
+
+            <entry><xi:include
+            href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+            xmlns:xi="http://www.w3.org/2001/XInclude"
+            xpointer="element(EneaLinux_REL_VER/1)" /></entry>
+
+            <entry>Configuration and Automation Framework for the Enea Edge Management
+            GUI.</entry>
+
+            <entry>ENEA-SRC-R2</entry>
+          </row>
+
+          <row>
+            <entry>Enea Edge Automation Framework and Test Harness</entry>
+
+            <entry><xi:include
+            href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+            xmlns:xi="http://www.w3.org/2001/XInclude"
+            xpointer="element(EneaLinux_REL_VER/1)" /></entry>
+
+            <entry>Configuration and Automation Framework for the Enea Edge Management
+            GUI.</entry>
+
+            <entry>ENEA-EXAMPLE-R2</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
+  </section>
+
+  <section condition="hidden" id="open_source_license">
+    <title>Open Source Licenses</title>
+  </section>
+
+  <section id="proprietary_license">
+    <title>Proprietary Licenses</title>
+
+    <section id="lic_0">
+      <title>ENEA-SRC-R2</title>
+
+      <para><programlisting> Copyright (C) 2019 by Enea Software AB.
+ All rights reserved.
+
+ This Software is furnished under a software license agreement and
+ may be used only in accordance with the terms of such agreement.
+ Any other use or reproduction is prohibited. No title to and
+ ownership of the Software is hereby transferred.
+
+ PROPRIETARY NOTICE
+ This Software consists of confidential information.
+ Trade secret law and copyright law protect this Software.
+ The above notice of copyright on this Software does not indicate
+ any actual or intended publication of such Software.</programlisting></para>
+    </section>
+
+    <section id="lic_1">
+      <title>ENEA-EXAMPLE-R2</title>
+
+      <para><programlisting> Copyright (C) 2019 by Enea Software AB.
+ All rights reserved.
+
+ This Example is furnished under a Software License Agreement and
+ may be used only in accordance with the terms of such agreement.
+ No title to and ownership of the Example is hereby transferred.
+
+ The information in this Example is subject to change
+ without notice and should not be construed as a commitment
+ by Enea Software AB.
+
+ DISCLAIMER
+ This Example is delivered "AS IS", consequently
+ Enea Software AB makes no representations or warranties,
+ expressed or implied, for the Example.</programlisting></para>
+    </section>
+  </section>
+</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-edge-auto-fw-th-open-source/swcomp.mk b/doc/book-enea-edge-auto-fw-th-open-source/swcomp.mk
new file mode 100644
index 0000000..24463ac
--- /dev/null
+++ b/doc/book-enea-edge-auto-fw-th-open-source/swcomp.mk
@@ -0,0 +1,10 @@
+# Component build specification
+
+# Version of THIS book
+BOOK_VER ?= $(REL_VER)-dev
+
+DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
+
+BOOKPACKAGES := book-enea-edge-auto-fw-th-open-source
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge $(PROD_VER) Automation Framework and Test Harness Open Source Report"
+BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)