9 files changed, 187 insertions, 127 deletions
diff --git a/docs/sections/architecture.rst b/docs/sections/architecture.rst
index 3c8094e2..31164d62 100644
--- a/docs/sections/architecture.rst
+++ b/docs/sections/architecture.rst
@@ -41,6 +41,7 @@ The following lists the components included in ONAP DCAE .  All DCAE components
         - Policy Handler: Handler for fetching policy updates from Policy engine; and updating the configuration policies of KV entries in Consul cluster KV store for DCAE components.
         - Service Change Handler: Handler for interfacing with SDC; receiving new TOSCA models; and storing them in DCAE's own inventory.
         - DCAE Inventory-API: API for DCAE's TOSCA model store.
+        - VES OpenApi Manager: Optional validator of VES_EVENT type artifacts executed during Service distributions.
     - Platform services
         - Consul: Distributed service discovery service and KV store.
         - Postgres Database: DCAE's TOSCA model store.
@@ -71,7 +72,11 @@ The following lists the components included in ONAP DCAE .  All DCAE components
 
 The figure below shows the DCAE architecture and how the components work with each other.  The components on the right constitute the Platform/controller components which are statically deployed. The components on the right represent the services which can be both deployed statically or dynamically (via CLAMP)
 
-.. image:: images/R7_architecture diagram.png
+..
+  The following diagram has been created on https://app.diagrams.net/. There is an editable version of the diagram
+  in repository under path docs/sections/images/architecture_diagram. Import this file to mentioned page to edit diagram.
+
+.. image:: images/R8_architecture_diagram.png
  
 
 Deployment Scenarios
diff --git a/docs/sections/images/R8_architecture_diagram.png b/docs/sections/images/R8_architecture_diagram.png
new file mode 100644
index 00000000..94235253
--- /dev/null
+++ b/docs/sections/images/R8_architecture_diagram.png
diff --git a/docs/sections/images/architecture_diagram b/docs/sections/images/architecture_diagram
new file mode 100644
index 00000000..4ab70d75
--- /dev/null
+++ b/docs/sections/images/architecture_diagram
@@ -0,0 +1 @@
+<mxfile host="app.diagrams.net" modified="2021-02-16T01:21:18.194Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.141 Safari/537.36" etag="fBCrF5w--oVR_YudS1rJ" version="14.3.2" type="device"><diagram id="tDj8KXzGa5euc6s5cB2h" name="Page-1">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</diagram></mxfile>
+\ No newline at end of file
diff --git a/docs/sections/sdk/apis.rst b/docs/sections/sdk/apis.rst
index ebd9a6d2..8f20a0ab 100644
--- a/docs/sections/sdk/apis.rst
+++ b/docs/sections/sdk/apis.rst
@@ -255,6 +255,42 @@ Retry functionality works for:
  - DMaaP MR HTTP response status codes: 404, 408, 413, 429, 500, 502, 503, 504
  - Java Exception classes: ReadTimeoutException, ConnectException
 
+**************************************
+Configure custom persistent connection
+**************************************
+
+* publisher:
+
+.. code-block:: java
+
+       final MessageRouterPublisherConfig connectionPoolConfiguration = ImmutableMessageRouterPublisherConfig.builder()
+                 .connectionPoolConfig(ImmutableDmaapConnectionPoolConfig.builder()
+                        .connectionPool(16)
+                        .maxIdleTime(10) //in seconds
+                        .maxLifeTime(20) //in seconds
+                        .build())
+                .build();
+       final MessageRouterPublisher publisher = DmaapClientFactory.createMessageRouterPublisher(connectionPoolConfiguration);
+
+* subscriber:
+
+.. code-block:: java
+
+    final MessageRouterSubscriberConfig connectionPoolConfiguration = ImmutableMessageRouterSubscriberConfig.builder()
+                    .connectionPoolConfig(ImmutableDmaapConnectionPoolConfig.builder()
+                        .connectionPool(16)
+                        .maxIdleTime(10) //in seconds
+                        .maxLifeTime(20) //in seconds
+                        .build())
+                .build();
+    final MessageRouterSubscriber subscriber = DmaapClientFactory.createMessageRouterSubscriber(connectionPoolConfiguration);
+
+The default custom persistent connection configuration (connectionPool=16, maxLifeTime=2147483647, maxIdleTime=2147483647) can be used:
+
+.. code-block:: java
+
+    ImmutableDmaapConnectionPoolConfig.builder().build()
+
 hvvesclient-producer - a reference Java implementation of High Volume VES Collector client
 ------------------------------------------------------------------------------------------
 This library is used in xNF simulator which helps us test HV VES Collector in CSIT tests. You may use it as a reference when implementing your code in non-JVM language or directly when using Java/Kotlin/etc.
diff --git a/docs/sections/sdk/changelog.rst b/docs/sections/sdk/changelog.rst
index 31027c5e..16628783 100644
--- a/docs/sections/sdk/changelog.rst
+++ b/docs/sections/sdk/changelog.rst
@@ -1,125 +1,5 @@
 Changelog
 =========
-
-**1.6.0-SNAPSHOT**
-    - Add configurable timeout in dmaap-client
-    - Add configurable retry mechanism in dmaap-client
-
-**1.5.0-SNAPSHOT**
-    - Update spring boot to version: 2.4.0
-    - Update reactor to version: 2020.0.1
-    - Update testcontainers to version: 1.15.0
-
-**1.4.4-SNAPSHOT**
-    - Fix CbsClientFactory to allow retry on Mono from createCbsClient
-
-**1.4.3-SNAPSHOT**
-    - Change parameters of external-schema-manager to JSON notation
-
-**1.4.2-SNAPSHOT**
-    - Update spring boot to version: 2.3.3.RELEASE
-
-**1.4.1-SNAPSHOT**
-    - Update spring boot to version: 2.2.9.RELEASE
-    - Update testcontainers version:  1.14.3
-    - Fix deprecation warnings
-
-**1.4.0-SNAPSHOT**
-    - Add new component external-schema-manager for json validation with schema stored in local cache
-
-**1.3.5-SNAPSHOT**
-    - Create jar without dependencies for crypt-password module
-
-**1.3.4-SNAPSHOT**
-    - Usage of Java 11
-
-**1.3.3-SNAPSHOT**
-    - Upgrade CBS to support SSL
-    - Fix static code vulnerabilities
-    - Exclude IT from tests
-    - Remove AAI client from SDK
-
-**1.3.2-SNAPSHOT**
-    - Restructure AAI client
-
-    - Get rid of common-dependency module
-    - Rearrange files in packages inside rest-services
-
-**1.3.1-SNAPSHOT**
-    - Bugfix release: AAI client
-        - Make AaiGetServiceInstanceClient build correct path to the service resource in AAI
-
-**1.3.0-SNAPSHOT (ElAlto - under development)**
-    - All El-Alto work noted under 1.2.0-SNAPSHOT will roll into this version
-    - Version update was done for tracking global-jjb migration work and corresponding submission - https://gerrit.onap.org/r/#/c/dcaegen2/services/sdk/+/89902/
-
-**1.2.0-SNAPSHOT (replaced by 1.3.0)**
-    - WARNING: This is a work in progress. Do not use unless you know what you are doing!
-
-    - DMaaP client
-        - Change the factory so it's more configurable
-        - Old DMaaP client is now deprecated
-        - Integration tests are now using TestContainers with an actual DMaaP in order to confirm compatibility with a particular DMaaP version.
-        - Breaking change: MessageRouterSubscribeResponse now contains list of JsonElement instead of JsonArray
-    - CBS client
-        - Use new, simplified CBS lookup method
-        - Breaking change: CbsClientConfiguration replaces old EnvProperties. This way the class reflects overall SDK naming convention.
-    - Crypt Password
-        - Additional command line usage options (read password from stdin)
-        - Enhanced test coverage
-    - Internals/others
-        - Remove CloudHttpClient and use RxHttpClient instead which should unify REST API consumption across client libraries
-    - Moher (MOnitoring and HEalthcheck Rest API)
-        - This API is in incubation stage. Do not use it yet.
-        - Initial PoC for new module which should help when implementing these features in a DCAE service
-        - Expose Prometheus-compliant monitoring endpoint
-
-**1.1.6**
-    - Bugfix release: (Old) DMaaP client:
-        - Security keys was always loaded from JAR instead of given file system path. Only code using SecurityKeysUtil class had been affected. If you do not use SecurityKeysUtil class or you are using the new DMaaP MR client API (org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.{api, model} packages) then you are safe and the update is not required.
-
-**1.1.5**
-    - DMaaP client
-        - Force non-chunked transfer encoding, because DMaaP MR does not support chunks.
-        - DMaaP MR client API should be used in new code. Some minor incompatible changes can occur but it's more or less done.
-
-**1.1.4**
-    - Config Binding Service client
-        - predefined parsers for input and output streams
-            - remove the need for a DCAE application to manually interpret streams_publishes (Sinks) and streams_subscribes (Sources) parts of the configuration
-            - available parsers for DMaaP Message Router and DMaaP Data Router streams
-            - experimental support for Kafka streams
-        - support for other CBS endpoints besides get-configuration: get-by-key, get-all (introduces minor but breaking changes)
-    - DMaaP client
-        - New, experimental DMaaP client. It's not ready for use yet (not integration tested with DMaaP instance). However, you can use this API if you target El Alto release (note that some minor interface changes might be introduced).
-    - Internals:
-        - Improved http client: RxHttpClient
-        - RxHttpClient uses chunked transfer-encoding only when content-length is NOT specified.
-
-Migration guide
-
-All CbsClient methods gets CbsRequest as a first parameter instead of RequestDiagnosticContext. The CbsRequest may be created by calling CbsRequests factory methods. For existing code to work you will need to do the following change:
-
-.. code-block:: java
-
-    // From this:
-    CbsClientFactory.createCbsClient(env)
-        .flatMap(cbsClient -> cbsClient.get(diagnosticContext))
-        ...
-
-    // To this:
-    final CbsRequest request = CbsRequests.getConfiguration(diagnosticContext);
-    CbsClientFactory.createCbsClient(env)
-        .flatMap(cbsClient -> cbsClient.get(request))
-        ...
-
-
-The similar changes will be required for other CbsClient methods (periodic get and periodic updates).
-
-**1.1.3 (initial release)**
-    - Config Binding Service client
-        - basic functionality
-        - CBS service discovery
-        - get application configuration as JsonObject
-        - periodic query + periodic updates query
-    - BCrypt password utility
+Link to gerrit changelog:
+-------------------------
+https://gerrit.onap.org/r/gitweb?p=dcaegen2/services/sdk.git;a=blob_plain;f=Changelog.md;hb=refs/heads/master
+\ No newline at end of file
diff --git a/docs/sections/services/dfc/architecture.rst b/docs/sections/services/dfc/architecture.rst
index cbd1876d..75913dbb 100644
--- a/docs/sections/services/dfc/architecture.rst
+++ b/docs/sections/services/dfc/architecture.rst
@@ -30,7 +30,11 @@ Interaction
 """""""""""
 DFC will interact with the DMaaP Message Router, using json, and with the Data Router, using metadata in the header and
 file in the body, via secured protocol.
-So far, the implemented protocols to communicate with xNFs are http (with basic authentication), sftp and ftpes.
+So far, the implemented protocols to communicate with xNFs are http, https, sftp and ftpes.
+When HTTP protocol protocol is used, following ways of authentication are supported: basic authentication and bearer token
+(e.g. JWT) authentication.
+When HTTPS protocol protocol is used, following ways of authentication are supported: client certificate authentication,
+basic authentication, bearer token (e.g. JWT) authentication and no authentication.
 
 Retry mechanism
 """""""""""""""
