From: rajendrajaiswal <rajendra.jaiswal@ericsson.com>
Date: Fri, 28 Jun 2019 13:59:43 +0000 (+0100)
Subject: PM-Mapper Policy Model support
X-Git-Tag: 1.6.1~249
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=868746d27adc90efeba5909d3eb60a6e0cd24c27;p=sdc.git

PM-Mapper Policy Model support

Change-Id: I3603c4a5b05b0dc528b0dd57eabea8947f9e8fbb
Issue-ID: SDC-2104
Signed-off-by: rajendrajaiswal <rajendra.jaiswal@ericsson.com>
---

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 85591fa2bf..0514799902 100644
--- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
@@ -2259,6 +2259,15 @@ tosca.datatypes.nfv.SwImageData:
       entry_schema:
         type: string
 
+### Data types used by Policy PM Mapper for closed loop ###
+
+onap.datatypes.monitoring.pm-mapper-filter:
+  derived_from: tosca.datatypes.Root
+  properties:
+    filter_configuration:
+      type: string
+      description: Filter configuration needs to be applied
+
 ### Data types used by Policy TCA model for closed loop ###
 
 onap.datatypes.monitoring.metricsPerEventName:
diff --git a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.json b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.json
index 6885e5076c..e483e36bef 100644
--- a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.json
+++ b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.json
@@ -55,6 +55,10 @@
     "displayName": "TCA",
     "icon": "policy-tca"
   },
+  "onap.policy.monitoring.dcae-pm-mapper": {
+    "displayName": "PM Mapper",
+    "icon": "policy-dcae-pm-mapper"
+  },
   "tosca.policies.nfv.InstantiationLevels": {
     "displayName": "NFV InstantiationLevels",
     "icon": "policy-nfv-instantiationlevels"
diff --git a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.yml b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.yml
index 4cc9031eed..b6f158fc06 100644
--- a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.yml
@@ -130,6 +130,18 @@ onap.policies.monitoring.cdap.tca.hi.lo.app:
       entry_schema:
         type: onap.datatypes.monitoring.tca_policy
 
+## PM Mapper policies for closed loop ##
+
+onap.policy.monitoring.dcae-pm-mapper:
+  derived_from: onap.policies.Monitoring
+  version : 1.0.0
+  properties:
+    pm-mapper-filter:
+      type: map
+      description: PM mapper filter on measInfo, measInfoId, measType, instanceId
+      entry_schema:
+        type: onap.datatypes.monitoring.pm-mapper-filter
+
 ## NFV policies ##
 tosca.policies.nfv.InstantiationLevels:
   derived_from: tosca.policies.Root