Update PM Mapper Data Type

*Update PM Mapper Data Type to include full filter schema

Issue-ID: DCAEGEN2-1605
Change-Id: I5aea43ddef798d14b445ee0ab4275370db08e011
Signed-off-by: dfarrelly <david.farrelly@est.tech>

diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
index 759bba4..e527b7a 100644 (file)
--- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
@@ -2264,9 +2264,36 @@ tosca.datatypes.nfv.SwImageData:
 onap.datatypes.monitoring.pm-mapper-filter:
   derived_from: tosca.datatypes.Root
   properties:
-    filter_configuration:
+    filters:
+      type: list
+      description: Filter configuration
+      default: []
+      required: true
+      entry_schema:
+        type: onap.datatypes.monitoring.filters
+
+onap.datatypes.monitoring.filters:
+  derived_from: tosca.datatypes.Root
+  properties:
+    pmDefVsn:
+      type: string
+      description: PM Dictionary version
+      required: true
+    nfType:
       type: string
-      description: Filter configuration needs to be applied
+      description: NF type
+      required: true
+    vendor:
+      type: string
+      description: Vendor name
+      required: true
+    measTypes:
+      type: list
+      description: Measurement types to collect
+      default: []
+      required: true
+      entry_schema:
+        type: string
 
 ### Data types used by Policy TCA model for closed loop ###