diff --git a/docs/sections/services/dfc/http-notes.rst b/docs/sections/services/dfc/http-notes.rst
index bd297b14..c45c7bd8 100644
--- a/docs/sections/services/dfc/http-notes.rst
+++ b/docs/sections/services/dfc/http-notes.rst
@@ -1,8 +1,8 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 
-HTTP notes
-==========
+HTTP/HTTPS notes
+================
 
 HTTP Basic Authentication in FileReady messages
 """""""""""""""""""""""""""""""""""""""""""""""
@@ -61,3 +61,74 @@ Example file ready message is as follows:
 
 Note, more than one file from the same location can be added to the "arrayOfNamedHashMap". If so, they are downloaded
 from the endpoint through single http connection.
+
+HTTPS connection with DFC
+"""""""""""""""""""""""""
+The file ready message for https server is the same as used in other protocols and http. The only difference is that the scheme is set to
+"https":
+
+.. code-block:: bash
+
+   ...
+   "arrayOfNamedHashMap": [
+           {
+             "name": "C_28532_measData_file.xml",
+             "hashMap": {
+               "location": "https://login:password@server.com:443/file.xml.gz",
+   ...
+
+The processed uri depends on the https connection type that has to be established (client certificate authentication, basic
+authentication, and no authentication).
+
+For client certificate authentication:
+
+.. code-block:: bash
+
+   scheme://host:port/path
+   i.e.
+   https://example.com:443/C20200502.1830+0200-20200502.1845+0200_195500.xml.gz
+
+Authentication is based on the certificate used by the DFC.
+
+For basic authentication:
+
+.. code-block:: bash
+
+   scheme://userinfo@host:port/path
+   i.e.
+   https://demo:demo123456!@example.com:443/C20200502.1830+0200-20200502.1845+0200_195500.xml.gz
+
+Authentication is based on the "userinfo" applied within the link.
+
+If no authentication is required:
+
+.. code-block:: bash
+
+   scheme://host:port/path
+   i.e.
+   https://example.com:443/C20200502.1830+0200-20200502.1845+0200_195500.xml.gz
+
+Note, effective way of authentication depends of uri provided and http server configuration.
+
+If port number was not supplied , port 443 is used by default.
+Every file is sent through separate https connection.
+
+JWT token in HTTP/HTTPS connection
+""""""""""""""""""""""""""""""""""
+
+JWT token is processed, if it is provided as a ``access_token`` in the query part of the **location** entry:
+
+.. code-block:: bash
+
+   scheme://host:port/path?access_token=<token>
+   i.e.
+   https://example.com:443/C20200502.1830+0200-20200502.1845+0200_195500.xml.gz?access_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJkZW1vIiwiaWF0IjoxNTE2MjM5MDIyfQ.MWyG1QSymi-RtG6pkiYrXD93ZY9NJzaPI-wS4MEpUto
+
+JWT tokens are consumed both in HTTP and HTTPS connections. Using JWT token is optional. If it is provided, its
+**validity is not verified**. Token is extracted to the HTTP header as ``Authorization: Bearer <token>`` and is **NOT**
+used in URL in HTTP GET call. Only single JWT token entry in the query is acceptable. If more than one ''access_token''
+entry is found in the query, such situation is reported as error and DFC tries to download file without token. Another
+query parameters are not modified at all and are used in URL in HTTP GET call.
+
+If both JWT token and basic authentication are provided, JWT token has the priority. Such situation is considered
+as fault and is logged on warning level.
diff --git a/docs/sections/services/dfc/troubleshooting.rst b/docs/sections/services/dfc/troubleshooting.rst
index 96816228..680bf1ff 100644
--- a/docs/sections/services/dfc/troubleshooting.rst
+++ b/docs/sections/services/dfc/troubleshooting.rst
@@ -167,3 +167,28 @@ When StrictHostKeyChecking is enabled and DFC cannot find a known_hosts file, th
     |WARN     |StrictHostKeyChecking is enabled but environment variable KNOWN_HOSTS_FILE_PATH is not set or points to not existing file [/home/datafile/.ssh/known_hosts]  -->  falling back to StrictHostKeyChecking='no'.  
 
 To resolve this warning, provide a known_hosts file or disable StrictHostKeyChecking, see DFC config page - :ref:`strict_host_checking_config`.
