Updated Component Spec for PM Mapper

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

3 files changed, 73 insertions, 47 deletions

diff --git a/dpo/spec/dmaap.json b/dpo/spec/dmaap.json
index 74ac06c..1830723 100644
--- a/dpo/spec/dmaap.json
+++ b/dpo/spec/dmaap.json
@@ -4,10 +4,10 @@
     "aaf_password": "password",
     "type": "message_router",
     "dmaap_info": {
-      "client_role": "ves-publisher",
-      "client_id": "ves-pub-1",
-      "location": "location",
-      "topic_url": "http://message-router.onap.svc.cluster.local:3904/events/pm-mapper-ves"
+      "client_role": "org.onap.dmaap.mr.PM_MAPPER.pub",
+      "client_id": "dcae@dcae.onap.org",
+      "location": "san-francisco",
+      "topic_url": "https://message-router:3905//events/org.onap.dmaap.mr.PM_MAPPER"
     }
   },
   "pm_mapper_subscribe_dr": {
@@ -15,9 +15,9 @@
     "dmaap_info": {
       "username": "username",
       "password": "password",
-      "location": "location",
-      "delivery_url": "/delivery",
-      "subscriber_id": ""
+      "location": "san-francisco",
+      "delivery_url": "https://dcae-pm-mapper:8443/delivery",
+      "subscriber_id": "1"
     }
   }
 }
\ No newline at end of file
diff --git a/dpo/spec/pmmapper-component-spec.json b/dpo/spec/pmmapper-component-spec.json
index 2c8eadb..de2c7e8 100644
--- a/dpo/spec/pmmapper-component-spec.json
+++ b/dpo/spec/pmmapper-component-spec.json
@@ -1,7 +1,7 @@
 {
   "self": {
     "name": "dcaegen2.services.pm-mapper",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "description": "Docker application to map bulk PM files to VES events",
     "component_type": "docker"
   },
@@ -30,19 +30,41 @@
   },
   "auxilary": {
     "healthcheck": {
-      "type": "http",
-      "interval": "30s",
+      "type": "https",
+      "interval": "15s",
       "timeout": "10s",
       "endpoint": "/healthcheck"
     },
     "policy": {
       "trigger_type": "docker",
       "script_path": "/opt/app/reconfigure.sh"
-    }
+    },
+    "volumes": [
+      {
+        "container": {
+          "bind": "/opt/app/pm-mapper/etc/cert/"
+        },
+        "host": {
+          "path": "/opt/app/pm-mapper/etc/cert/"
+        }
+      },
+      {
+        "container": {
+          "bind": "/var/log/ONAP/dcaegen2/services/pm-mapper"
+        },
+        "host": {
+          "path": "/var/log/ONAP/dcaegen2/services/pm-mapper"
+        }
+      }
+    ],
+    "ports": [
+      "8443:0",
+      "8001:0"
+    ]
   },
   "artifacts": [
     {
-      "uri": "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper:1.0-SNAPSHOT",
+      "uri": "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper:latest",
       "type": "docker image"
     }
   ],
@@ -58,51 +80,63 @@
       "required": true
     },
     {
-      "name": "buscontroller_feed_subscription_endpoint",
-      "value": "http://dmaap-bc.onap.svc.cluster.local:8080/webapi/dr_subs",
-      "description": "DMAAP Bus Controller subscription endpoint",
+      "name": "enable_http",
+      "value": "true",
+      "description": "Option to turn on HTTP connections",
       "designer_editable": true,
       "sourced_at_deployment": false,
-      "policy_editable": true,
+      "policy_editable": false,
       "type": "string",
       "required": true
     },
     {
-      "name": "dmaap_dr_feed_id",
-      "value": "bulk_pm_feed",
-      "description": "ID of the data router feed that the PM Mapper will subscribe to",
-      "designer_editable": true,
+      "name": "trust_store_path",
+      "value": "/opt/app/pm-mapper/etc/cert/trust.jks.b64",
+      "description": "Points to private key store file",
       "sourced_at_deployment": false,
-      "policy_editable": true,
-      "type": "string",
-      "required": true
+      "policy_editable": false,
+      "designer_editable": false
+    },
+    {
+      "name": "trust_store_pass_path",
+      "value": "/opt/app/pm-mapper/etc/cert/trust.pass",
+      "description": "File which contains password for the key store",
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "designer_editable": false
+    },
+    {
+      "name": "key_store_path",
+      "value": "/opt/app/pm-mapper/etc/cert/cert.jks.b64",
+      "description": "Points to trust store file which contains trusted client certificates and/or CAs",
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "designer_editable": false
+    },
+    {
+      "name": "key_store_pass_path",
+      "value": "/opt/app/pm-mapper/etc/cert/jks.pass",
+      "description": "File which contains password for the trust store",
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "designer_editable": false
     },
     {
       "name": "dmaap_dr_delete_endpoint",
-      "value": "http://dmaap-dr-node.onap.svc.cluster.local:8443/delete",
+      "value": "https://dmaap-dr-node:8443/delete",
       "description": "DMAAP Data Router endpoint to delete file",
       "designer_editable": true,
       "sourced_at_deployment": false,
-      "policy_editable": true,
+      "policy_editable": false,
       "type": "string",
       "required": true
     },
     {
-      "name": "filter",
+      "name": "pm-mapper-filter",
       "value": "{ \"filters\":[]}",
       "description": "PM mapper filter on measInfo, measInfoId, measType, instanceId",
       "designer_editable": true,
       "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "policy",
-      "value": "",
-      "description": "PM Mapper policy JSON string",
-      "designer_editable": false,
-      "sourced_at_deployment": false,
       "policy_editable": true,
       "type": "string",
       "required": true
diff --git a/dpo/tosca_models/policy.yaml b/dpo/tosca_models/policy.yaml
index ec29b82..f11a50f 100644
--- a/dpo/tosca_models/policy.yaml
+++ b/dpo/tosca_models/policy.yaml
@@ -18,15 +18,7 @@ node_types:
   policy.nodes.dcaegen2.services.pm-mapper:
     derived_from: policy.nodes.Root
     properties:
-      buscontroller_feed_subscription_endpoint:
+      pm-mapper-filter:
         type: string
-        description: DMAAP Bus Controller subscription endpoint
-      dmaap_dr_delete_endpoint:
-        type: string
-        description: DMAAP Data Router endpoint to delete file
-      dmaap_dr_feed_id:
-        type: string
-        description: ID of the data router feed that the PM Mapper will subscribe to
-      policy:
-        type: string
-        description: PM Mapper policy JSON string
+        description: PM mapper filter on measInfo, measInfoId, measType, instanceId
+