From 860e0a85019304218f7e9993f280b62c78db703e Mon Sep 17 00:00:00 2001 From: Vijay Venkatesh Kumar Date: Thu, 21 Oct 2021 16:10:57 -0400 Subject: VES Schema references updated to SA88-Rel16 Change-Id: If8f4cb6f1923c6ffe9c03222e3c12da9abf5d071 Signed-off-by: Vijay Venkatesh Kumar Issue-ID: DCAEGEN2-2895 Issue-ID: DCAEGEN2-2893 Issue-ID: DCAEGEN2-2894 Signed-off-by: Vijay Venkatesh Kumar --- docs/sections/release-notes.rst | 2 +- docs/sections/services/ves-http/installation-helm.rst | 13 ++++++++----- .../services/ves-http/stnd-defined-validation.rst | 18 +++++++++--------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/docs/sections/release-notes.rst b/docs/sections/release-notes.rst index 3c109a97..9df3ce73 100644 --- a/docs/sections/release-notes.rst +++ b/docs/sections/release-notes.rst @@ -204,7 +204,7 @@ Software Deliverables "dcaegen2/services/mapper", "", "onap/org.onap.dcaegen2.services.mapper.vesadapter.universalvesadaptor:1.3.0" "dcaegen2/services/pm-mapper", "", "onap/org.onap.dcaegen2.services.pm-mapper:1.7.2" "dcaegen2/services/prh", "", "onap/org.onap.dcaegen2.services.prh.prh-app-server:1.7.1" - "dcaegen2/services/son-handler", "", "onap/org.onap.dcaegen2.services.son-handler:2.1.4" + "dcaegen2/services/son-handler", "", "onap/org.onap.dcaegen2.services.son-handler:2.1.5" "dcaegen2/platform", "mod/bpgenerator", "Blueprint Generator 1.8.0 (jar)" "dcaegen2/services/sdk", "", "DCAE SDK 1.8.7 (jar)" "ccsdk/dashboard", "", "onap/org.onap.ccsdk.dashboard.ccsdk-app-os:1.4.4" diff --git a/docs/sections/services/ves-http/installation-helm.rst b/docs/sections/services/ves-http/installation-helm.rst index d97cd1c6..d5f6bdd6 100644 --- a/docs/sections/services/ves-http/installation-helm.rst +++ b/docs/sections/services/ves-http/installation-helm.rst @@ -52,11 +52,14 @@ For VES Collector: .. _external-repo-schema-via-helm: External repository schema files integration with VES Collector -------------------------------------------------------------------- +--------------------------------------------------------------- In order to utilize the externalRepo openAPI schema files defined in `OOM `_ repository and installed with dcaegen2 module, follow below steps. -.. note:: - For more information on generating schema files, see `External-schema-repo-generator (OOM Utils repository) `_ +.. note:: + For more information on generating schema files, see `External-schema-repo-generator (OOM Utils repository) `_ + + Default ONAP deployment for Istanbul release makes available the SA88-Rel16 OpenAPI schema files; optionally SA99-Rel16 files can be loaded using the `Generator script `_ based on the steps documented in `README `_ + 1. Go to directory with dcaegen2-services helm charts (oom/kubernetes/dcaegen2-services). These charts should be located on RKE deployer node or server which is used to deploy and manage ONAP installation by Helm charts. 2. Create file with specific VES values-overrides: @@ -84,9 +87,9 @@ E.g: type: configmap mountPath: /opt/app/VESCollector/etc/externalRepo optional: true - - name: 'dev-dcae-external-repo-configmap-sa91-rel16' + - name: 'dev-dcae-external-repo-configmap-sa88-rel16' type: configmap - mountPath: /opt/app/VESCollector/etc/externalRepo/3gpp/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI + mountPath: /opt/app/VESCollector/etc/externalRepo/3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI optional: true If more than a single external schema is required add new config map to object 'externalVolumes' like in above example. Make sure that all external schemas (all openAPI files) are reflected in the schema-map file. diff --git a/docs/sections/services/ves-http/stnd-defined-validation.rst b/docs/sections/services/ves-http/stnd-defined-validation.rst index 576b60fc..9e6f2992 100644 --- a/docs/sections/services/ves-http/stnd-defined-validation.rst +++ b/docs/sections/services/ves-http/stnd-defined-validation.rst @@ -48,20 +48,20 @@ Format of the schema mapping file is a JSON file with list of mappings, as shown [ { - "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/faultMnS.yaml", - "localURL": "3gpp/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/faultMnS.yaml" + "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml", + "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml" }, { - "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/FileDataReportingMnS.yaml", - "localURL": "3gpp/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/FileDataReportingMnS.yaml" + "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/heartbeatNtf.yaml", + "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/heartbeatNtf.yaml" }, { - "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/heartbeatNtf.yaml", - "localURL": "3gpp/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/heartbeatNtf.yaml" + "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/PerDataFileReportMnS.yaml", + "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/PerDataFileReportMnS.yaml" }, { - "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/provMnS.yaml", - "localURL": "3gpp/rep/sa5/MnS/blob/Rel-16-SA-91/OpenAPI/provMnS.yaml" + "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/provMnS.yaml", + "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/provMnS.yaml" } ] @@ -76,7 +76,7 @@ The mapping and schema files content can be changed by editing a proper config m +==============================================+=====================================================================================================+ | dcae-external-repo-configmap-schema-map | Defines a content of the /opt/app/VESCollector/etc/externalRepo/schema-map.json file. | +----------------------------------------------+-----------------------------------------------------------------------------------------------------+ -| dcae-external-repo-configmap-sa91-rel16 | Defines a content of schemas stored in the /opt/app/VESCollector/etc/externalRepo folder. | +| dcae-external-repo-configmap-sa88-rel16 | Defines a content of schemas stored in the /opt/app/VESCollector/etc/externalRepo folder. | +----------------------------------------------+-----------------------------------------------------------------------------------------------------+ Config maps are defined in the `OOM `_ repository -- cgit 1.2.3-korg