diff options
| -rw-r--r-- | dpo/spec/dmaap.json | 14 | ||||
| -rw-r--r-- | dpo/spec/pmmapper-component-spec.json | 104 | ||||
| -rw-r--r-- | dpo/tosca_models/policy.yaml | 34 | ||||
| -rw-r--r-- | pom.xml | 4 | ||||
| -rw-r--r-- | version.properties | 2 |
5 files changed, 99 insertions, 59 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..d88c71c 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", + "name": "dcae-pm-mapper", + "version": "1.1.0", "description": "Docker application to map bulk PM files to VES events", "component_type": "docker" }, @@ -30,26 +30,48 @@ }, "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" } ], "parameters": [ { "name": "service_name", - "value": "pm-mapper", + "value": "dcae-pm-mapper", "description": "Name of the service", "designer_editable": true, "sourced_at_deployment": false, @@ -58,54 +80,72 @@ "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, + "required": true, "policy_editable": true, - "type": "string", - "required": true + "policy_schema": [{ + "name": "filter configuration", + "description": "Filter configuration needs to be applied", + "type": "string", + "value": "" + }] } ] }
\ No newline at end of file diff --git a/dpo/tosca_models/policy.yaml b/dpo/tosca_models/policy.yaml index ec29b82..8b7f370 100644 --- a/dpo/tosca_models/policy.yaml +++ b/dpo/tosca_models/policy.yaml @@ -1,7 +1,13 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - policy.nodes.Root: - derived_from: tosca.nodes.Root +data_types: + onap.datatypes.monitoring.pm-mapper-filter: + properties: + filter configuration: + type: string + description: Filter configuration needs to be applied + +policy_types: + onap.policies.Monitoring: + derived_from: tosca.policies.Root properties: policyDescription: required: false @@ -15,18 +21,12 @@ 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: - buscontroller_feed_subscription_endpoint: - 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: + pm-mapper-filter: type: string - description: PM Mapper policy JSON string + description: PM mapper filter on measInfo, measInfoId, measType, instanceId + entry_schema: + type: onap.datatypes.monitoring.pm-mapper-filter
\ No newline at end of file @@ -26,12 +26,12 @@ <groupId>org.onap.dcaegen2.services</groupId> <artifactId>pm-mapper</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>1.2.0</version> + <version>2.0.0</version> </parent> <name>dcaegen2-services-pm-mapper</name> diff --git a/version.properties b/version.properties index 99f53cd..b304d19 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=1 minor=1 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT
\ No newline at end of file |