Merge "dcae frankfurt maintenance rls updates"

7 files changed, 68 insertions, 13 deletions

diff --git a/docs/sections/apis/ves.rst b/docs/sections/apis/ves.rst
index 4ddd7b1d..35d4ebdb 100644
--- a/docs/sections/apis/ves.rst
+++ b/docs/sections/apis/ves.rst
@@ -28,14 +28,14 @@ onap-discuss@lists.onap.org
 Security
 ~~~~~~~~
 
-`VES Authentication Types <https://docs.onap.org/en/latest/submodules/dcaegen2.git/docs/sections/services/ves-http/tls-authentication.html>`_
+`VES Authentication Types <https://docs.onap.org/projects/onap-dcaegen2/en/latest/sections/services/ves-http/tls-authentication.html>`_
 
 
 VES Specification
 ~~~~~~~~~~~~~~~~~
 
-- `VES 7.1.1 Data Model <https://docs.onap.org/en/latest/submodules/vnfrqts/requirements.git/docs/Chapter8/ves7_1spec.html#common-event-format>`_
-- `VES 5.4 Data Model <https://docs.onap.org/en/latest/submodules/vnfrqts/requirements.git/docs/Chapter8/ves_5_4_1/VESEventListener.html#common-event-format>`_
+- `VES 7.1.1 Data Model <https://docs.onap.org/projects/onap-vnfrqts-requirements/en/latest/Chapter8/ves7_1spec.html#common-event-format>`_
+- `VES 5.4 Data Model <https://docs.onap.org/projects/onap-vnfrqts-requirements/en/latest/Chapter8/ves_5_4_1/VESEventListener.html#common-event-format>`_
 
 
 Response Code
diff --git a/docs/sections/configuration.rst b/docs/sections/configuration.rst
index b62a5406..d9bdae4d 100644
--- a/docs/sections/configuration.rst
+++ b/docs/sections/configuration.rst
@@ -47,7 +47,7 @@ In addition, for DCAE components deployed through Cloudify Manager blueprints, t
         * The blueprint input files may contain Helm templates, which are resolved into actual deployment time values following the rules for Helm values.
 
 
-DCAE Service components are deployed via Cloudify Blueprints. Instruction for deployment and configuration are documented under https://docs.onap.org/en/latest/submodules/dcaegen2.git/docs/sections/services/serviceindex.html
+DCAE Service components are deployed via Cloudify Blueprints. Instruction for deployment and configuration are documented under https://docs.onap.org/projects/onap-dcaegen2/en/latest/sections/services/serviceindex.html
 
 Now we walk through an example, how to configure the Docker image for the DCAE VESCollector, which is deployed by Cloudify Manager.
 
diff --git a/docs/sections/consumedapis.rst b/docs/sections/consumedapis.rst
index 637ac7b2..80e177e9 100644
--- a/docs/sections/consumedapis.rst
+++ b/docs/sections/consumedapis.rst
@@ -15,8 +15,9 @@ Consumed APIs
 
 DCAEGEN2 Components making following API calls into other ONAP components.
 
-* `DMaaP Message Router <https://docs.onap.org/en/latest/submodules/dmaap/messagerouter/messageservice.git/docs/offeredapis/offeredapis.html>`_
-* `DMaaP Data Router <https://docs.onap.org/en/latest/submodules/dmaap/datarouter.git/docs/offeredapis.html>`_
-* `Policy <https://docs.onap.org/en/latest/submodules/policy/engine.git/docs/platform/offeredapis.html>`_
-* `SDC <https://docs.onap.org/en/latest/submodules/sdc.git/docs/offeredapis.html>`_
-* `A&AI <https://docs.onap.org/en/latest/submodules/aai/aai-common.git/docs/platform/offeredapis.html>`_
\ No newline at end of file
+* `DMaaP Message Router <https://docs.onap.org/projects/onap-dmaap-messagerouter-messageservice/en/latest/offeredapis/offeredapis.html>`_
+* `DMaaP Data Router <https://docs.onap.org/projects/onap-dmaap-datarouter/en/latest/offeredapis.html>`_
+* `DMaaP Buscontroller <https://docs.onap.org/projects/onap-dmaap-dbcapi/en/latest/api.html#offeredapis>`_
+* `Policy <https://docs.onap.org/projects/onap-policy-engine/en/latest/platform/offeredapis.html>`_
+* `SDC <https://docs.onap.org/projects/onap-sdc/en/latest/offeredapis.html>`_
+* `A&AI <https://docs.onap.org/projects/onap-aai-aai-common/en/latest/platform/offeredapis.html>`_
\ No newline at end of file
diff --git a/docs/sections/design-components/requirements-guidelines.rst b/docs/sections/design-components/requirements-guidelines.rst
index f633178c..c887d4ff 100644
--- a/docs/sections/design-components/requirements-guidelines.rst
+++ b/docs/sections/design-components/requirements-guidelines.rst
@@ -227,7 +227,7 @@ DCAE SDK
 
 DCAE has SDK/libraries which can be used for service components for easy integration.
 
-- `Java Library <https://docs.onap.org/en/latest/submodules/dcaegen2.git/docs/sections/sdk/architecture.html>`__
+- `Java Library <https://docs.onap.org/projects/onap-dcaegen2/en/latest/sections/sdk/architecture.html>`__
 - `Python Modules <https://git.onap.org/dcaegen2/utils/tree/onap-dcae-cbs-docker-client>`__
 
 
diff --git a/docs/sections/release-notes.rst b/docs/sections/release-notes.rst
index 98279453..2a858a3a 100644
--- a/docs/sections/release-notes.rst
+++ b/docs/sections/release-notes.rst
@@ -13,6 +13,60 @@ DCAE Release Notes
     :depth: 2
 ..
 
+..      ======================================
+..      * * *    FRANKFURT  MAINTENANCE  * * *
+..      ======================================
+
+
+Version: 6.0.1
+==============
+
+Abstract
+========
+
+This document provides the release notes for the Frankfurt Maintenance release
+
+
+Summary
+=======
+
+The focus of this release is to correct issues found on Frankfurt release.
+
+Release Data
+============
+
++--------------------------------------+--------------------------------------+
+| **Project**                          | DCAE                                 |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
+| **Docker images**                    | onap/org.onap.dcaegen2.services.     |
+|                                      |   son-handler:2.0.4                  |
++--------------------------------------+--------------------------------------+
+| **Release designation**              | Frankfurt  Maintenance Release 1     |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
+| **Release date**                     | 2020/07/24                           |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
+
+New features
+------------
+
+None
+
+**Bug fixes**
+
+- `DCAEGEN2-2249 <https://jira.onap.org/browse/DCAEGEN2-2249>`_ SON-Handler: Fix networkId issue 
+while making call to oof
+- `DCAEGEN2-2216 <https://jira.onap.org/browse/DCAEGEN2-2216>`_ SON-Handler: Change Policy notification 
+ to align with policy component updates
+
+**Known Issues**
+Same as Frankfurt Release
+
+
+
+
 ..      ===========================
 ..      * * *    FRANKFURT    * * *
 ..      ===========================
diff --git a/docs/sections/services/dfc/certificates.rst b/docs/sections/services/dfc/certificates.rst
index b759e70c..2dc557b6 100644
--- a/docs/sections/services/dfc/certificates.rst
+++ b/docs/sections/services/dfc/certificates.rst
@@ -4,7 +4,7 @@ Certificates (From AAF)
 =======================
 DCAE service components will use common certifcates generated from AAF/test instance and made available during deployment of DCAE TLS init container.
 
-DCAE has a generalized process of certificate distribution as documented here - https://docs.onap.org/en/latest/submodules/dcaegen2.git/docs/sections/tls_enablement.html
+DCAE has a generalized process of certificate distribution as documented here - https://docs.onap.org/projects/onap-dcaegen2/en/latest/sections/tls_enablement.html
 
 The updated certificates are located in https://git.onap.org/dcaegen2/deployments/tree/tls-init-container/tls
 
diff --git a/docs/sections/services/son-handler/installation.rst b/docs/sections/services/son-handler/installation.rst
index 7e8affce..c8b73a89 100644
--- a/docs/sections/services/son-handler/installation.rst
+++ b/docs/sections/services/son-handler/installation.rst
@@ -56,10 +56,10 @@ Deployment Prerequisites
 Deployment steps
 ~~~~~~~~~~~~~~~~
 1.Using DCAE Dashboard
- - Login to DCAE Dashboard
+ - Login to DCAE Dashboard (https://{k8s-nodeip}:30418/ccsdk-app/login_external.htm)
  - Go to Inventory --> Blueprints
  - Click on Deploy Action for son-handler blueprint
- - Override the value of 'tag_version' to 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.son-handler:2.0.4' (latest version) and click deploy.
+ - Override the value of 'tag_version' to 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.son-handler:2.0.4' and click deploy.
  - Deployment logs can be viewed under Deployments section 
 
 2.Using cloudify commands