Policy Model and Component Spec update

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

diff --git a/dpo/spec/pmmapper-component-spec.json b/dpo/spec/pmmapper-component-spec.json
index de2c7e8..53dbd8c 100644 (file)
--- a/dpo/spec/pmmapper-component-spec.json
+++ b/dpo/spec/pmmapper-component-spec.json
@@ -1,6 +1,6 @@
 {
   "self": {
-    "name": "dcaegen2.services.pm-mapper",
+    "name": "dcae-pm-mapper",
     "version": "1.1.0",
     "description": "Docker application to map bulk PM files to VES events",
     "component_type": "docker"
@@ -71,7 +71,7 @@
   "parameters": [
     {
       "name": "service_name",
-      "value": "pm-mapper",
+      "value": "dcae-pm-mapper",
       "description": "Name of the service",
       "designer_editable": true,
       "sourced_at_deployment": false,

diff --git a/dpo/tosca_models/policy.yaml b/dpo/tosca_models/policy.yaml
index f11a50f..349d7f5 100644 (file)
--- a/dpo/tosca_models/policy.yaml
+++ b/dpo/tosca_models/policy.yaml
@@ -1,7 +1,6 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-node_types:
-  policy.nodes.Root:
-    derived_from: tosca.nodes.Root
+policy_types:
+  onap.policies.Monitoring:
+    derived_from: tosca.policies.Root
     properties:
       policyDescription:
         required: false
@@ -15,8 +14,9 @@ node_types:
       policyVersion:
         required: true
         type: string
-  policy.nodes.dcaegen2.services.pm-mapper:
-    derived_from: policy.nodes.Root
+  onap.policy.monitoring.dcae-pm-mapper:
+    derived_from: onap.policies.Monitoring
+    version : 1.0.0
     properties:
       pm-mapper-filter:
         type: string