diff options
| -rw-r--r-- | INFO.yaml | 36 | ||||
| -rw-r--r-- | docs/sections/services/pm-subscription-handler/configuration.rst | 37 | ||||
| -rw-r--r-- | docs/sections/tls_enablement.rst | 2 |
3 files changed, 48 insertions, 27 deletions
@@ -2,7 +2,7 @@ project: 'dcaegen2' project_creation_date: '2017-06-28' project_category: '' -lifecycle_state: 'Incubation' +lifecycle_state: 'Mature' project_lead: &onap_dcaegen2_ptl name: 'Vijay Venkatesh Kumar' email: 'vv770d@att.com' @@ -31,26 +31,31 @@ repositories: - 'dcaegen2' committers: - <<: *onap_dcaegen2_ptl - - name: 'Lusheng Ji' - email: 'lji@research.att.com' - company: 'ATT' - id: 'wrider' - timezone: 'America/New_York' - name: 'Tony Hansen' email: 'tony@att.com' company: 'ATT' id: 'TonyLHansen' timezone: 'America/New_York' - - name: 'Jack Lucas' - email: 'jflucas@research.att.com' - company: 'ATT' - id: 'jackl' - timezone: 'America/New_York' - name: 'Joseph O Leary' email: 'joseph.o.leary@est.tech' company: 'EST' id: 'JoeOLeary' timezone: 'Ireland/UTC' + - name: 'Kornel Janiak' + email: 'kornel.janiak@nokia.com' + company: 'Nokia' + id: 'kjaniak' + timezone: 'Europe/Warsaw' + - name: 'Jack Lucas' + email: 'jflos@sonoris.net' + company: 'IC' + id: 'jackl' + timezone: 'America/New_York' + - name: 'Remigiusz Janeczek' + email: 'remigiusz.janeczek@nokia.com' + company: 'Nokia' + id: 'rjanecze' + timezone: 'Europe/Warsaw' tsc: approval: 'https://lists.onap.org/pipermail/onap-tsc' changes: @@ -66,3 +71,12 @@ tsc: - type: 'Removal' name: 'Xinhui Li' link: 'https://lists.onap.org/g/onap-tsc/message/6814' + - type: 'Addition' + name: 'Kornel Janiak' + link: 'https://lists.onap.org/g/onap-tsc/message/7026' + - type: 'Removal' + name: 'Lusheng Ji' + link: 'https://lists.onap.org/g/onap-tsc/message/7026' + - type: 'Addition' + name: 'Remigiusz Janeczek' + link: 'https://lists.onap.org/g/onap-tsc/message/7026' diff --git a/docs/sections/services/pm-subscription-handler/configuration.rst b/docs/sections/services/pm-subscription-handler/configuration.rst index 83d9cfd8..1cd6eee0 100644 --- a/docs/sections/services/pm-subscription-handler/configuration.rst +++ b/docs/sections/services/pm-subscription-handler/configuration.rst @@ -127,30 +127,35 @@ The subscription is configured within the monitoring policy. The subscription mo **nfFilter** -The ``nfFilter`` will be used in order to filter the list of NF's retrieved from A&AI. It will filter on the names -specified in the ``nfNames`` field, which can also contain regex as seen below. +The ``nfFilter`` will be used in order to filter the list of NF's retrieved from A&AI. There are three criteria that +can be filtered on, nfNames, modelInvariantIDs and/or modelVersionIDs. All 3 of these are optional fields but at +least 1 must be present for the filter to work. :: "nfFilter": { - "swVersions": [ - "1.0.0", - "1.0.1" + "nfNames":[ + "^pnf.*", + "^vnf.*" ], - "nfNames": [ - "ABC", - "DEF", - "foo.*" + "modelInvariantIDs": [ + "5845y423-g654-6fju-po78-8n53154532k6", + "7129e420-d396-4efb-af02-6b83499b12f8" + ], + "modelVersionIDs": [ + "e80a6ae3-cafd-4d24-850d-e14c084a5ca9" ] } -+------------+-----------------------------------------------------------------------------+------+----------+ -| Field | Description | Type | Required | -+============+=============================================================================+======+==========+ -| swVersions | List of software versions. | list | True | -+------------+-----------------------------------------------------------------------------+------+----------+ -| nfNames | List of NF names. These names are regexes, which will be parsed by the PMSH.| list | True | -+------------+-----------------------------------------------------------------------------+------+----------+ ++------------------------+-----------------------------------------------------------------------------------------------+------+----------+ +| Field | Description | Type | Required | ++========================+===============================================================================================+======+==========+ +| nfNames | List of NF names. These names are regexes, which will be parsed by the PMSH. | list | False | ++------------------------+-----------------------------------------------------------------------------------------------+------+----------+ +| modelInvariantIDs | List of modelInvariantIDs. These UUIDs will be checked for exact matches with AAI entities. | list | False | ++------------------------+-----------------------------------------------------------------------------------------------+------+----------+ +| modelVersionIDs | List of modelVersionIDs. These IDs will be checked for exact matches with AAI entities. | list | False | ++------------------------+-----------------------------------------------------------------------------------------------+------+----------+ **measurementGroup** diff --git a/docs/sections/tls_enablement.rst b/docs/sections/tls_enablement.rst index 3eb23007..0407d4e9 100644 --- a/docs/sections/tls_enablement.rst +++ b/docs/sections/tls_enablement.rst @@ -119,6 +119,8 @@ External TLS support was introduced in order to integrate DCAE with CertService This external TLS support doesn't influence ONAP internal traffic which is protected by certificates issued by AAF's CertMan. External TLS Support was introduced in k8splugin 3.1.0. +From k8splugin 3.4.1 when external TLS is enabled (use_external_tls=true), keystore contains only certificate from CMPv2 server. Keystore issued by CertMan has appended .bak extension and is not used. + 1. Certificate setup: To create certificate artifacts, AAF CertService must obtain the certificate details. Common name and list of Subject Alternative Names (SANs) are set in blueprint as described in step 3. |