[PMSH] Add enhanced filtering to config spec

Issue-ID: DCAEGEN2-2404

Signed-off-by: egernug <gerard.nugent@est.tech>
Change-Id: Id6c3dd6656bb4e061cd38974e65bd088394733a6

diff --git a/docs/sections/services/pm-subscription-handler/configuration.rst b/docs/sections/services/pm-subscription-handler/configuration.rst
index 83d9cfd..1cd6eee 100644 (file)
--- 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**