From: dfarrelly <david.farrelly@est.tech>
Date: Thu, 13 Feb 2020 13:23:57 +0000 (+0000)
Subject: Update PMSH Data Types
X-Git-Tag: 1.6.3~29
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6aa132644dd4ee66423bd9752cc12d213e509dfe;p=sdc.git

Update PMSH Data Types

*Update PMSH Data Types to support multiple measurementGroups

Issue-ID: DCAEGEN2-1940
Change-Id: Iba6f8c0d88490a554de2b5e079508a3882aa14b8
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 6d3c1a600b..a07ddc1da1 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
@@ -2330,12 +2330,12 @@ onap.datatypes.monitoring.subscription:
       required: true
       entry_schema:
         type: onap.datatypes.monitoring.nfFilter
-    measurementGroup:
-      type: map
-      description: Measurement Group
+    measurementGroups:
+      type: list
+      description: Measurement Groups
       required: true
       entry_schema:
-        type: onap.datatypes.monitoring.MeasurementGroup
+        type: onap.datatypes.monitoring.measurementGroups
 
 onap.datatypes.monitoring.nfFilter:
   derived_from: tosca.datatypes.Root
@@ -2355,6 +2355,16 @@ onap.datatypes.monitoring.nfFilter:
       entry_schema:
         type: string
 
+onap.datatypes.monitoring.measurementGroups:
+  derived_from: tosca.datatypes.Root
+  properties:
+    measurementGroup:
+      type: map
+      description: Measurement Group
+      required: true
+      entry_schema:
+        type: onap.datatypes.monitoring.measurementGroup
+
 onap.datatypes.monitoring.MeasurementGroup:
   derived_from: tosca.datatypes.Root
   properties: