X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog-be%2Fsrc%2Fmain%2Fresources%2Fimport%2Ftosca%2Fmodels%2Finit%2Facm%2Ftosca%2Fdata-types%2FdataTypes.yml;h=7cc808bdb3ea37aaf49a78472154ac0bbc744100;hb=27633293d6d45521ea985019ea7b99c2009b62c7;hp=b8791796979fcd08bb6724a1849c1754a824d3ad;hpb=1913ab4377e68b1215d4422fc0448c023211d739;p=sdc.git

diff --git a/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/data-types/dataTypes.yml
index b879179697..7cc808bdb3 100644
--- a/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/data-types/dataTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/models/init/acm/tosca/data-types/dataTypes.yml
@@ -26,6 +26,8 @@ scalar-unit.time:
   derived_from: scalar-unit
 scalar-unit.frequency:
   derived_from: scalar-unit
+scalar-unit.bitrate:
+  derived_from: scalar-unit
 onap.datatypes.ToscaConceptIdentifier:
   derived_from: tosca.datatypes.Root
   properties:
@@ -147,7 +149,6 @@ onap.datatype.acm.Operation:
       required: false
       default: final_failure_guard
 onap.datatypes.monitoring.managedObjectDNsBasic:
-  constraints: []
   properties:
     DN:
       name: DN
@@ -155,14 +156,10 @@ onap.datatypes.monitoring.managedObjectDNsBasic:
       typeVersion: 0.0.0
       description: Managed object distinguished name
       required: true
-      constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.managedObjectDNsBasic
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 onap.datatypes.monitoring.managedObjectDNsBasics:
-  constraints: []
   properties:
     managedObjectDNsBasic:
       name: managedObjectDNsBasic
@@ -170,18 +167,13 @@ onap.datatypes.monitoring.managedObjectDNsBasics:
       typeVersion: 0.0.0
       description: Managed object distinguished name object
       required: true
-      constraints: []
       entry_schema:
         type: onap.datatypes.monitoring.managedObjectDNsBasic
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.managedObjectDNsBasics
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 onap.datatypes.monitoring.measurementGroup:
-  constraints: []
   properties:
     measurementTypes:
       name: measurementTypes
@@ -189,30 +181,22 @@ onap.datatypes.monitoring.measurementGroup:
       typeVersion: 0.0.0
       description: List of measurement types
       required: true
-      constraints: []
       entry_schema:
         type: onap.datatypes.monitoring.measurementTypes
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
     managedObjectDNsBasic:
       name: managedObjectDNsBasic
       type: list
       typeVersion: 0.0.0
       description: List of managed object distinguished names
       required: true
-      constraints: []
       entry_schema:
         type: onap.datatypes.monitoring.managedObjectDNsBasics
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.measurementGroup
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 onap.datatypes.monitoring.measurementGroups:
-  constraints: []
   properties:
     measurementGroup:
       name: measurementGroup
@@ -220,18 +204,13 @@ onap.datatypes.monitoring.measurementGroups:
       typeVersion: 0.0.0
       description: Measurement Group
       required: true
-      constraints: []
       entry_schema:
         type: onap.datatypes.monitoring.measurementGroup
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.measurementGroups
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 onap.datatypes.monitoring.measurementType:
-  constraints: []
   properties:
     measurementType:
       name: measurementType
@@ -239,14 +218,10 @@ onap.datatypes.monitoring.measurementType:
       typeVersion: 0.0.0
       description: Measurement type
       required: true
-      constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.measurementType
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 onap.datatypes.monitoring.measurementTypes:
-  constraints: []
   properties:
     measurementType:
       name: measurementType
@@ -254,18 +229,13 @@ onap.datatypes.monitoring.measurementTypes:
       typeVersion: 0.0.0
       description: Measurement type object
       required: true
-      constraints: []
       entry_schema:
         type: onap.datatypes.monitoring.measurementType
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.measurementTypes
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 onap.datatypes.monitoring.nfFilter:
-  constraints: []
   properties:
     modelNames:
       name: modelNames
@@ -273,54 +243,40 @@ onap.datatypes.monitoring.nfFilter:
       typeVersion: 0.0.0
       description: List of model names
       required: true
-      constraints: []
       entry_schema:
         type: string
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
     modelInvariantIDs:
       name: modelInvariantIDs
       type: list
       typeVersion: 0.0.0
       description: List of model invariant IDs
       required: true
-      constraints: []
       entry_schema:
         type: string
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
     modelVersionIDs:
       name: modelVersionIDs
       type: list
       typeVersion: 0.0.0
       description: List of model version IDs
       required: true
-      constraints: []
       entry_schema:
         type: string
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
     nfNames:
       name: nfNames
       type: list
       typeVersion: 0.0.0
       description: List of network functions
       required: true
-      constraints: []
       entry_schema:
         type: string
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.nfFilter
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 onap.datatypes.monitoring.subscription:
-  constraints: []
   properties:
     measurementGroups:
       name: measurementGroups
@@ -328,36 +284,27 @@ onap.datatypes.monitoring.subscription:
       typeVersion: 0.0.0
       description: Measurement Groups
       required: true
-      constraints: []
       entry_schema:
         type: onap.datatypes.monitoring.measurementGroups
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
     fileBasedGP:
       name: fileBasedGP
       type: integer
       typeVersion: 0.0.0
       description: File based granularity period
       required: true
-      constraints: []
-      metadata: {}
     fileLocation:
       name: fileLocation
       type: string
       typeVersion: 0.0.0
       description: ROP file location
       required: true
-      constraints: []
-      metadata: {}
     subscriptionName:
       name: subscriptionName
       type: string
       typeVersion: 0.0.0
       description: Name of the subscription
       required: true
-      constraints: []
-      metadata: {}
     administrativeState:
       name: administrativeState
       type: string
@@ -368,23 +315,18 @@ onap.datatypes.monitoring.subscription:
         - valid_values:
             - LOCKED
             - UNLOCKED
-      metadata: {}
     nfFilter:
       name: nfFilter
       type: map
       typeVersion: 0.0.0
       description: Network function filter
       required: true
-      constraints: []
       entry_schema:
         type: onap.datatypes.monitoring.nfFilter
         typeVersion: 0.0.0
-        constraints: []
-      metadata: {}
   name: onap.datatypes.monitoring.subscription
   version: 0.0.0
   derived_from: tosca.datatypes.Root
-  metadata: {}
 org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest:
   version: 1.0.0
   derived_from: tosca.datatypes.Root
@@ -415,7 +357,6 @@ org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
     expectedResponse:
       type: integer
       required: true
-      constraints: []
       description: THe expected HTTP status code for the REST request
 org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.ConfigurationEntity:
   version: 1.0.0
@@ -432,5 +373,22 @@ org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.Configurati
       entry_schema:
         type: org.onap.datatypes.policy.clamp.acm.httpAutomationCompositionElement.RestRequest
         typeVersion: 1.0.0
-        constraints: []
       description: A sequence of REST commands to send to the REST endpoint
+
+tosca.dataTypes.tmf.milestoneJeopardyData:
+  derived_from: tosca.datatypes.Root
+  properties:
+    name:
+      type: string
+      required: true
+    message:
+      type: string
+      required: true
+    eventType:
+      type: string
+      required: true
+      valid_values: [milestone, jeopardy]
+    jeopardyType:
+      type: string
+      required: false
+      valid_values: [normal, critical, hazard]