+
+Inability to download file from xNF due to certificate problem
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+When collecting files using HTTPS and DFC contains certs from CMPv2 server, an exception like "unable to find valid
+certification path to requested target" may occur. Except obvious certificates problems make sure, that xNF which
+are connecting to the DFC are supplied with certificates coming from the same CMPv2 server and the same CA which
+is configured on ONAP side and used by DFC.
+
+Inability to properly run DFC (v1.5.3 and above)
+""""""""""""""""""""""""""""""""""""""""""""""""
+
+Note, since DFC 1.5.3 FTPeS/HTTPS config blueprint was slighly changed.
+
+.. code-block:: json
+
+    "dmaap.ftpesConfig.*"
+
+was changed with
+
+.. code-block:: json
+
+    "dmaap.certificateConfig.*"
+
+Container update without updating DFC config (or blueprint) will result in inability to run DFC with FTPeS and HTTPS.
diff --git a/docs/sections/services/pm-mapper/configuration.rst b/docs/sections/services/pm-mapper/configuration.rst
index c699a35b..df7423a5 100644
--- a/docs/sections/services/pm-mapper/configuration.rst
+++ b/docs/sections/services/pm-mapper/configuration.rst
@@ -4,6 +4,44 @@
 Configuration and Performance
 =============================
 
+Files Processing Configuration
+""""""""""""""""""""""""""""""
+The PM Mapper consumes the 3GPP XML files from DMaaP-DR, and processes them. It is possible to process it in parallel.
+In order to parallel processing, new configuration env has been introduced:
+
+- PROCESSING_LIMIT_RATE (optional, default value: 1) - allows to limit the rate of processing files through channel.
+
+- THREADS_MULTIPLIER (optional, default value: 1) - allows to specify multiplier to calculate the amount of threads.
+
+- PROCESSING_THREADS_COUNT (optional, default value: number of threads available to JVM) - allows to specify number of threads that will be used for files processing.
+
+
+Envs should be specified in section "envs:" in blueprint. Example part of blueprint configuration:
+
+::
+
+        ...
+        pm-mapper:
+          type: dcae.nodes.ContainerizedServiceComponentUsingDmaap
+          interfaces:
+            cloudify.interfaces.lifecycle:
+              create:
+                inputs:
+                  ports:
+                    - '8443:0'
+                    - '8081:0'
+                  envs:
+                    PROCESSING_LIMIT_RATE: "1"
+                    THREADS_MULTIPLIER: "2"
+                    PROCESSING_THREADS_COUNT: "3"
+          relationships:
+            - type: dcaegen2.relationships.subscribe_to_files
+              target: pm-feed
+            - type: dcaegen2.relationships.publish_events
+              target: pm-topic
+        ...
+
+
 PM Mapper Filtering
 """""""""""""""""""
 The PM Mapper performs data reduction, by filtering the PM telemetry data it receives.