From: dfarrelly <david.farrelly@est.tech>
Date: Mon, 2 Dec 2019 09:32:14 +0000 (+0000)
Subject: Add PMSH Models
X-Git-Tag: 1.6.1~33
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a941f3fa78dc1c19ef895e164037cfd6ee98f7ae;p=sdc.git

Add PMSH Models

*Add PM Subscription Handler monitoring policy

Issue-ID: DCAEGEN2-1940
Change-Id: I82bd1d8d686365e124cd7b4438de583215e9fc0a
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 3e90362166..6d3c1a600b 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
@@ -2295,6 +2295,120 @@ onap.datatypes.monitoring.filters:
       entry_schema:
         type: string
 
+### Data types used by Policy PM Subscription Handler for closed loop ###
+
+onap.datatypes.monitoring.subscription:
+  derived_from: tosca.datatypes.Root
+  properties:
+    subscriptionName:
+      type: string
+      description: Name of the subscription
+      required: true
+    administrativeState:
+      type: string
+      description: State of the subscription
+      required: true
+      constraints:
+        - valid_values:
+            - LOCKED
+            - UNLOCKED
+    fileBasedGP:
+      type: integer
+      description: File based granularity period
+      required: true
+    fileLocation:
+      type: string
+      description: ROP file location
+      required: true
+    nfTypeModelInvariantId:
+      type: string
+      description: Network function invariant ID
+      required: true
+    nfFilter:
+      type: map
+      description: Network function filter
+      required: true
+      entry_schema:
+        type: onap.datatypes.monitoring.nfFilter
+    measurementGroup:
+      type: map
+      description: Measurement Group
+      required: true
+      entry_schema:
+        type: onap.datatypes.monitoring.MeasurementGroup
+
+onap.datatypes.monitoring.nfFilter:
+  derived_from: tosca.datatypes.Root
+  properties:
+    nfNames:
+      type: list
+      description: List of network functions
+      required: true
+      default: []
+      entry_schema:
+        type: string
+    swVersions:
+      type: list
+      description: List of software versions
+      required: true
+      default: []
+      entry_schema:
+        type: string
+
+onap.datatypes.monitoring.MeasurementGroup:
+  derived_from: tosca.datatypes.Root
+  properties:
+    measurementTypes:
+      type: list
+      description: List of measurement types
+      required: true
+      default: []
+      entry_schema:
+        type: onap.datatypes.monitoring.measurementTypes
+    managedObjectDNsBasic:
+      type: list
+      description: List of managed object distinguished names
+      required: true
+      default: []
+      entry_schema:
+        type: onap.datatypes.monitoring.managedObjectDNSBasics
+
+onap.datatypes.monitoring.measurementTypes:
+  derived_from: tosca.datatypes.Root
+  properties:
+    measurementType:
+      type: map
+      description: Measurement type object
+      required: true
+      entry_schema:
+        type: onap.dataypes.monitoring.measurementType
+
+onap.datatypes.monitoring.measurementType:
+  derived_from: tosca.datatypes.Root
+  properties:
+    measurementType:
+      type: string
+      description: Measurement type
+      required: true
+
+onap.datatypes.monitoring.managedObjectDNsBasics:
+  derived_from: tosca.datatypes.Root
+  properties:
+    managedObjectDNsBasic:
+      type: map
+      description: Managed object distinguished name object
+      required: true
+      entry_schema:
+        type: onap.dataypes.monitoring.managedObjectDNsBasic
+
+onap.datatypes.monitoring.managedObjectDNsBasic:
+  derived_from: tosca.datatypes.Root
+  properties:
+    DN:
+      type: string
+      description: Managed object distinguished name
+      required: true
+
 ### Data types used by Policy TCA model for closed loop ###
 
 onap.datatypes.monitoring.metricsPerEventName:
@@ -2330,6 +2444,7 @@ onap.datatypes.monitoring.metricsPerEventName:
         type: onap.datatypes.monitoring.thresholds
       required: true
       type: list
+
 onap.datatypes.monitoring.tca_policy:
   derived_from: tosca.datatypes.Root
   properties:
@@ -2346,6 +2461,7 @@ onap.datatypes.monitoring.tca_policy:
         type: onap.datatypes.monitoring.metricsPerEventName
       required: true
       type: list
+
 onap.datatypes.monitoring.thresholds:
   derived_from: tosca.datatypes.Root
   properties:
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 981eee6533..fea0f2fa55 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
@@ -59,6 +59,10 @@
     "displayName": "PM Mapper",
     "icon": "policy-dcae-pm-mapper"
   },
+  "onap.policies.monitoring.dcae-pm-subscription-handler": {
+    "displayName": "PM Subscription Handler",
+    "icon": "policy-dcae-pm-subscription-handler"
+  },
   "onap.policies.monitoring.dcae-restconfcollector": {
     "displayName": "Restconf Collector",
     "icon": "policy-dcae-restconfcollector"
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 65d19d7820..c896e3aa63 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
@@ -142,6 +142,18 @@ onap.policies.monitoring.dcae-pm-mapper:
       entry_schema:
         type: onap.datatypes.monitoring.pm-mapper-filter
 
+## PM Subscription Handler policy for closed loop ##
+
+onap.policies.monitoring.dcae-pm-subscription-handler:
+  derived_from: onap.policies.Monitoring
+  version : 1.0.0
+  properties:
+    subscription:
+      type: map
+      description: PM Subscription Handler Subscription
+      entry_schema:
+        type: onap.datatypes.monitoring.subscription
+
 ## Restconf collector policy for closed loop ##
 
 onap.policies.monitoring.dcae-restconfcollector: