Merge "Modify third party proxy to test the SUBMIT"
authorSébastien Determe <sd378r@intl.att.com>
Wed, 21 Mar 2018 14:17:52 +0000 (14:17 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 21 Mar 2018 14:17:52 +0000 (14:17 +0000)
49 files changed:
extra/docker/elk/.env [new file with mode: 0644]
extra/docker/elk/README.md [new file with mode: 0644]
extra/docker/elk/docker-compose.yml [new file with mode: 0644]
extra/docker/elk/es_backup/default.json [new file with mode: 0644]
extra/docker/elk/logstash-conf/logstash.conf [new file with mode: 0644]
extra/docker/elk/tools/DMaaPServiceMocker/ds_mocker.py [new file with mode: 0755]
extra/docker/elk/tools/DMaaPServiceMocker/event_abated.json [new file with mode: 0644]
extra/docker/elk/tools/DMaaPServiceMocker/event_onset.json [new file with mode: 0644]
extra/docker/elk/tools/DMaaPServiceMocker/notification_active.json [new file with mode: 0644]
extra/docker/elk/tools/DMaaPServiceMocker/notification_final_failed.json [new file with mode: 0644]
extra/docker/elk/tools/DMaaPServiceMocker/notification_final_open.json [new file with mode: 0644]
extra/docker/elk/tools/DMaaPServiceMocker/notification_final_success.json [new file with mode: 0644]
extra/docker/elk/tools/DMaaPServiceMocker/notification_operation.json [new file with mode: 0644]
extra/docker/elk/tools/DMaaPServiceMocker/notification_operation_failure.json [new file with mode: 0644]
extra/docker/elk/tools/DMaaPServiceMocker/notification_operation_success.json [new file with mode: 0644]
extra/docker/elk/tools/DMaaPServiceMocker/notification_rejected_disabled.json [new file with mode: 0644]
extra/docker/elk/tools/DMaaPServiceMocker/notification_rejected_missing.json [new file with mode: 0644]
extra/docker/elk/tools/EsAutoQuery/autoQueryLoop.sh [new file with mode: 0755]
extra/docker/elk/tools/EsAutoQuery/closedLoopAlarmDuration.json [new file with mode: 0644]
extra/docker/elk/tools/EsAutoQuery/timeSince.json [new file with mode: 0644]
src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserFilesConfiguration.java [new file with mode: 0644]
src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserMappingConfiguration.java [new file with mode: 0644]
src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleController.java [new file with mode: 0644]
src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandler.java
src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstaller.java [new file with mode: 0644]
src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstallerImpl.java [new file with mode: 0644]
src/main/java/org/onap/clamp/clds/service/CldsService.java
src/main/java/org/onap/clamp/clds/service/CldsTemplateService.java
src/main/resources/META-INF/resources/designer/css/jquery.dataTables_themeroller.css [deleted file]
src/main/resources/META-INF/resources/designer/css/plugins/dataTables.bootstrap.css [deleted file]
src/main/resources/META-INF/resources/designer/index.html
src/main/resources/application.properties
src/main/resources/clds/blueprint-parser-mapping.json [new file with mode: 0644]
src/main/resources/clds/templates/bpmn/holmes-img.xml [new file with mode: 0644]
src/main/resources/clds/templates/bpmn/holmes-template.xml [new file with mode: 0644]
src/main/resources/clds/templates/bpmn/tca-img.xml [new file with mode: 0644]
src/main/resources/clds/templates/bpmn/tca-template.xml [new file with mode: 0644]
src/test/java/org/onap/clamp/clds/it/CldsTemplateServiceItCase.java
src/test/java/org/onap/clamp/clds/it/sdc/controller/installer/CsarInstallerItCase.java [new file with mode: 0644]
src/test/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandlerTest.java
src/test/resources/application.properties
src/test/resources/clds/blueprint-parser-mapping.json [new file with mode: 0644]
src/test/resources/clds/templates/bpmn/holmes-img.xml [new file with mode: 0644]
src/test/resources/clds/templates/bpmn/holmes-template.xml [new file with mode: 0644]
src/test/resources/clds/templates/bpmn/tca-img.xml [new file with mode: 0644]
src/test/resources/clds/templates/bpmn/tca-template.xml [new file with mode: 0644]
src/test/resources/example/sdc/blueprint-dcae/holmes.yaml [new file with mode: 0644]
src/test/resources/example/sdc/blueprint-dcae/not-recognized.yaml [new file with mode: 0644]
src/test/resources/example/sdc/blueprint-dcae/tca.yaml [new file with mode: 0644]

diff --git a/extra/docker/elk/.env b/extra/docker/elk/.env
new file mode 100644 (file)
index 0000000..4f1781d
--- /dev/null
@@ -0,0 +1,13 @@
+# docker compose related
+COMPOSE_PROJECT_NAME=clamp_elk
+
+# dmaap configuration for logstash
+dmaap_base_url=http://localhost:3904/
+dmaap_user=user
+dmaap_password=password
+dmaap_consumer_group=CG42
+dmaap_consumer_id=C42
+
+event_topic=EVENT_TOPIC
+notification_topic=NOTIFICATION_TOPIC
+request_topic=REQUEST_TOPIC
diff --git a/extra/docker/elk/README.md b/extra/docker/elk/README.md
new file mode 100644 (file)
index 0000000..04c2439
--- /dev/null
@@ -0,0 +1,32 @@
+CLAMP Dashboard
+===============
+
+ELK stack for CLAMP : Logstash is used to retrieve events and notifications from DMaaP and pushes them into Elasticsearch.
+Kibana is then used to extract statistics.
+
+
+Deployment instructions
+-----------------------
+
+Requirements: docker-compose
+
+1. Update configuration in docker-compose file
+2. `docker-compose up -d logstash kibana`
+3. `docker-compose run default`  # loads the dashboard configuration for Kibana
+
+
+Tools
+-----
+
+The following tools are available in the 'tools/' folder.
+
+
+### EsAutoQuery
+
+Small script ease Elasticsearch /painless/ field development.
+It reads a json file as a query for Elasticsearch, pushes it on the ES server, and display back the answer in a loop, each time the file is modified.
+
+
+### DMaaP Service Mocker
+
+Script that simulates control loop DMaaP services to provide sample data to logstash through DMaaP.
diff --git a/extra/docker/elk/docker-compose.yml b/extra/docker/elk/docker-compose.yml
new file mode 100644 (file)
index 0000000..ded2c6b
--- /dev/null
@@ -0,0 +1,74 @@
+version: '3.1'
+
+services:
+  elasticsearch:
+    image: elasticsearch
+    ports:
+      - 9200:9200
+    networks:
+      es_net:
+        aliases:
+          - elasticsearch
+
+  logstash:
+    image: logstash
+    volumes:
+      - ./logstash-conf:/config-dir
+    command: logstash -f /config-dir/logstash.conf
+    depends_on:
+      - elasticsearch
+    networks:
+      es_net:
+    environment:
+
+  kibana:
+    image: kibana
+    ports:
+      - 5601:5601
+    depends_on:
+      - elasticsearch
+    networks:
+      es_net:
+
+  backup:
+    image: taskrabbit/elasticsearch-dump
+    depends_on:
+      - elasticsearch
+    command:
+      - --input=http://elasticsearch:9200/.kibana
+      - --output=/backups/backup.json
+      - --type=data
+    volumes:
+      - ./es_backup/:/backups/
+    networks:
+      es_net:
+
+  restore:
+    image: taskrabbit/elasticsearch-dump
+    depends_on:
+      - elasticsearch
+    command:
+      - --output=http://elasticsearch:9200/.kibana
+      - --input=/backups/backup.json
+      - --type=data
+    volumes:
+      - ./es_backup/:/backups/
+    networks:
+      es_net:
+
+  default:
+    image: taskrabbit/elasticsearch-dump
+    depends_on:
+      - elasticsearch
+    command:
+      - --output=http://elasticsearch:9200/.kibana
+      - --input=/backups/default.json
+      - --type=data
+    volumes:
+      - ./es_backup/:/backups/
+    networks:
+      es_net:
+
+
+networks:
+  es_net:
diff --git a/extra/docker/elk/es_backup/default.json b/extra/docker/elk/es_backup/default.json
new file mode 100644 (file)
index 0000000..135cad0
--- /dev/null
@@ -0,0 +1,14 @@
+{"_index":".kibana","_type":"visualization","_id":"AWI967sW8kHy-lwNJZrR","_score":1,"_source":{"title":"TotalEventDurationTable","visState":"{\"title\":\"TotalEventDurationTable\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\",\"type\":\"table\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"eventDuration\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"closedLoopControlName.keyword\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}","uiStateJSON":"{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}","description":"","savedSearchId":"AWIk9P-qDjJ4k3sPXRcQ","version":1,"kibanaSavedObjectMeta":{"searchSourceJSON":"{\"filter\":[]}"}}}
+{"_index":".kibana","_type":"visualization","_id":"AWI922pp8kHy-lwNJZrP","_score":1,"_source":{"title":"CLEventDurationTables","visState":"{\"title\":\"CLEventDurationTables\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\",\"type\":\"table\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"max\",\"schema\":\"metric\",\"params\":{\"field\":\"eventDuration\",\"customLabel\":\"Event Duration\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"split\",\"params\":{\"field\":\"closedLoopControlName.keyword\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"_term\",\"row\":true}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"requestID.keyword\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"_term\"}}],\"listeners\":{}}","uiStateJSON":"{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}","description":"","savedSearchId":"AWIk9P-qDjJ4k3sPXRcQ","version":1,"kibanaSavedObjectMeta":{"searchSourceJSON":"{\"filter\":[]}"}}}
+{"_index":".kibana","_type":"visualization","_id":"AWI91Rvl8kHy-lwNJZrN","_score":1,"_source":{"title":"AverageEventDurationTable","visState":"{\"title\":\"AverageEventDurationTable\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\",\"type\":\"table\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"avg\",\"schema\":\"metric\",\"params\":{\"field\":\"eventDuration\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"closedLoopControlName.keyword\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}","uiStateJSON":"{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}","description":"","savedSearchId":"AWIk9P-qDjJ4k3sPXRcQ","version":1,"kibanaSavedObjectMeta":{"searchSourceJSON":"{\"filter\":[]}"}}}
+{"_index":".kibana","_type":"index-pattern","_id":"AWIk7j2UDjJ4k3sPXRaY","_score":1,"_source":{"title":"logstash-*","timeFieldName":"closedLoopAlarmStart","notExpandable":true,"fields":"[{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"@version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.cloud-region.identity-url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.cloud-region.identity-url.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.complex.physical-location-id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.complex.physical-location-id.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.generic-vnf.service-id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.generic-vnf.service-id.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.generic-vnf.vnf-name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.generic-vnf.vnf-name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.tenant.tenant-id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.tenant.tenant-id.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.vserver.in-maint\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.vserver.in-maint.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.vserver.is-closed-loop-disabled\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.vserver.is-closed-loop-disabled.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.vserver.l-interface(network like '%oam%').l3-interface-ipv6-address-list.l3-inteface-ipv6-address\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.vserver.l-interface(network like '%oam%').l3-interface-ipv6-address-list.l3-inteface-ipv6-address.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.vserver.l-interface(nework like '%oam%').l3-interface-ipv4-address-list.l3-inteface-ipv4-address\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.vserver.l-interface(nework like '%oam%').l3-interface-ipv4-address-list.l3-inteface-ipv4-address.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.vserver.prov-status\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.vserver.prov-status.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.vserver.selflink\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.vserver.selflink.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.vserver.vserver-id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.vserver.vserver-id.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.vserver.vserver-name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.vserver.vserver-name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"OPS_CL_timer\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"closedLoopAlarmEnd\",\"type\":\"date\",\"count\":1,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"closedLoopAlarmStart\",\"type\":\"date\",\"count\":1,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"closedLoopControlName\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"closedLoopControlName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"closedLoopEventClient\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"closedLoopEventClient.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"closedLoopEventStatus\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"closedLoopEventStatus.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"from\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"from.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.latitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.longitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"history.actor\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"history.actor.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"history.end\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"history.operation\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"history.operation.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"history.start\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"history.subRequestId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"history.subRequestId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"history.target\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"history.target.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"notification\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"notification.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"notificationTime\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"notificationTime.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"policyName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"policyName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"policyScope\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"policyScope.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"policyVersion\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"policyVersion.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"requestID\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"requestID.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"target\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"target.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"target_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"target_type.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"triggerID\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"triggerID.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"triggerSourceName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"triggerSourceName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"version.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"eventDuration\",\"type\":\"number\",\"count\":0,\"scripted\":true,\"script\":\"if (doc.get('closedLoopEventStatus.keyword').value == 'ABATED') {                                                                                            \\n   return doc.get('closedLoopAlarmEnd').value- doc.get('closedLoopAlarmStart').value;                                                                        \\n}                                                                                                                                                            \\nreturn null\",\"lang\":\"painless\",\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false}]","fieldFormatMap":"{\"eventDuration\":{\"id\":\"duration\",\"params\":{\"inputFormat\":\"milliseconds\"}}}"}}
+{"_index":".kibana","_type":"config","_id":"5.6.7","_score":1,"_source":{"buildNum":15610,"defaultIndex":"AWIk7j2UDjJ4k3sPXRaY"}}
+{"_index":".kibana","_type":"search","_id":"AWIk8yDIDjJ4k3sPXRbu","_score":1,"_source":{"title":"ONSET","description":"","hits":0,"columns":["closedLoopAlarmStart","closedLoopAlarmEnd","closedLoopControlName","closedLoopEventStatus","notification"],"sort":["closedLoopAlarmStart","desc"],"version":1,"kibanaSavedObjectMeta":{"searchSourceJSON":"{\"index\":\"AWIk7j2UDjJ4k3sPXRaY\",\"highlightAll\":true,\"version\":true,\"query\":{\"match_all\":{}},\"filter\":[{\"meta\":{\"index\":\"AWIk7j2UDjJ4k3sPXRaY\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"closedLoopEventStatus.keyword\",\"value\":\"ONSET\"},\"query\":{\"match\":{\"closedLoopEventStatus.keyword\":{\"query\":\"ONSET\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"}}}
+{"_index":".kibana","_type":"search","_id":"AWIk9P-qDjJ4k3sPXRcQ","_score":1,"_source":{"title":"ABATED","description":"","hits":0,"columns":["closedLoopAlarmStart","closedLoopAlarmEnd","closedLoopControlName","closedLoopEventStatus","notification"],"sort":["closedLoopAlarmStart","desc"],"version":1,"kibanaSavedObjectMeta":{"searchSourceJSON":"{\"index\":\"AWIk7j2UDjJ4k3sPXRaY\",\"highlightAll\":true,\"version\":true,\"query\":{\"query_string\":{\"query\":\"closedLoopEventStatus: \\\"ABATED\\\"\",\"analyze_wildcard\":true}},\"filter\":[{\"meta\":{\"index\":\"AWIk7j2UDjJ4k3sPXRaY\",\"negate\":false,\"disabled\":false,\"alias\":\"ABATED\",\"type\":\"phrase\",\"key\":\"closedLoopEventStatus.keyword\",\"value\":\"ABATED\"},\"query\":{\"match\":{\"closedLoopEventStatus.keyword\":{\"query\":\"ABATED\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"index\":\"AWIk7j2UDjJ4k3sPXRaY\",\"negate\":false,\"disabled\":true,\"alias\":\"ONSET\",\"type\":\"phrase\",\"key\":\"closedLoopEventStatus.keyword\",\"value\":\"ONSET\"},\"query\":{\"match\":{\"closedLoopEventStatus.keyword\":{\"query\":\"ONSET\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"}}}
+{"_index":".kibana","_type":"visualization","_id":"AWIk-IFsDjJ4k3sPXRdD","_score":1,"_source":{"title":"ClosedLoopActivations","visState":"{\"title\":\"ClosedLoopActivations\",\"type\":\"metric\",\"params\":{\"addTooltip\":true,\"addLegend\":false,\"type\":\"gauge\",\"gauge\":{\"verticalSplit\":false,\"autoExtend\":false,\"percentageMode\":false,\"gaugeType\":\"Metric\",\"gaugeStyle\":\"Full\",\"backStyle\":\"Full\",\"orientation\":\"vertical\",\"colorSchema\":\"Green to Red\",\"gaugeColorMode\":\"None\",\"useRange\":false,\"colorsRange\":[{\"from\":0,\"to\":100}],\"invertColors\":false,\"labels\":{\"show\":true,\"color\":\"black\"},\"scale\":{\"show\":false,\"labels\":false,\"color\":\"#333\",\"width\":2},\"type\":\"simple\",\"style\":{\"fontSize\":60,\"bgColor\":false,\"labelColor\":false,\"subText\":\"\"}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"closedLoopControlName.keyword\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}","uiStateJSON":"{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"},\"legendOpen\":false},\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}","description":"","version":1,"kibanaSavedObjectMeta":{"searchSourceJSON":"{\"index\":\"AWIk7j2UDjJ4k3sPXRaY\",\"query\":{\"match_all\":{}},\"filter\":[{\"meta\":{\"index\":\"AWIk7j2UDjJ4k3sPXRaY\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"closedLoopEventStatus.keyword\",\"value\":\"ONSET\"},\"query\":{\"match\":{\"closedLoopEventStatus.keyword\":{\"query\":\"ONSET\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"}}}
+{"_index":".kibana","_type":"visualization","_id":"AWIk-5O-DjJ4k3sPXRd1","_score":1,"_source":{"title":"ClosedLoopActivationsTable","visState":"{\"title\":\"ClosedLoopActivationsTable\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":true,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\",\"type\":\"table\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"closedLoopControlName.keyword\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}","uiStateJSON":"{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}","description":"","savedSearchId":"AWIk8yDIDjJ4k3sPXRbu","version":1,"kibanaSavedObjectMeta":{"searchSourceJSON":"{\"filter\":[]}"}}}
+{"_index":".kibana","_type":"visualization","_id":"AWIk_VLEDjJ4k3sPXReS","_score":1,"_source":{"title":"SuccessfulRestartsTable","visState":"{\"title\":\"SuccessfulRestartsTable\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\",\"type\":\"table\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"closedLoopControlName.keyword\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}","uiStateJSON":"{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}","description":"","savedSearchId":"AWIk9P-qDjJ4k3sPXRcQ","version":1,"kibanaSavedObjectMeta":{"searchSourceJSON":"{\"filter\":[]}"}}}
+{"_index":".kibana","_type":"search","_id":"AWIlAjTaDjJ4k3sPXRe1","_score":1,"_source":{"title":"FAILURE NOTIFICATION","description":"","hits":0,"columns":["closedLoopAlarmStart","closedLoopAlarmEnd","closedLoopControlName","closedLoopEventStatus","notification"],"sort":["closedLoopAlarmStart","desc"],"version":1,"kibanaSavedObjectMeta":{"searchSourceJSON":"{\"index\":\"AWIk7j2UDjJ4k3sPXRaY\",\"highlightAll\":true,\"version\":true,\"query\":{\"match_all\":{}},\"filter\":[{\"$state\":{\"store\":\"appState\"},\"meta\":{\"alias\":\"ABATED\",\"disabled\":true,\"index\":\"AWIk7j2UDjJ4k3sPXRaY\",\"key\":\"closedLoopEventStatus.keyword\",\"negate\":false,\"type\":\"phrase\",\"value\":\"ABATED\"},\"query\":{\"match\":{\"closedLoopEventStatus.keyword\":{\"query\":\"ABATED\",\"type\":\"phrase\"}}}},{\"$state\":{\"store\":\"appState\"},\"meta\":{\"alias\":\"ONSET\",\"disabled\":true,\"index\":\"AWIk7j2UDjJ4k3sPXRaY\",\"key\":\"closedLoopEventStatus.keyword\",\"negate\":false,\"type\":\"phrase\",\"value\":\"ONSET\"},\"query\":{\"match\":{\"closedLoopEventStatus.keyword\":{\"query\":\"ONSET\",\"type\":\"phrase\"}}}},{\"$state\":{\"store\":\"appState\"},\"meta\":{\"alias\":\"FAILURE NOTIFICATION\",\"disabled\":false,\"index\":\"AWIk7j2UDjJ4k3sPXRaY\",\"key\":\"notification.keyword\",\"negate\":false,\"type\":\"phrase\",\"value\":\"FINAL: FAILURE\"},\"query\":{\"match\":{\"notification.keyword\":{\"query\":\"FINAL: FAILURE\",\"type\":\"phrase\"}}}}]}"}}}
+{"_index":".kibana","_type":"visualization","_id":"AWIlBLT7DjJ4k3sPXRe7","_score":1,"_source":{"title":"FailedRestartTable","visState":"{\"title\":\"FailedRestartTable\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showMeticsAtAllLevels\":false,\"showPartialRows\":false,\"showTotal\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"totalFunc\":\"sum\",\"type\":\"table\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"closedLoopControlName.keyword\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}","uiStateJSON":"{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}","description":"","savedSearchId":"AWIlAjTaDjJ4k3sPXRe1","version":1,"kibanaSavedObjectMeta":{"searchSourceJSON":"{\"filter\":[]}"}}}
+{"_index":".kibana","_type":"index-pattern","_id":"AWIqPamARYxwAnBQhbeU","_score":1,"_source":{"title":"logstash-*","timeFieldName":"@timestamp","notExpandable":true,"fields":"[{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"@version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.cloud-region.identity-url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.cloud-region.identity-url.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.complex.physical-location-id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.complex.physical-location-id.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.generic-vnf.service-id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.generic-vnf.service-id.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.generic-vnf.vnf-name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.generic-vnf.vnf-name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.tenant.tenant-id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.tenant.tenant-id.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.vserver.in-maint\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.vserver.in-maint.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.vserver.is-closed-loop-disabled\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.vserver.is-closed-loop-disabled.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.vserver.l-interface(network like '%oam%').l3-interface-ipv6-address-list.l3-inteface-ipv6-address\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.vserver.l-interface(network like '%oam%').l3-interface-ipv6-address-list.l3-inteface-ipv6-address.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.vserver.l-interface(nework like '%oam%').l3-interface-ipv4-address-list.l3-inteface-ipv4-address\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.vserver.l-interface(nework like '%oam%').l3-interface-ipv4-address-list.l3-inteface-ipv4-address.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.vserver.prov-status\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.vserver.prov-status.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.vserver.selflink\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.vserver.selflink.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.vserver.vserver-id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.vserver.vserver-id.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"AAI.vserver.vserver-name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"AAI.vserver.vserver-name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"OPS_CL_timer\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"closedLoopAlarmEnd\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"closedLoopAlarmStart\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"closedLoopControlName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"closedLoopControlName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"closedLoopEventClient\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"closedLoopEventClient.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"closedLoopEventStatus\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"closedLoopEventStatus.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"from\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"from.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.latitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.longitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"history.actor\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"history.actor.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"history.end\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"history.message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"history.message.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"history.operation\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"history.operation.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"history.outcome\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"history.outcome.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"history.start\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"history.subRequestId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"history.subRequestId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"history.target\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"history.target.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"notification\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"notification.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"notificationTime\",\"type\":\"date\",\"count\":1,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"policyName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"policyName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"policyScope\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"policyScope.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"policyVersion\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"policyVersion.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"requestID\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"requestID.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"target\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"target.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"target_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"target_type.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"triggerID\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"triggerID.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"triggerSourceName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"triggerSourceName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"version.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"When\",\"type\":\"number\",\"count\":1,\"scripted\":true,\"script\":\"long now = System.currentTimeMillis();                                                                                                                       \\nif (doc.get('closedLoopEventStatus.keyword').value == 'ABATED') {                                                                                            \\n   return now - doc.get('closedLoopAlarmEnd').value;                                                                                                         \\n}                                                                                                                                                            \\nif (doc.get('closedLoopEventStatus.keyword').value == 'ONSET') {                                                                                             \\n   return now - doc.get('closedLoopAlarmStart').value;                                                                                                       \\n}                                                                                                                                                            \\nif (doc.containsKey('notification.keyword')) {                                                                                                               \\n   return now - doc.get('notificationTime').value;                                                                                                           \\n}                                                                                                                                                            \\n                                                                                                                                                             \\nreturn null\",\"lang\":\"painless\",\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false}]","fieldFormatMap":"{\"When\":{\"id\":\"duration\",\"params\":{\"inputFormat\":\"milliseconds\"}}}"}}
+{"_index":".kibana","_type":"dashboard","_id":"AWI-9KyytmDBG_mksMZL","_score":1,"_source":{"title":"CLAMP Dashboard","hits":0,"description":"","panelsJSON":"[{\"size_x\":4,\"size_y\":3,\"panelIndex\":1,\"type\":\"visualization\",\"id\":\"AWIk_VLEDjJ4k3sPXReS\",\"col\":5,\"row\":1},{\"size_x\":4,\"size_y\":3,\"panelIndex\":2,\"type\":\"visualization\",\"id\":\"AWIlBLT7DjJ4k3sPXRe7\",\"col\":9,\"row\":1},{\"size_x\":6,\"size_y\":3,\"panelIndex\":3,\"type\":\"visualization\",\"id\":\"AWI967sW8kHy-lwNJZrR\",\"col\":1,\"row\":4},{\"size_x\":6,\"size_y\":3,\"panelIndex\":4,\"type\":\"visualization\",\"id\":\"AWI91Rvl8kHy-lwNJZrN\",\"col\":7,\"row\":4},{\"size_x\":4,\"size_y\":3,\"panelIndex\":5,\"type\":\"visualization\",\"id\":\"AWIk-IFsDjJ4k3sPXRdD\",\"col\":1,\"row\":1}]","optionsJSON":"{\"darkTheme\":false}","uiStateJSON":"{\"P-1\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-2\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-3\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-4\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}}","version":1,"timeRestore":false,"kibanaSavedObjectMeta":{"searchSourceJSON":"{\"filter\":[{\"query\":{\"match_all\":{}}}],\"highlightAll\":true,\"version\":true}"}}}
diff --git a/extra/docker/elk/logstash-conf/logstash.conf b/extra/docker/elk/logstash-conf/logstash.conf
new file mode 100644 (file)
index 0000000..2b5a24e
--- /dev/null
@@ -0,0 +1,99 @@
+input {
+  http_poller {
+        urls => {
+            event_queue => {
+                method => get
+                url => "${dmaap_base_url}/events/${event_topic}/${dmaap_consumer_group}/${dmaap_consumer_id}?timeout=15000"
+                headers => {
+                    Accept => "application/json"
+                }
+                add_field => { "topic" => "${event_topic}" }
+            }
+            notification_queue => {
+                method => get
+                url => "${dmaap_base_url}/events/${notification_topic}/${dmaap_consumer_group}/${dmaap_consumer_id}?timeout=15000"
+                headers => {
+                    Accept => "application/json"
+                }
+                add_field => { "topic" => "${notification_topic}" }
+            }
+            request_queue => {
+                method => get
+                url => "${dmaap_base_url}/events/${request_topic}/${dmaap_consumer_group}/${dmaap_consumer_id}?timeout=15000"
+                headers => {
+                    Accept => "application/json"
+                }
+                add_field => { "topic" => "${request_topic}" }
+            }
+        }
+        socket_timeout => 30
+        request_timeout => 30
+        interval => 15
+        codec => "plain"
+  }
+}
+
+filter {
+    # avoid noise if no entry in the list
+    if [message] == "[]" {
+       drop { }
+    }
+
+    # parse json, split  the list into multiple events, and parse each event
+    json {
+         source => "[message]"
+         target => "message"
+    }
+    split {
+          field => "message"
+    }
+    json {
+         source => "message"
+    }
+    mutate { remove_field => [ "message" ] }
+    # express timestamps in milliseconds instead of microseconds
+    ruby {
+        code => "event.set('closedLoopAlarmStart', Integer(event.get('closedLoopAlarmStart')))"
+    }
+    date {
+        match => [ "closedLoopAlarmStart", UNIX_MS ]
+        target => "closedLoopAlarmStart"
+    }
+
+    if [closedLoopAlarmEnd] {
+        ruby {
+            code => "event.set('closedLoopAlarmEnd', Integer(event.get('closedLoopAlarmEnd')))"
+        }
+        date {
+            match => [ "closedLoopAlarmEnd", UNIX_MS ]
+            target => "closedLoopAlarmEnd"
+        }
+
+    }
+    #"yyyy-MM-dd HH:mm:ss"
+    if [notificationTime] {
+       mutate {
+              gsub => [
+                   "notificationTime", " ", "T"
+              ]
+       }
+       date {
+            match => [ "notificationTime", ISO8601 ]
+            target => "notificationTime"
+       }
+    }
+}
+output {
+    stdout {
+        codec => rubydebug
+    }
+
+    elasticsearch {
+        codec => "json"
+        hosts => [elasticsearch]
+        index => "logstash-%{+YYYY.MM.DD}" # creates daily indexes
+        doc_as_upsert => true
+
+    }
+
+}
diff --git a/extra/docker/elk/tools/DMaaPServiceMocker/ds_mocker.py b/extra/docker/elk/tools/DMaaPServiceMocker/ds_mocker.py
new file mode 100755 (executable)
index 0000000..9891b8e
--- /dev/null
@@ -0,0 +1,218 @@
+#!/usr/bin/env python3
+import os
+import json
+import copy
+import random
+import requests
+import uuid
+import time
+from datetime import datetime
+
+def luck(n=2):
+    """ gives 1 chance out of n (default: 2) to return True """
+    assert n > 1
+    return bool(random.randint(0, n-1))
+def now_dmaap_timestamp():
+    return str(datetime.now().timestamp()).replace(".","")[:13]
+def now_notification_time():
+    return datetime.now().strftime("%Y-%m-%d %H:%M:%S.%f+00:00")
+
+CONTROL_LOOP_NAMES = [
+    'ClosedLoop-vUSP-SIG-d925ed73-8231-4d02-9545-db4e101f88f8',
+    'ClosedLoop-vUSP-SIG-37b1c91e-fd6b-4abd-af15-771902d5fdb1',
+    'ClosedLoop-vUSP-SIG-c2597657-7113-4efb-a1f9-397a7a24c3e1',
+    'ClosedLoop-vUSP-SIG-a11318ba-4c61-46b8-a9da-bd40bec11d45',
+    'ClosedLoop-vUSP-SIG-5321c558-2254-4efb-ac24-99dd54edc94f',
+]
+
+TEMPLATES = {
+    'event_abated'                   :'event_abated.json',
+    'event_onset'                    :'event_onset.json',
+    'notification_active'            :'notification_active.json',
+    'notification_final_failed'      :'notification_final_failed.json',
+    'notification_final_open'        :'notification_final_open.json',
+    'notification_final_success'     :'notification_final_success.json',
+    'notification_operation_failure' :'notification_operation_failure.json',
+    'notification_operation'         :'notification_operation.json',
+    'notification_operation_success' :'notification_operation_success.json',
+    'notification_rejected_disabled' :'notification_rejected_disabled.json',
+    'notification_rejected_missing'  :'notification_rejected_missing.json',
+}
+
+for key in TEMPLATES:
+    with open(TEMPLATES[key]) as f:
+        content = f.read()
+    TEMPLATES[key] = json.loads(content)
+
+
+class DMaaPMessage(dict):
+
+    dmaap_host_url = "http://dmaap.host.url:9200/"
+    dmaap_username = None
+    dmaap_password = None
+
+    @classmethod
+    def from_template(cls, tmpl, **kwargs):
+        obj = cls()
+        obj.update(copy.deepcopy(TEMPLATES[tmpl]))
+        for keys,value in kwargs.items():
+            current_node = obj
+            keys = keys.split(".")
+            key = keys[0]
+            for i in range(len(keys) - 1):
+                current_node = current_node[keys[i]]
+                key = keys[i]
+            current_node[key] = value
+        return obj
+
+    def publish(self, topic):
+        url = "%s/events/%s" % (self.dmaap_host_url, topic)
+        auth = None
+        if self.dmaap_username and self.dmaap_password:
+            auth = (self.dmaap_username, self.dmaap_password)
+        response = requests.post(url, data=json.dumps(self), auth=auth)
+        return response.status_code
+
+class Event(DMaaPMessage):
+
+    topic = "DCAE-CL-EVENT"
+
+    @staticmethod
+    def abated(**kwargs):
+        return Event.from_template('event_abated', **kwargs)
+
+    @staticmethod
+    def onset(**kwargs):
+        return Event.from_template('event_onset', **kwargs)
+
+    def publish(self):
+        return super().publish(self.topic)
+
+
+class Notification(DMaaPMessage):
+
+    topic = "POLICY-CL-MGT"
+
+    @classmethod
+    def from_template(cls, tmpl, **kwargs):
+        kwargs['notificationTime'] = now_notification_time()
+        return super().from_template(tmpl, **kwargs)
+
+    @staticmethod
+    def active(**kwargs):
+        return Notification.from_template('notification_active', **kwargs)
+
+    @staticmethod
+    def final(**kwargs):
+        class FinalNotification(Notification):
+            @staticmethod
+            def success(**kwargs):
+                return FinalNotification.from_template('notification_final_success', **kwargs)
+            @staticmethod
+            def failed(**kwargs):
+                return FinalNotification.from_template('notification_final_failed', **kwargs)
+            @staticmethod
+            def open(**kwargs):
+                return FinalNotification.from_template('notification_final_open', **kwargs)
+        return FinalNotification
+
+    @staticmethod
+    def operation(**kwargs):
+        class OperationNotification(Notification):
+            @staticmethod
+            def success(**kwargs):
+                return OperationNotification.from_template('notification_operation_success', **kwargs)
+            @staticmethod
+            def failure(**kwargs):
+                return OperationNotification.from_template('notification_operation_failure', **kwargs)
+        return OperationNotification.from_template('notification_operation', **kwargs)
+
+    @staticmethod
+    def rejected(**kwargs):
+        class RejectedNotification(Notification):
+            @staticmethod
+            def disabled(**kwargs):
+                return RejectedNotification.from_template('notification_rejected_disabled', **kwargs)
+            @staticmethod
+            def missing_fields(**kwargs):
+                return RejectedNotification.from_template('notification_rejected_missing', **kwargs)
+
+        return RejectedNotification
+
+    def publish(self):
+        return super().publish(self.topic)
+
+
+
+class CLStatus(object):
+
+    def __init__(self, dmaap_url=None,
+                 missing=None, disabled=None, op_failure=None):
+        self._stopped = False
+        def maybe(thing):
+            if thing is None:
+                thing = not luck(10)
+            return thing
+        self._missing = maybe(missing)
+        self._disabled = maybe(disabled)
+        self._op_failure = maybe(op_failure)
+        self._config = dict(
+            requestID=str(uuid.uuid4()),
+            closedLoopControlName=CONTROL_LOOP_NAMES[random.randint(0, len(CONTROL_LOOP_NAMES) - 1)]
+        )
+
+    def __iter__(self):
+        return next(self)
+
+    def __next__(self):
+        if self._stopped:
+            raise StopIteration()
+        config = self._config
+        config.update(dict(closedLoopAlarmStart=now_dmaap_timestamp()))
+        yield Event.onset(**config)
+        if self._missing:
+            self._stopped = True
+            yield Notification.rejected().missing_fields(**config)
+            raise StopIteration()
+        elif self._disabled:
+            self._stopped = True
+            yield Notification.rejected().disabled(**config)
+            raise StopIteration()
+
+        yield Notification.active(**config)
+        yield Notification.operation(**config)
+
+        config['closedLoopAlarmEnd'] = now_dmaap_timestamp()
+        if self._op_failure:
+            yield Notification.operation().failure(**config)
+            self._stopped = True
+            yield Notification.final().failed(**config)
+        else:
+            yield Notification.operation().success(**config)
+            yield Event.abated(**config)
+            self._stopped = True
+            yield Notification.final().success(**config)
+        raise StopIteration()
+
+DMaaPMessage.dmaap_host_url = "http://uebsb93kcdc.it.att.com:3904"
+Event.topic = "APPC-TEST-AMDOCS1-1607-E2E"
+Notification.topic = "APPC-TEST-AMDOCS1-1607-IST"
+# Request.topic = "APPC-TEST-AMDOCS1-1607-RY303T"
+
+test_datas = [CLStatus(missing=False, disabled=False, op_failure=False) for i in range(45)]  \
+             + [CLStatus(missing=True, disabled=False, op_failure=False) for i in range(5)]  \
+             + [CLStatus(missing=False, disabled=True, op_failure=False) for i in range(6)]  \
+             + [CLStatus(missing=False, disabled=False, op_failure=True) for i in range(7)]
+random.shuffle(test_datas)
+random.shuffle(test_datas)
+
+for current_i, status in enumerate(test_datas):
+    time.sleep(random.randint(0,6))
+    for s in status:
+        # print(s)
+        status_code = s.publish()
+        if status_code != 200:
+            print("Error when publishing : status_code={}".format(status_code))
+            exit(1)
+        time.sleep(random.randint(0,3))
+    print("%03d,missing:%5s,disabled:%5s,op_failure:%5s - %s" % (current_i, status._missing, status._disabled, status._op_failure, status._config))
diff --git a/extra/docker/elk/tools/DMaaPServiceMocker/event_abated.json b/extra/docker/elk/tools/DMaaPServiceMocker/event_abated.json
new file mode 100644 (file)
index 0000000..ae0d4b7
--- /dev/null
@@ -0,0 +1,27 @@
+{
+  "AAI": {
+    "cloud-region.identity-url": "http://1.2.3.4:5000/v2.0",
+    "complex.physical-location-id": "SNYSCA12",
+    "generic-vnf.service-id": "eb477a13-f380-401e-b2bd-f2d444c63e54",
+    "generic-vnf.vnf-name": "gupi1337p",
+    "tenant.tenant-id": "8f7b9a8a-8607-4a01-a5ef-0b26f569dcbb",
+    "vserver.is-closed-loop-disabled": "false",
+    "vserver.prov-status": "PROV",
+    "vserver.vserver-selflink": "https//2.3.4.5:1234/d5a992de-8a70-4d7d-b382-2bc6eea52317",
+    "vserver.vserver-id": "08f6c1f9-99e7-49f3-a662-c62b9f200d79",
+    "vserver.vserver-name": "gupi1337pm004"
+  },
+  "closedLoopAlarmEnd": 1478710227625,
+  "closedLoopAlarmStart": 1478709727496,
+  "closedLoopControlName": "ClosedLoop-3ffd062d-7589-43b2-865a-139b64e2d402",
+  "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca",
+  "closedLoopEventStatus": "ABATED",
+  "from": "DCAE",
+  "policyName": "vFirewall",
+  "policyScope": "resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=SampleClosedLoop",
+  "policyVersion": "v0.0.1",
+  "requestID": "f889f60c-a715-48c0-801e-26428f6176b9",
+  "target": "vserver.vserver-name",
+  "target_type": "VM",
+  "version": "1.0.2"
+}
diff --git a/extra/docker/elk/tools/DMaaPServiceMocker/event_onset.json b/extra/docker/elk/tools/DMaaPServiceMocker/event_onset.json
new file mode 100644 (file)
index 0000000..223f096
--- /dev/null
@@ -0,0 +1,26 @@
+{
+  "AAI": {
+    "cloud-region.identity-url": "http://1.2.3.4:5000/v2.0",
+    "complex.physical-location-id": "SNYSCA12",
+    "generic-vnf.service-id": "eb477a13-f380-401e-b2bd-f2d444c63e54",
+    "generic-vnf.vnf-name": "gupi1337p",
+    "tenant.tenant-id": "8f7b9a8a-8607-4a01-a5ef-0b26f569dcbb",
+    "vserver.is-closed-loop-disabled": "false",
+    "vserver.prov-status": "PROV",
+    "vserver.vserver-selflink": "https//2.3.4.5:1234/d5a992de-8a70-4d7d-b382-2bc6eea52317",
+    "vserver.vserver-id": "08f6c1f9-99e7-49f3-a662-c62b9f200d79",
+    "vserver.vserver-name": "gupi1337pm004"
+  },
+  "closedLoopAlarmStart": 1478709385444,
+  "closedLoopControlName": "ClosedLoop-3ffd062d-7589-43b2-865a-139b64e2d402",
+  "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca",
+  "closedLoopEventStatus": "ONSET",
+  "from": "DCAE",
+  "policyName": "vFirewall",
+  "policyScope": "resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=SampleClosedLoop",
+  "policyVersion": "v0.0.1",
+  "requestID": "88e951ad-a07c-4748-9cef-34f32851a527",
+  "target": "vserver.vserver-name",
+  "target_type": "VM",
+  "version": "1.0.2"
+}
diff --git a/extra/docker/elk/tools/DMaaPServiceMocker/notification_active.json b/extra/docker/elk/tools/DMaaPServiceMocker/notification_active.json
new file mode 100644 (file)
index 0000000..341a249
--- /dev/null
@@ -0,0 +1,28 @@
+{
+  "AAI": {
+    "cloud-region.identity-url": "http://1.2.3.4:5000/v2.0",
+    "complex.physical-location-id": "SNYSCA12",
+    "generic-vnf.service-id": "eb477a13-f380-401e-b2bd-f2d444c63e54",
+    "generic-vnf.vnf-name": "gupi1337p",
+    "tenant.tenant-id": "8f7b9a8a-8607-4a01-a5ef-0b26f569dcbb",
+    "vserver.is-closed-loop-disabled": "false",
+    "vserver.prov-status": "PROV",
+    "vserver.vserver-selflink": "https//2.3.4.5:1234/d5a992de-8a70-4d7d-b382-2bc6eea52317",
+    "vserver.vserver-id": "08f6c1f9-99e7-49f3-a662-c62b9f200d79",
+    "vserver.vserver-name": "gupi1337pm004"
+  },
+  "OPS_CL_timer": 600,
+  "closedLoopAlarmStart": 1478709989621,
+  "closedLoopControlName": "ClosedLoop-3ffd062d-7589-43b2-865a-139b64e2d402",
+  "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca",
+  "from": "Policy",
+  "notification": "ACTIVE",
+  "notificationTime": "2016-11-09 16:46:29.721000+00:00",
+  "policyName": "ClosedLoop.vUSP",
+  "policyScope": "resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=SampleClosedLoop",
+  "policyVersion": "v0.0.1",
+  "requestID": "f889f60c-a715-48c0-801e-26428f6176b9",
+  "target": "vserver.vserver-name",
+  "target_type": "VM",
+  "version": "1.0.2"
+}
diff --git a/extra/docker/elk/tools/DMaaPServiceMocker/notification_final_failed.json b/extra/docker/elk/tools/DMaaPServiceMocker/notification_final_failed.json
new file mode 100644 (file)
index 0000000..4891c7e
--- /dev/null
@@ -0,0 +1,42 @@
+{
+  "AAI": {
+    "cloud-region.identity-url": "http://1.2.3.4:5000/v2.0",
+    "complex.physical-location-id": "SNYSCA12",
+    "generic-vnf.service-id": "eb477a13-f380-401e-b2bd-f2d444c63e54",
+    "generic-vnf.vnf-name": "gupi1337p",
+    "tenant.tenant-id": "8f7b9a8a-8607-4a01-a5ef-0b26f569dcbb",
+    "vserver.is-closed-loop-disabled": "false",
+    "vserver.prov-status": "PROV",
+    "vserver.vserver-selflink": "https//2.3.4.5:1234/d5a992de-8a70-4d7d-b382-2bc6eea52317",
+    "vserver.vserver-id": "08f6c1f9-99e7-49f3-a662-c62b9f200d79",
+    "vserver.vserver-name": "gupi1337pm004"
+  },
+  "OPS_CL_timer": 600,
+  "closedLoopAlarmEnd": 1478710489739,
+  "closedLoopAlarmStart": 1478709989621,
+  "closedLoopControlName": "ClosedLoop-3ffd062d-7589-43b2-865a-139b64e2d402",
+  "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca",
+  "from": "Policy",
+  "history": [
+    {
+      "actor": "APPC",
+      "end": 1478637014434,
+      "message": "<APPC ERROR code/description>",
+      "operation": "RESTART",
+      "outcome": "FAILED",
+      "start": 1478637014430,
+      "subRequestId": "1",
+      "target": "vserver.vserver-name"
+    }
+  ],
+  "message": "actor=APPC,operation=RESTART,target=vserver.vserver-name,subRequestId=1,outcome=FAILED",
+  "notification": "FINAL: FAILURE",
+  "notificationTime": "2016-11-08 15:30:14.434000-05:00",
+  "policyName": "ClosedLoop.vUSP",
+  "policyScope": "resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=SampleClosedLoop",
+  "policyVersion": "v0.0.1",
+  "requestID": "f889f60c-a715-48c0-801e-26428f6176b9",
+  "target": "vserver.vserver-name",
+  "target_type": "VM",
+  "version": "1.0.2"
+}
diff --git a/extra/docker/elk/tools/DMaaPServiceMocker/notification_final_open.json b/extra/docker/elk/tools/DMaaPServiceMocker/notification_final_open.json
new file mode 100644 (file)
index 0000000..da9e6e1
--- /dev/null
@@ -0,0 +1,28 @@
+{
+  "AAI": {
+    "cloud-region.identity-url": "http://1.2.3.4:5000/v2.0",
+    "complex.physical-location-id": "SNYSCA12",
+    "generic-vnf.service-id": "eb477a13-f380-401e-b2bd-f2d444c63e54",
+    "generic-vnf.vnf-name": "gupi1337p",
+    "tenant.tenant-id": "8f7b9a8a-8607-4a01-a5ef-0b26f569dcbb",
+    "vserver.is-closed-loop-disabled": "false",
+    "vserver.prov-status": "PROV",
+    "vserver.vserver-selflink": "https//2.3.4.5:1234/d5a992de-8a70-4d7d-b382-2bc6eea52317",
+    "vserver.vserver-id": "08f6c1f9-99e7-49f3-a662-c62b9f200d79",
+    "vserver.vserver-name": "gupi1337pm004"
+  },
+  "closedLoopAlarmEnd": 1478710489739,
+  "closedLoopAlarmStart": 1478709989621,
+  "closedLoopControlName": "ClosedLoop-3ffd062d-7589-43b2-865a-139b64e2d402",
+  "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca",
+  "from": "Policy",
+  "notification": "FINAL: OPEN",
+  "notificationTime": "2016-11-08 15:30:14.434000-05:00",
+  "policyName": "ClosedLoop.vUSP",
+  "policyScope": "resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=SampleClosedLoop",
+  "policyVersion": "v0.0.1",
+  "requestID": "f889f60c-a715-48c0-801e-26428f6176b9",
+  "target": "vserver.vserver-name",
+  "target_type": "VM",
+  "version": "1.0.2"
+}
diff --git a/extra/docker/elk/tools/DMaaPServiceMocker/notification_final_success.json b/extra/docker/elk/tools/DMaaPServiceMocker/notification_final_success.json
new file mode 100644 (file)
index 0000000..3d027eb
--- /dev/null
@@ -0,0 +1,40 @@
+{
+  "AAI": {
+    "cloud-region.identity-url": "http://1.2.3.4:5000/v2.0",
+    "complex.physical-location-id": "SNYSCA12",
+    "generic-vnf.service-id": "eb477a13-f380-401e-b2bd-f2d444c63e54",
+    "generic-vnf.vnf-name": "gupi1337p",
+    "tenant.tenant-id": "8f7b9a8a-8607-4a01-a5ef-0b26f569dcbb",
+    "vserver.is-closed-loop-disabled": "false",
+    "vserver.prov-status": "PROV",
+    "vserver.vserver-selflink": "https//2.3.4.5:1234/d5a992de-8a70-4d7d-b382-2bc6eea52317",
+    "vserver.vserver-id": "08f6c1f9-99e7-49f3-a662-c62b9f200d79",
+    "vserver.vserver-name": "gupi1337pm004"
+  },
+  "OPS_CL_timer": 600,
+  "closedLoopAlarmEnd": 1478710489739,
+  "closedLoopAlarmStart": 1478709989621,
+  "closedLoopControlName": "ClosedLoop-3ffd062d-7589-43b2-865a-139b64e2d402",
+  "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca",
+  "from": "Policy",
+  "history": [
+    {
+      "actor": "APPC",
+      "end": 1478709989738,
+      "operation": "RESTART",
+      "start": 1478709989734,
+      "subRequestId": "1",
+      "target": "vserver.vserver-name"
+    }
+  ],
+  "message": "actor=APPC,operation=RESTART,target=vserver.vserver-name,subRequestId=1",
+  "notification": "FINAL: SUCCESS",
+  "notificationTime": "2016-11-09 11:46:29.738000-05:00",
+  "policyName": "ClosedLoop.vUSP",
+  "policyScope": "resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=SampleClosedLoop",
+  "policyVersion": "v0.0.1",
+  "requestID": "f889f60c-a715-48c0-801e-26428f6176b9",
+  "target": "vserver.vserver-name",
+  "target_type": "VM",
+  "version": "1.0.2"
+}
diff --git a/extra/docker/elk/tools/DMaaPServiceMocker/notification_operation.json b/extra/docker/elk/tools/DMaaPServiceMocker/notification_operation.json
new file mode 100644 (file)
index 0000000..341a249
--- /dev/null
@@ -0,0 +1,28 @@
+{
+  "AAI": {
+    "cloud-region.identity-url": "http://1.2.3.4:5000/v2.0",
+    "complex.physical-location-id": "SNYSCA12",
+    "generic-vnf.service-id": "eb477a13-f380-401e-b2bd-f2d444c63e54",
+    "generic-vnf.vnf-name": "gupi1337p",
+    "tenant.tenant-id": "8f7b9a8a-8607-4a01-a5ef-0b26f569dcbb",
+    "vserver.is-closed-loop-disabled": "false",
+    "vserver.prov-status": "PROV",
+    "vserver.vserver-selflink": "https//2.3.4.5:1234/d5a992de-8a70-4d7d-b382-2bc6eea52317",
+    "vserver.vserver-id": "08f6c1f9-99e7-49f3-a662-c62b9f200d79",
+    "vserver.vserver-name": "gupi1337pm004"
+  },
+  "OPS_CL_timer": 600,
+  "closedLoopAlarmStart": 1478709989621,
+  "closedLoopControlName": "ClosedLoop-3ffd062d-7589-43b2-865a-139b64e2d402",
+  "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca",
+  "from": "Policy",
+  "notification": "ACTIVE",
+  "notificationTime": "2016-11-09 16:46:29.721000+00:00",
+  "policyName": "ClosedLoop.vUSP",
+  "policyScope": "resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=SampleClosedLoop",
+  "policyVersion": "v0.0.1",
+  "requestID": "f889f60c-a715-48c0-801e-26428f6176b9",
+  "target": "vserver.vserver-name",
+  "target_type": "VM",
+  "version": "1.0.2"
+}
diff --git a/extra/docker/elk/tools/DMaaPServiceMocker/notification_operation_failure.json b/extra/docker/elk/tools/DMaaPServiceMocker/notification_operation_failure.json
new file mode 100644 (file)
index 0000000..5dbe33c
--- /dev/null
@@ -0,0 +1,29 @@
+{
+  "AAI": {
+    "cloud-region.identity-url": "http://1.2.3.4:5000/v2.0",
+    "complex.physical-location-id": "SNYSCA12",
+    "generic-vnf.service-id": "eb477a13-f380-401e-b2bd-f2d444c63e54",
+    "generic-vnf.vnf-name": "gupi1337p",
+    "tenant.tenant-id": "8f7b9a8a-8607-4a01-a5ef-0b26f569dcbb",
+    "vserver.is-closed-loop-disabled": "false",
+    "vserver.prov-status": "PROV",
+    "vserver.vserver-selflink": "https//2.3.4.5:1234/d5a992de-8a70-4d7d-b382-2bc6eea52317",
+    "vserver.vserver-id": "08f6c1f9-99e7-49f3-a662-c62b9f200d79",
+    "vserver.vserver-name": "gupi1337pm004"
+  },
+  "OPS_CL_timer": 600,
+  "closedLoopAlarmStart": 1478709989621,
+  "closedLoopControlName": "ClosedLoop-3ffd062d-7589-43b2-865a-139b64e2d402",
+  "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca",
+  "from": "Policy",
+  "message": "<APPC ERROR code and/or message>",
+  "notification": "OPERATION: FAILURE",
+  "notificationTime": "2016-11-08 15:30:14.434000-05:00",
+  "policyName": "ClosedLoop.vUSP",
+  "policyScope": "resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=SampleClosedLoop",
+  "policyVersion": "v0.0.1",
+  "requestID": "f889f60c-a715-48c0-801e-26428f6176b9",
+  "target": "vserver.vserver-name",
+  "target_type": "VM",
+  "version": "1.0.2"
+}
diff --git a/extra/docker/elk/tools/DMaaPServiceMocker/notification_operation_success.json b/extra/docker/elk/tools/DMaaPServiceMocker/notification_operation_success.json
new file mode 100644 (file)
index 0000000..9e18b97
--- /dev/null
@@ -0,0 +1,29 @@
+{
+  "AAI": {
+    "cloud-region.identity-url": "http://1.2.3.4:5000/v2.0",
+    "complex.physical-location-id": "SNYSCA12",
+    "generic-vnf.service-id": "eb477a13-f380-401e-b2bd-f2d444c63e54",
+    "generic-vnf.vnf-name": "gupi1337p",
+    "tenant.tenant-id": "8f7b9a8a-8607-4a01-a5ef-0b26f569dcbb",
+    "vserver.is-closed-loop-disabled": "false",
+    "vserver.prov-status": "PROV",
+    "vserver.vserver-selflink": "https//2.3.4.5:1234/d5a992de-8a70-4d7d-b382-2bc6eea52317",
+    "vserver.vserver-id": "08f6c1f9-99e7-49f3-a662-c62b9f200d79",
+    "vserver.vserver-name": "gupi1337pm004"
+  },
+  "OPS_CL_timer": 600,
+  "closedLoopAlarmStart": 1478709989621,
+  "closedLoopControlName": "ClosedLoop-3ffd062d-7589-43b2-865a-139b64e2d402",
+  "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca",
+  "from": "Policy",
+  "message": "actor=APPC,operation=RESTART,target=vserver.vserver-name,subRequestId=1",
+  "notification": "OPERATION: SUCCESS",
+  "notificationTime": "2016-11-09 11:46:29.738000-05:00",
+  "policyName": "ClosedLoop.vUSP",
+  "policyScope": "resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=SampleClosedLoop",
+  "policyVersion": "v0.0.1",
+  "requestID": "f889f60c-a715-48c0-801e-26428f6176b9",
+  "target": "vserver.vserver-name",
+  "target_type": "VM",
+  "version": "1.0.2"
+}
diff --git a/extra/docker/elk/tools/DMaaPServiceMocker/notification_rejected_disabled.json b/extra/docker/elk/tools/DMaaPServiceMocker/notification_rejected_disabled.json
new file mode 100644 (file)
index 0000000..3d94987
--- /dev/null
@@ -0,0 +1,29 @@
+{
+  "AAI": {
+    "cloud-region.identity-url": "http://1.2.3.4:5000/v2.0",
+    "complex.physical-location-id": "SNYSCA12",
+    "generic-vnf.service-id": "eb477a13-f380-401e-b2bd-f2d444c63e54",
+    "generic-vnf.vnf-name": "gupi1337p",
+    "tenant.tenant-id": "8f7b9a8a-8607-4a01-a5ef-0b26f569dcbb",
+    "vserver.is-closed-loop-disabled": "true",
+    "vserver.prov-status": "PROV",
+    "vserver.vserver-selflink": "https//2.3.4.5:1234/d5a992de-8a70-4d7d-b382-2bc6eea52317",
+    "vserver.vserver-id": "08f6c1f9-99e7-49f3-a662-c62b9f200d79",
+    "vserver.vserver-name": "gupi1337pm004"
+  },
+  "OPS_CL_timer": 600,
+  "closedLoopAlarmStart": 1478709989621,
+  "closedLoopControlName": "ClosedLoop-3ffd062d-7589-43b2-865a-139b64e2d402",
+  "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca",
+  "from": "Policy",
+  "message": "Closed Loop Disabled",
+  "notification": "REJECTED",
+  "notificationTime": "2016-05-11 15:09:23.896000+00:00",
+  "policyName": "ClosedLoop.vUSP",
+  "policyScope": "resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=SampleClosedLoop",
+  "policyVersion": "v0.0.1",
+  "requestID": "f889f60c-a715-48c0-801e-26428f6176b9",
+  "target": "vserver.vserver-name",
+  "target_type": "VM",
+  "version": "1.0.2"
+}
diff --git a/extra/docker/elk/tools/DMaaPServiceMocker/notification_rejected_missing.json b/extra/docker/elk/tools/DMaaPServiceMocker/notification_rejected_missing.json
new file mode 100644 (file)
index 0000000..c901401
--- /dev/null
@@ -0,0 +1,18 @@
+{
+  "AAI": {},
+  "OPS_CL_timer": 600,
+  "closedLoopAlarmStart": 1478709989621,
+  "closedLoopControlName": "ClosedLoop-3ffd062d-7589-43b2-865a-139b64e2d402",
+  "closedLoopEventClient": "DCAE_INSTANCE_ID.dcae-tca",
+  "from": "Policy",
+  "message": "Missing AAI tag",
+  "notification": "REJECTED",
+  "notificationTime": "2016-05-11 14:42:23.629000+00:00",
+  "policyName": "ClosedLoop.vUSP",
+  "policyScope": "resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=SampleClosedLoop",
+  "policyVersion": "v0.0.1",
+  "requestID": "f889f60c-a715-48c0-801e-26428f6176b9",
+  "target": "vserver.vserver-name",
+  "target_type": "VM",
+  "version": "1.0.2"
+}
diff --git a/extra/docker/elk/tools/EsAutoQuery/autoQueryLoop.sh b/extra/docker/elk/tools/EsAutoQuery/autoQueryLoop.sh
new file mode 100755 (executable)
index 0000000..4929412
--- /dev/null
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+QUERY_FILE=${1:-query.json}
+INDEX=${2:-logstash-*}
+HOST_URL=${3:-http://localhost:9200}
+URL=$HOST_URL/$INDEX/_search
+
+function usage() {
+    echo "Usage: $0 [QUERY_FILE [INDEX [HOST_URL]]]"
+    echo
+    echo "This script automatically sends the query file to elasticsearch"
+    echo "each time it's modified."
+}
+
+if [ "${1}" == "--help" ];
+then
+    usage
+    exit 0
+fi
+
+echo "Querying '$URL' with '$QUERY_FILE'"
+while [ 1 ];
+do
+    curl -XGET "$URL" -H 'Content-Type: application/json' -d"@$QUERY_FILE" | js-beautify
+    echo
+    inotifywait -e modify query.json
+done
diff --git a/extra/docker/elk/tools/EsAutoQuery/closedLoopAlarmDuration.json b/extra/docker/elk/tools/EsAutoQuery/closedLoopAlarmDuration.json
new file mode 100644 (file)
index 0000000..5a29545
--- /dev/null
@@ -0,0 +1,34 @@
+{
+    "query" : {
+        "bool": {
+            "must": [
+                { "match": { "closedLoopEventStatus": "ABATED" } }
+            ]
+        }
+    },
+    "script_fields" : {
+        "closedLoopAlarmDuration" : {
+            "script" : {
+                "lang": "painless",
+                "source": "
+if (doc.get('closedLoopEventStatus.keyword').value == 'ABATED') {
+   return doc.get('closedLoopAlarmEnd').value - doc.get('closedLoopAlarmStart').value;
+}
+return null
+"
+            }
+        }
+        , "closedLoopAlarmStart" : {
+            "script" : {
+                "lang": "painless",
+                "source": "doc['closedLoopAlarmStart']"
+            }
+        }
+        , "closedLoopAlarmEnd" : {
+            "script" : {
+                "lang": "painless",
+                "source": "doc['closedLoopAlarmEnd']"
+            }
+        }
+    }
+}
diff --git a/extra/docker/elk/tools/EsAutoQuery/timeSince.json b/extra/docker/elk/tools/EsAutoQuery/timeSince.json
new file mode 100644 (file)
index 0000000..6ee1493
--- /dev/null
@@ -0,0 +1,51 @@
+{
+    "query" : {
+        "match_all": {}
+    },
+    "script_fields" : {
+        "timeSince" : {
+            "script" : {
+                "lang": "painless",
+                "source": "
+long now = System.currentTimeMillis();
+if (doc.get('closedLoopEventStatus.keyword').value == 'ABATED') {
+   return now - doc.get('closedLoopAlarmEnd').value;
+}
+if (doc.get('closedLoopEventStatus.keyword').value == 'ONSET') {
+   return now - doc.get('closedLoopAlarmStart').value;
+}
+if (doc.containsKey('notification.keyword')) {
+   return now - doc.get('notificationTime').value;
+}
+
+return null
+"
+            }
+        }
+        , "closedLoopAlarmStart" : {
+            "script" : {
+                "lang": "painless",
+                "source": "doc['closedLoopAlarmStart']"
+            }
+        }
+        , "closedLoopEventStatus" : {
+            "script" : {
+                "lang": "painless",
+                "source": "doc['closedLoopEventStatus.keyword']"
+            }
+        }
+        , "notification" : {
+            "script" : {
+                "lang": "painless",
+                "source": "doc['notification.keyword']"
+            }
+        }
+        , "notificationTime" : {
+            "script" : {
+                "lang": "painless",
+                "source": "doc['notificationTime'].value"
+            }
+        }
+
+    }
+}
diff --git a/src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserFilesConfiguration.java b/src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserFilesConfiguration.java
new file mode 100644 (file)
index 0000000..10306b4
--- /dev/null
@@ -0,0 +1,52 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+package org.onap.clamp.clds.config.sdc;
+
+/**
+ * This class is used to decode the configuration found in
+ * application.properties, this is related to the blueprint mapping
+ * configuration that is used to create data in database, according to the
+ * blueprint content coming from SDC.
+ */
+public class BlueprintParserFilesConfiguration {
+
+    private String svgXmlFilePath;
+    private String bpmnXmlFilePath;
+
+    public String getBpmnXmlFilePath() {
+        return bpmnXmlFilePath;
+    }
+
+    public void setBpmnXmlFilePath(String bpmnXmlFilePath) {
+        this.bpmnXmlFilePath = bpmnXmlFilePath;
+    }
+
+    public String getSvgXmlFilePath() {
+        return svgXmlFilePath;
+    }
+
+    public void setSvgXmlFilePath(String svgXmlFilePath) {
+        this.svgXmlFilePath = svgXmlFilePath;
+    }
+}
diff --git a/src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserMappingConfiguration.java b/src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserMappingConfiguration.java
new file mode 100644 (file)
index 0000000..b263104
--- /dev/null
@@ -0,0 +1,65 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+package org.onap.clamp.clds.config.sdc;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+/**
+ * This class is used to decode the configuration found in
+ * application.properties, this is related to the blueprint mapping
+ * configuration that is used to create data in database, according to the
+ * blueprint content coming from SDC.
+ */
+public class BlueprintParserMappingConfiguration {
+
+    private String blueprintKey;
+    private BlueprintParserFilesConfiguration files;
+
+    public String getBlueprintKey() {
+        return blueprintKey;
+    }
+
+    public void setBlueprintKey(String blueprintKey) {
+        this.blueprintKey = blueprintKey;
+    }
+
+    public BlueprintParserFilesConfiguration getFiles() {
+        return files;
+    }
+
+    public void setFiles(BlueprintParserFilesConfiguration filesConfig) {
+        this.files = filesConfig;
+    }
+
+    public static List<BlueprintParserMappingConfiguration> createFromJson(InputStream json) throws IOException {
+        TypeReference<List<BlueprintParserMappingConfiguration>> mapType = new TypeReference<List<BlueprintParserMappingConfiguration>>() {
+        };
+        return new ObjectMapper().readValue(json, mapType);
+    }
+}
diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleController.java b/src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleController.java
new file mode 100644 (file)
index 0000000..3c87725
--- /dev/null
@@ -0,0 +1,310 @@
+/*-\r
+ * ============LICENSE_START=======================================================\r
+ * ONAP CLAMP\r
+ * ================================================================================\r
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights\r
+ *                             reserved.\r
+ * ================================================================================\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ * ============LICENSE_END============================================\r
+ * ===================================================================\r
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
+ */\r
+\r
+package org.onap.clamp.clds.sdc.controller;\r
+\r
+import com.att.eelf.configuration.EELFLogger;\r
+import com.att.eelf.configuration.EELFManager;\r
+\r
+import java.util.Date;\r
+\r
+import org.onap.clamp.clds.config.ClampProperties;\r
+import org.onap.clamp.clds.config.sdc.SdcSingleControllerConfiguration;\r
+import org.onap.clamp.clds.exception.sdc.controller.CsarHandlerException;\r
+import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;\r
+import org.onap.clamp.clds.exception.sdc.controller.SdcControllerException;\r
+import org.onap.clamp.clds.exception.sdc.controller.SdcDownloadException;\r
+import org.onap.clamp.clds.exception.sdc.controller.SdcParametersException;\r
+import org.onap.clamp.clds.sdc.controller.installer.CsarHandler;\r
+import org.onap.clamp.clds.sdc.controller.installer.CsarInstaller;\r
+import org.onap.clamp.clds.util.LoggingUtils;\r
+import org.openecomp.sdc.api.IDistributionClient;\r
+import org.openecomp.sdc.api.consumer.IDistributionStatusMessage;\r
+import org.openecomp.sdc.api.consumer.INotificationCallback;\r
+import org.openecomp.sdc.api.notification.IArtifactInfo;\r
+import org.openecomp.sdc.api.notification.INotificationData;\r
+import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;\r
+import org.openecomp.sdc.api.results.IDistributionClientResult;\r
+import org.openecomp.sdc.impl.DistributionClientFactory;\r
+import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;\r
+import org.openecomp.sdc.utils.DistributionActionResultEnum;\r
+import org.openecomp.sdc.utils.DistributionStatusEnum;\r
+import org.springframework.beans.factory.annotation.Autowired;\r
+import org.springframework.stereotype.Component;\r
+\r
+@Component\r
+public class SdcSingleController {\r
+\r
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(SdcSingleController.class);\r
+    protected boolean isAsdcClientAutoManaged = false;\r
+    protected CsarInstaller resourceInstaller;\r
+    @Autowired\r
+    protected ClampProperties refProp;\r
+    public static final String CONFIG_SDC_FOLDER = "sdc.csarFolder";\r
+\r
+    /**\r
+     * Inner class for Notification callback\r
+     */\r
+    private final class ASDCNotificationCallBack implements INotificationCallback {\r
+\r
+        private SdcSingleController asdcController;\r
+\r
+        ASDCNotificationCallBack(SdcSingleController controller) {\r
+            asdcController = controller;\r
+        }\r
+\r
+        /**\r
+         * This method can be called multiple times at the same moment. The\r
+         * controller must be thread safe !\r
+         */\r
+        @Override\r
+        public void activateCallback(INotificationData iNotif) {\r
+            Date startTime = new Date();\r
+            String event = "Receive a callback notification in ASDC, nb of resources: " + iNotif.getResources().size();\r
+            logger.debug(event);\r
+            asdcController.treatNotification(iNotif);\r
+            LoggingUtils.setTimeContext(startTime, new Date());\r
+            LoggingUtils.setResponseContext("0", "SDC Notification received and processed successfully",\r
+                    this.getClass().getName());\r
+        }\r
+    }\r
+\r
+    // ***** Controller STATUS code\r
+    protected int nbOfNotificationsOngoing = 0;\r
+\r
+    public int getNbOfNotificationsOngoing() {\r
+        return nbOfNotificationsOngoing;\r
+    }\r
+\r
+    private SdcSingleControllerStatus controllerStatus = SdcSingleControllerStatus.STOPPED;\r
+\r
+    protected final synchronized void changeControllerStatus(SdcSingleControllerStatus newControllerStatus) {\r
+        switch (newControllerStatus) {\r
+            case BUSY:\r
+                ++this.nbOfNotificationsOngoing;\r
+                this.controllerStatus = newControllerStatus;\r
+                break;\r
+            case IDLE:\r
+                if (this.nbOfNotificationsOngoing > 1) {\r
+                    --this.nbOfNotificationsOngoing;\r
+                } else {\r
+                    this.nbOfNotificationsOngoing = 0;\r
+                    this.controllerStatus = newControllerStatus;\r
+                }\r
+                break;\r
+            default:\r
+                this.controllerStatus = newControllerStatus;\r
+                break;\r
+        }\r
+    }\r
+\r
+    public final synchronized SdcSingleControllerStatus getControllerStatus() {\r
+        return this.controllerStatus;\r
+    }\r
+\r
+    // ***** END of Controller STATUS code\r
+    protected SdcSingleControllerConfiguration sdcConfig;\r
+    private IDistributionClient distributionClient;\r
+\r
+    /**\r
+     * This method initializes the SDC Controller and the SDC Client.\r
+     *\r
+     * @throws SdcControllerException\r
+     *             It throws an exception if the SDC Client cannot be\r
+     *             instantiated or if an init attempt is done when already\r
+     *             initialized\r
+     * @throws SdcParametersException\r
+     *             If there is an issue with the parameters provided\r
+     */\r
+    public void initSdc() throws SdcControllerException {\r
+        logger.debug("Attempt to initialize the SDC Controller");\r
+        if (this.getControllerStatus() != SdcSingleControllerStatus.STOPPED) {\r
+            throw new SdcControllerException("The controller is already initialized, call the closeSDC method first");\r
+        }\r
+        if (this.distributionClient == null) {\r
+            distributionClient = DistributionClientFactory.createDistributionClient();\r
+        }\r
+        IDistributionClientResult result = this.distributionClient.init(sdcConfig, new ASDCNotificationCallBack(this));\r
+        if (!result.getDistributionActionResult().equals(DistributionActionResultEnum.SUCCESS)) {\r
+            logger.error("ASDC distribution client init failed with reason:" + result.getDistributionMessageResult());\r
+            this.changeControllerStatus(SdcSingleControllerStatus.STOPPED);\r
+            throw new SdcControllerException("Initialization of the SDC Controller failed with reason: "\r
+                    + result.getDistributionMessageResult());\r
+        }\r
+        result = this.distributionClient.start();\r
+        if (!result.getDistributionActionResult().equals(DistributionActionResultEnum.SUCCESS)) {\r
+            logger.debug("SDC distribution client start failed with reason:" + result.getDistributionMessageResult());\r
+            this.changeControllerStatus(SdcSingleControllerStatus.STOPPED);\r
+            throw new SdcControllerException(\r
+                    "Startup of the SDC Controller failed with reason: " + result.getDistributionMessageResult());\r
+        }\r
+        this.changeControllerStatus(SdcSingleControllerStatus.IDLE);\r
+    }\r
+\r
+    /**\r
+     * This method closes the SDC Controller and the SDC Client.\r
+     *\r
+     * @throws SdcControllerException\r
+     *             It throws an exception if the SDC Client cannot be closed\r
+     *             because it's currently BUSY in processing notifications.\r
+     */\r
+    public void closeSdc() throws SdcControllerException {\r
+        if (this.getControllerStatus() == SdcSingleControllerStatus.BUSY) {\r
+            throw new SdcControllerException("Cannot close the ASDC controller as it's currently in BUSY state");\r
+        }\r
+        if (this.distributionClient != null) {\r
+            this.distributionClient.stop();\r
+            // If auto managed we can set it to Null, SdcController controls it.\r
+            // In the other case the client of this class has specified it, so\r
+            // we can't reset it\r
+            if (isAsdcClientAutoManaged) {\r
+                // Next init will initialize it with a new Sdc Client\r
+                this.distributionClient = null;\r
+            }\r
+        }\r
+        this.changeControllerStatus(SdcSingleControllerStatus.STOPPED);\r
+    }\r
+\r
+    /**\r
+     * This method processes the notification received from Sdc.\r
+     * \r
+     * @param iNotif\r
+     *            The INotificationData\r
+     */\r
+    public void treatNotification(INotificationData iNotif) {\r
+        CsarHandler csar = null;\r
+        try {\r
+            logger.info("Notification received for service UUID:" + iNotif.getServiceUUID());\r
+            this.changeControllerStatus(SdcSingleControllerStatus.BUSY);\r
+            csar = new CsarHandler(iNotif, this.sdcConfig.getSdcControllerName(),\r
+                    refProp.getStringValue(CONFIG_SDC_FOLDER));\r
+            if (resourceInstaller.isCsarAlreadyDeployed(csar)) {\r
+                csar.save(downloadTheArtifact(csar.getArtifactElement()));\r
+                this.sendASDCNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),\r
+                        sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DOWNLOAD_OK, null,\r
+                        System.currentTimeMillis());\r
+                resourceInstaller.installTheCsar(csar);\r
+                this.sendASDCNotification(NotificationType.DEPLOY, csar.getArtifactElement().getArtifactURL(),\r
+                        sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DEPLOY_OK, null,\r
+                        System.currentTimeMillis());\r
+            } else {\r
+                this.sendASDCNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),\r
+                        sdcConfig.getConsumerID(), iNotif.getDistributionID(),\r
+                        DistributionStatusEnum.ALREADY_DOWNLOADED, null, System.currentTimeMillis());\r
+                this.sendASDCNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),\r
+                        sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.ALREADY_DEPLOYED,\r
+                        null, System.currentTimeMillis());\r
+            }\r
+        } catch (SdcArtifactInstallerException e) {\r
+            logger.error("SdcArtifactInstallerException exception caught during the notification processing", e);\r
+            this.sendASDCNotification(NotificationType.DEPLOY, csar.getArtifactElement().getArtifactURL(),\r
+                    sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DEPLOY_ERROR,\r
+                    e.getMessage(), System.currentTimeMillis());\r
+        } catch (SdcDownloadException e) {\r
+            logger.error("SdcDownloadException exception caught during the notification processing", e);\r
+            this.sendASDCNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),\r
+                    sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DOWNLOAD_ERROR,\r
+                    e.getMessage(), System.currentTimeMillis());\r
+        } catch (CsarHandlerException e) {\r
+            logger.error("CsarHandlerException exception caught during the notification processing", e);\r
+            this.sendASDCNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),\r
+                    sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DOWNLOAD_ERROR,\r
+                    e.getMessage(), System.currentTimeMillis());\r
+        } catch (SdcToscaParserException e) {\r
+            this.sendASDCNotification(NotificationType.DEPLOY, csar.getArtifactElement().getArtifactURL(),\r
+                    sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DEPLOY_ERROR,\r
+                    e.getMessage(), System.currentTimeMillis());\r
+        } catch (RuntimeException e) {\r
+            logger.error("Unexpected exception caught during the notification processing", e);\r
+        } finally {\r
+            this.changeControllerStatus(SdcSingleControllerStatus.IDLE);\r
+        }\r
+    }\r
+\r
+    private enum NotificationType {\r
+        DOWNLOAD, DEPLOY\r
+    }\r
+\r
+    private IDistributionClientDownloadResult downloadTheArtifact(IArtifactInfo artifact) throws SdcDownloadException {\r
+        logger.debug("Trying to download the artifact : " + artifact.getArtifactURL() + " UUID: "\r
+                + artifact.getArtifactUUID());\r
+        IDistributionClientDownloadResult downloadResult;\r
+        try {\r
+            downloadResult = distributionClient.download(artifact);\r
+            if (null == downloadResult) {\r
+                logger.info("downloadResult is Null for: " + artifact.getArtifactUUID());\r
+                return null;\r
+            }\r
+        } catch (RuntimeException e) {\r
+            throw new SdcDownloadException("Exception caught when downloading the artifact", e);\r
+        }\r
+        if (DistributionActionResultEnum.SUCCESS.equals(downloadResult.getDistributionActionResult())) {\r
+            logger.info("Successfully downloaded the artifact " + artifact.getArtifactURL() + " UUID "\r
+                    + artifact.getArtifactUUID() + "Size of payload " + downloadResult.getArtifactPayload().length);\r
+        } else {\r
+            throw new SdcDownloadException("Artifact " + artifact.getArtifactName()\r
+                    + " could not be downloaded from ASDC URL " + artifact.getArtifactURL() + " UUID "\r
+                    + artifact.getArtifactUUID() + ")" + System.lineSeparator() + "Error message is "\r
+                    + downloadResult.getDistributionMessageResult() + System.lineSeparator());\r
+        }\r
+        return downloadResult;\r
+    }\r
+\r
+    private void sendASDCNotification(NotificationType notificationType, String artifactURL, String consumerID,\r
+            String distributionID, DistributionStatusEnum status, String errorReason, long timestamp) {\r
+        String event = "Sending " + notificationType.name() + "(" + status.name() + ")"\r
+                + " notification to ASDC for artifact:" + artifactURL;\r
+        if (errorReason != null) {\r
+            event = event + "(" + errorReason + ")";\r
+        }\r
+        logger.info(event);\r
+        String action = "";\r
+        try {\r
+            IDistributionStatusMessage message = new DistributionStatusMessage(artifactURL, consumerID, distributionID,\r
+                    status, timestamp);\r
+            switch (notificationType) {\r
+                case DOWNLOAD:\r
+                    if (errorReason != null) {\r
+                        this.distributionClient.sendDownloadStatus(message, errorReason);\r
+                    } else {\r
+                        this.distributionClient.sendDownloadStatus(message);\r
+                    }\r
+                    action = "sendDownloadStatus";\r
+                    break;\r
+                case DEPLOY:\r
+                    if (errorReason != null) {\r
+                        this.distributionClient.sendDeploymentStatus(message, errorReason);\r
+                    } else {\r
+                        this.distributionClient.sendDeploymentStatus(message);\r
+                    }\r
+                    action = "sendDeploymentdStatus";\r
+                    break;\r
+                default:\r
+                    break;\r
+            }\r
+        } catch (RuntimeException e) {\r
+            logger.warn("Unable to send the Sdc Notification (" + action + ") due to an exception", e);\r
+        }\r
+        logger.info("Sdc Notification sent successfully(" + action + ")");\r
+    }\r
+}\r
index 270286b..940b7cf 100644 (file)
 
 package org.onap.clamp.clds.sdc.controller.installer;
 
+import com.att.aft.dme2.internal.apache.commons.io.IOUtils;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Enumeration;
 import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
 import org.onap.clamp.clds.exception.sdc.controller.CsarHandlerException;
 import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
@@ -43,28 +49,28 @@ import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
 import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory;
 
 /**
- * CsarDescriptor that will be used to deploy in CLAMP.
+ * CsarDescriptor that will be used to deploy file in CLAMP file system. Some
+ * methods can also be used to get some data from it.
  */
 public class CsarHandler {
 
     private static final EELFLogger logger = EELFManager.getInstance().getLogger(CsarHandler.class);
     private IArtifactInfo artifactElement;
-    private String filePath;
+    private String csarFilePath;
     private String controllerName;
     private SdcToscaParserFactory factory = SdcToscaParserFactory.getInstance();
     private ISdcCsarHelper sdcCsarHelper;
+    private String dcaeBlueprint;
     public static final String CSAR_TYPE = "TOSCA_CSAR";
-    private String csarPath;
 
-    public CsarHandler(INotificationData iNotif, String controller, String sdcCsarPath) throws CsarHandlerException {
-        this.csarPath = sdcCsarPath;
+    public CsarHandler(INotificationData iNotif, String controller, String clampCsarPath) throws CsarHandlerException {
         this.controllerName = controller;
         this.artifactElement = searchForUniqueCsar(iNotif);
-        this.filePath = buildFilePathForCsar(artifactElement);
+        this.csarFilePath = buildFilePathForCsar(artifactElement, clampCsarPath);
     }
 
-    private String buildFilePathForCsar(IArtifactInfo artifactElement) {
-        return csarPath + "/" + controllerName + "/" + artifactElement.getArtifactName();
+    private String buildFilePathForCsar(IArtifactInfo artifactElement, String clampCsarPath) {
+        return clampCsarPath + "/" + controllerName + "/" + artifactElement.getArtifactName();
     }
 
     private IArtifactInfo searchForUniqueCsar(INotificationData iNotif) throws CsarHandlerException {
@@ -77,21 +83,41 @@ public class CsarHandler {
         throw new CsarHandlerException("Unable to find a CSAR in the Sdc Notification");
     }
 
-    public void save(IDistributionClientDownloadResult resultArtifact)
+    public synchronized void save(IDistributionClientDownloadResult resultArtifact)
             throws SdcArtifactInstallerException, SdcToscaParserException {
         try {
             logger.info("Writing CSAR file : " + artifactElement.getArtifactURL() + " UUID "
                     + artifactElement.getArtifactUUID() + ")");
-            Path path = Paths.get(filePath);
+            Path path = Paths.get(csarFilePath);
             Files.createDirectories(path.getParent());
             Files.createFile(path);
-            try (FileOutputStream outFile = new FileOutputStream(filePath)) {
+            try (FileOutputStream outFile = new FileOutputStream(csarFilePath)) {
                 outFile.write(resultArtifact.getArtifactPayload(), 0, resultArtifact.getArtifactPayload().length);
             }
-            sdcCsarHelper = factory.getSdcCsarHelper(filePath);
+            sdcCsarHelper = factory.getSdcCsarHelper(csarFilePath);
+            this.loadDcaeBlueprint();
         } catch (IOException e) {
             throw new SdcArtifactInstallerException(
-                    "Exception caught when trying to write the CSAR on the file system to " + filePath, e);
+                    "Exception caught when trying to write the CSAR on the file system to " + csarFilePath, e);
+        }
+    }
+
+    private void loadDcaeBlueprint() throws IOException, SdcArtifactInstallerException {
+        List<ZipEntry> listEntries = new ArrayList<>();
+        try (ZipFile zipFile = new ZipFile(csarFilePath)) {
+            Enumeration<? extends ZipEntry> entries = zipFile.entries();
+            while (entries.hasMoreElements()) {
+                ZipEntry entry = entries.nextElement();
+                if (entry.getName().contains("DCAE_INVENTORY_BLUEPRINT")) {
+                    listEntries.add(entry);
+                }
+            }
+            if (listEntries.size() > 1) {
+                throw new SdcArtifactInstallerException("There are multiple entries in the DCAE inventory");
+            }
+            try (InputStream stream = zipFile.getInputStream(listEntries.get(0))) {
+                this.dcaeBlueprint = IOUtils.toString(stream);
+            }
         }
     }
 
@@ -100,10 +126,14 @@ public class CsarHandler {
     }
 
     public String getFilePath() {
-        return filePath;
+        return csarFilePath;
     }
 
-    public ISdcCsarHelper getSdcCsarHelper() {
+    public synchronized ISdcCsarHelper getSdcCsarHelper() {
         return sdcCsarHelper;
     }
+
+    public synchronized String getDcaeBlueprint() {
+        return dcaeBlueprint;
+    }
 }
diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstaller.java b/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstaller.java
new file mode 100644 (file)
index 0000000..739fc06
--- /dev/null
@@ -0,0 +1,33 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+package org.onap.clamp.clds.sdc.controller.installer;
+
+import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
+
+public interface CsarInstaller {
+
+    boolean isCsarAlreadyDeployed(CsarHandler csar) throws SdcArtifactInstallerException;
+
+    public void installTheCsar(CsarHandler csar) throws SdcArtifactInstallerException;
+}
diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstallerImpl.java b/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstallerImpl.java
new file mode 100644 (file)
index 0000000..c56eed5
--- /dev/null
@@ -0,0 +1,147 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+package org.onap.clamp.clds.sdc.controller.installer;
+
+import com.att.aft.dme2.internal.apache.commons.io.IOUtils;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+
+import org.onap.clamp.clds.config.ClampProperties;
+import org.onap.clamp.clds.config.sdc.BlueprintParserFilesConfiguration;
+import org.onap.clamp.clds.config.sdc.BlueprintParserMappingConfiguration;
+import org.onap.clamp.clds.dao.CldsDao;
+import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
+import org.onap.clamp.clds.model.CldsModel;
+import org.onap.clamp.clds.model.CldsTemplate;
+import org.onap.clamp.clds.service.CldsService;
+import org.onap.clamp.clds.service.CldsTemplateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Component;
+import org.yaml.snakeyaml.Yaml;
+
+@Component
+public class CsarInstallerImpl implements CsarInstaller {
+
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(CsarInstallerImpl.class);
+    private Map<String, BlueprintParserFilesConfiguration> bpmnMapping = new HashMap<>();
+    public static final String TEMPLATE_NAME_SUFFIX = "-template-dcae-designer";
+    public static final String MODEL_NAME_SUFFIX = "-model-dcae-designer";
+    /**
+     * The file name that will be loaded by Spring.
+     */
+    @Value("${clamp.config.sdc.blueprint.parser.mapping:'classpath:/clds/blueprint-parser-mapping.json'}")
+    protected String blueprintMappingFile;
+    @Autowired
+    protected ApplicationContext appContext;
+    @Autowired
+    private CldsDao cldsDao;
+    @Autowired
+    private ClampProperties refProp;
+    @Autowired
+    CldsTemplateService cldsTemplateService;
+    @Autowired
+    CldsService cldsService;
+
+    @PostConstruct
+    public void loadConfiguration() throws IOException {
+        BlueprintParserMappingConfiguration
+                .createFromJson(appContext.getResource(blueprintMappingFile).getInputStream()).stream()
+                .forEach(e -> bpmnMapping.put(e.getBlueprintKey(), e.getFiles()));
+    }
+
+    @Override
+    public boolean isCsarAlreadyDeployed(CsarHandler csar) throws SdcArtifactInstallerException {
+        return false;
+    }
+
+    @Override
+    public void installTheCsar(CsarHandler csar) throws SdcArtifactInstallerException {
+        try {
+            BlueprintParserFilesConfiguration configFiles = this.searchForRightMapping(csar);
+            createFakeCldsModel(csar, configFiles, createFakeCldsTemplate(csar, configFiles));
+        } catch (IOException e) {
+            throw new SdcArtifactInstallerException("Exception caught during the Csar installation in database", e);
+        }
+    }
+
+    private BlueprintParserFilesConfiguration searchForRightMapping(CsarHandler csar)
+            throws SdcArtifactInstallerException {
+        List<BlueprintParserFilesConfiguration> listConfig = new ArrayList<>();
+        Yaml yaml = new Yaml();
+        Map<String, Object> templateNodes = ((Map<String, Object>) ((Map<String, Object>) yaml
+                .load(csar.getDcaeBlueprint())).get("node_templates"));
+        bpmnMapping.entrySet().forEach(e -> {
+            if (templateNodes.keySet().stream().anyMatch(t -> t.contains(e.getKey()))) {
+                listConfig.add(e.getValue());
+            }
+        });
+        if (listConfig.size() > 1) {
+            throw new SdcArtifactInstallerException(
+                    "The code does not currently support multiple MicroServices in the blueprint");
+        } else if (listConfig.isEmpty()) {
+            throw new SdcArtifactInstallerException("There is no recognized MicroService found in the blueprint");
+        }
+        return listConfig.get(0);
+    }
+
+    private String createTemplateName(CsarHandler csar) {
+        return csar.getSdcCsarHelper().getServiceMetadata().getValue("name") + TEMPLATE_NAME_SUFFIX;
+    }
+
+    private String createModelName(CsarHandler csar) {
+        return csar.getSdcCsarHelper().getServiceMetadata().getValue("name") + MODEL_NAME_SUFFIX;
+    }
+
+    private CldsTemplate createFakeCldsTemplate(CsarHandler csar, BlueprintParserFilesConfiguration configFiles)
+            throws IOException, SdcArtifactInstallerException {
+        CldsTemplate template = new CldsTemplate();
+        template.setBpmnId("Sdc-Generated");
+        template.setBpmnText(
+                IOUtils.toString(appContext.getResource(configFiles.getBpmnXmlFilePath()).getInputStream()));
+        // ((ObjectNode)refProp.getJsonTemplate(CldsService.GLOBAL_PROPERTIES_KEY));
+        template.setPropText(csar.getDcaeBlueprint());
+        template.setImageText(
+                IOUtils.toString(appContext.getResource(configFiles.getSvgXmlFilePath()).getInputStream()));
+        return cldsTemplateService.putTemplate(createTemplateName(csar), template);
+    }
+
+    private CldsModel createFakeCldsModel(CsarHandler csar, BlueprintParserFilesConfiguration configFiles,
+            CldsTemplate cldsTemplate) {
+        CldsModel cldsModel = new CldsModel();
+        cldsModel.setBlueprintText(csar.getDcaeBlueprint());
+        cldsModel.setTemplateName(cldsTemplate.getName());
+        // cldsModel.set
+        return cldsService.putModel(createModelName(csar), cldsModel);
+    }
+}
index 675f3cf..9d6cb08 100644 (file)
@@ -68,13 +68,13 @@ import org.onap.clamp.clds.dao.CldsDao;
 import org.onap.clamp.clds.exception.CldsConfigException;
 import org.onap.clamp.clds.exception.policy.PolicyClientException;
 import org.onap.clamp.clds.exception.sdc.SdcCommunicationException;
-import org.onap.clamp.clds.model.CldsMonitoringDetails;
 import org.onap.clamp.clds.model.CldsDbServiceCache;
 import org.onap.clamp.clds.model.CldsEvent;
 import org.onap.clamp.clds.model.CldsHealthCheck;
 import org.onap.clamp.clds.model.CldsInfo;
 import org.onap.clamp.clds.model.CldsModel;
 import org.onap.clamp.clds.model.CldsModelProp;
+import org.onap.clamp.clds.model.CldsMonitoringDetails;
 import org.onap.clamp.clds.model.CldsServiceData;
 import org.onap.clamp.clds.model.CldsTemplate;
 import org.onap.clamp.clds.model.DcaeEvent;
index 1b03922..7a9ee70 100644 (file)
@@ -38,7 +38,6 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
-import javax.xml.transform.TransformerException;
 
 import org.onap.clamp.clds.dao.CldsDao;
 import org.onap.clamp.clds.model.CldsTemplate;
@@ -156,8 +155,7 @@ public class CldsTemplateService extends SecureServiceBase {
     @Path("/template/{templateName}")
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
-    public CldsTemplate putTemplate(@PathParam("templateName") String templateName, CldsTemplate cldsTemplate)
-            throws TransformerException, IOException {
+    public CldsTemplate putTemplate(@PathParam("templateName") String templateName, CldsTemplate cldsTemplate) {
         Date startTime = new Date();
         LoggingUtils.setRequestContext("CldsTemplateService: PUT template", getPrincipalName());
         isAuthorized(permissionUpdateTemplate);
@@ -166,15 +164,6 @@ public class CldsTemplateService extends SecureServiceBase {
         logger.info("PUT propText=" + cldsTemplate.getPropText());
         logger.info("PUT imageText=" + cldsTemplate.getImageText());
         cldsTemplate.setName(templateName);
-        String bpmnText = cldsTemplate.getBpmnText();
-        String imageText = cldsTemplate.getImageText();
-        String propText = cldsTemplate.getPropText();
-        cldsTemplate.setBpmnText(bpmnText);
-        cldsTemplate.setImageText(imageText);
-        cldsTemplate.setPropText(propText);
-        logger.info(" bpmnText : " + cldsTemplate.getBpmnText());
-        logger.info(" Image Text : " + cldsTemplate.getImageText());
-        logger.info(" Prop Text : " + cldsTemplate.getPropText());
         cldsTemplate.save(cldsDao, null);
         // audit log
         LoggingUtils.setTimeContext(startTime, new Date());
diff --git a/src/main/resources/META-INF/resources/designer/css/jquery.dataTables_themeroller.css b/src/main/resources/META-INF/resources/designer/css/jquery.dataTables_themeroller.css
deleted file mode 100644 (file)
index 5a56d97..0000000
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * Table styles
- */
-table.dataTable {
-  width: 100%;
-  margin: 0 auto;
-  clear: both;
-  border-collapse: separate;
-  border-spacing: 0;
-  /*
-   * Header and footer styles
-   */
-  /*
-   * Body styles
-   */
-}
-table.dataTable thead th,
-table.dataTable thead td,
-table.dataTable tfoot th,
-table.dataTable tfoot td {
-  padding: 4px 10px;
-}
-table.dataTable thead th,
-table.dataTable tfoot th {
-  font-weight: bold;
-}
-table.dataTable thead th:active,
-table.dataTable thead td:active {
-  outline: none;
-}
-table.dataTable thead .sorting_asc,
-table.dataTable thead .sorting_desc,
-table.dataTable thead .sorting {
-  cursor: pointer;
-  *cursor: hand;
-}
-table.dataTable thead th div.DataTables_sort_wrapper {
-  position: relative;
-  padding-right: 10px;
-}
-table.dataTable thead th div.DataTables_sort_wrapper span {
-  position: absolute;
-  top: 50%;
-  margin-top: -8px;
-  right: -5px;
-}
-table.dataTable thead th.ui-state-default {
-  border-right-width: 0;
-}
-table.dataTable thead th.ui-state-default:last-child {
-  border-right-width: 1px;
-}
-table.dataTable tbody tr {
-  background-color: white;
-}
-table.dataTable tbody tr.selected {
-  background-color: #b0bed9;
-}
-table.dataTable tbody th,
-table.dataTable tbody td {
-  padding: 8px 10px;
-}
-table.dataTable th.center,
-table.dataTable td.center,
-table.dataTable td.dataTables_empty {
-  text-align: center;
-}
-table.dataTable th.right,
-table.dataTable td.right {
-  text-align: right;
-}
-table.dataTable.row-border tbody th, table.dataTable.row-border tbody td, table.dataTable.display tbody th, table.dataTable.display tbody td {
-  border-top: 1px solid #dddddd;
-}
-table.dataTable.row-border tbody tr:first-child th,
-table.dataTable.row-border tbody tr:first-child td, table.dataTable.display tbody tr:first-child th,
-table.dataTable.display tbody tr:first-child td {
-  border-top: none;
-}
-table.dataTable.cell-border tbody th, table.dataTable.cell-border tbody td {
-  border-top: 1px solid #dddddd;
-  border-right: 1px solid #dddddd;
-}
-table.dataTable.cell-border tbody tr th:first-child,
-table.dataTable.cell-border tbody tr td:first-child {
-  border-left: 1px solid #dddddd;
-}
-table.dataTable.cell-border tbody tr:first-child th,
-table.dataTable.cell-border tbody tr:first-child td {
-  border-top: none;
-}
-table.dataTable.stripe tbody tr.odd, table.dataTable.display tbody tr.odd {
-  background-color: #f9f9f9;
-}
-table.dataTable.stripe tbody tr.odd.selected, table.dataTable.display tbody tr.odd.selected {
-  background-color: #abb9d3;
-}
-table.dataTable.hover tbody tr:hover,
-table.dataTable.hover tbody tr.odd:hover,
-table.dataTable.hover tbody tr.even:hover, table.dataTable.display tbody tr:hover,
-table.dataTable.display tbody tr.odd:hover,
-table.dataTable.display tbody tr.even:hover {
-  background-color: whitesmoke;
-}
-table.dataTable.hover tbody tr:hover.selected,
-table.dataTable.hover tbody tr.odd:hover.selected,
-table.dataTable.hover tbody tr.even:hover.selected, table.dataTable.display tbody tr:hover.selected,
-table.dataTable.display tbody tr.odd:hover.selected,
-table.dataTable.display tbody tr.even:hover.selected {
-  background-color: #a9b7d1;
-}
-table.dataTable.order-column tbody tr > .sorting_1,
-table.dataTable.order-column tbody tr > .sorting_2,
-table.dataTable.order-column tbody tr > .sorting_3, table.dataTable.display tbody tr > .sorting_1,
-table.dataTable.display tbody tr > .sorting_2,
-table.dataTable.display tbody tr > .sorting_3 {
-  background-color: #f9f9f9;
-}
-table.dataTable.order-column tbody tr.selected > .sorting_1,
-table.dataTable.order-column tbody tr.selected > .sorting_2,
-table.dataTable.order-column tbody tr.selected > .sorting_3, table.dataTable.display tbody tr.selected > .sorting_1,
-table.dataTable.display tbody tr.selected > .sorting_2,
-table.dataTable.display tbody tr.selected > .sorting_3 {
-  background-color: #acbad4;
-}
-table.dataTable.display tbody tr.odd > .sorting_1, table.dataTable.order-column.stripe tbody tr.odd > .sorting_1 {
-  background-color: #f1f1f1;
-}
-table.dataTable.display tbody tr.odd > .sorting_2, table.dataTable.order-column.stripe tbody tr.odd > .sorting_2 {
-  background-color: #f3f3f3;
-}
-table.dataTable.display tbody tr.odd > .sorting_3, table.dataTable.order-column.stripe tbody tr.odd > .sorting_3 {
-  background-color: whitesmoke;
-}
-table.dataTable.display tbody tr.odd.selected > .sorting_1, table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_1 {
-  background-color: #a6b3cd;
-}
-table.dataTable.display tbody tr.odd.selected > .sorting_2, table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_2 {
-  background-color: #a7b5ce;
-}
-table.dataTable.display tbody tr.odd.selected > .sorting_3, table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_3 {
-  background-color: #a9b6d0;
-}
-table.dataTable.display tbody tr.even > .sorting_1, table.dataTable.order-column.stripe tbody tr.even > .sorting_1 {
-  background-color: #f9f9f9;
-}
-table.dataTable.display tbody tr.even > .sorting_2, table.dataTable.order-column.stripe tbody tr.even > .sorting_2 {
-  background-color: #fbfbfb;
-}
-table.dataTable.display tbody tr.even > .sorting_3, table.dataTable.order-column.stripe tbody tr.even > .sorting_3 {
-  background-color: #fdfdfd;
-}
-table.dataTable.display tbody tr.even.selected > .sorting_1, table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_1 {
-  background-color: #acbad4;
-}
-table.dataTable.display tbody tr.even.selected > .sorting_2, table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_2 {
-  background-color: #adbbd6;
-}
-table.dataTable.display tbody tr.even.selected > .sorting_3, table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_3 {
-  background-color: #afbdd8;
-}
-table.dataTable.display tbody tr:hover > .sorting_1,
-table.dataTable.display tbody tr.odd:hover > .sorting_1,
-table.dataTable.display tbody tr.even:hover > .sorting_1, table.dataTable.order-column.hover tbody tr:hover > .sorting_1,
-table.dataTable.order-column.hover tbody tr.odd:hover > .sorting_1,
-table.dataTable.order-column.hover tbody tr.even:hover > .sorting_1 {
-  background-color: #eaeaea;
-}
-table.dataTable.display tbody tr:hover > .sorting_2,
-table.dataTable.display tbody tr.odd:hover > .sorting_2,
-table.dataTable.display tbody tr.even:hover > .sorting_2, table.dataTable.order-column.hover tbody tr:hover > .sorting_2,
-table.dataTable.order-column.hover tbody tr.odd:hover > .sorting_2,
-table.dataTable.order-column.hover tbody tr.even:hover > .sorting_2 {
-  background-color: #ebebeb;
-}
-table.dataTable.display tbody tr:hover > .sorting_3,
-table.dataTable.display tbody tr.odd:hover > .sorting_3,
-table.dataTable.display tbody tr.even:hover > .sorting_3, table.dataTable.order-column.hover tbody tr:hover > .sorting_3,
-table.dataTable.order-column.hover tbody tr.odd:hover > .sorting_3,
-table.dataTable.order-column.hover tbody tr.even:hover > .sorting_3 {
-  background-color: #eeeeee;
-}
-table.dataTable.display tbody tr:hover.selected > .sorting_1,
-table.dataTable.display tbody tr.odd:hover.selected > .sorting_1,
-table.dataTable.display tbody tr.even:hover.selected > .sorting_1, table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_1,
-table.dataTable.order-column.hover tbody tr.odd:hover.selected > .sorting_1,
-table.dataTable.order-column.hover tbody tr.even:hover.selected > .sorting_1 {
-  background-color: #a1aec7;
-}
-table.dataTable.display tbody tr:hover.selected > .sorting_2,
-table.dataTable.display tbody tr.odd:hover.selected > .sorting_2,
-table.dataTable.display tbody tr.even:hover.selected > .sorting_2, table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_2,
-table.dataTable.order-column.hover tbody tr.odd:hover.selected > .sorting_2,
-table.dataTable.order-column.hover tbody tr.even:hover.selected > .sorting_2 {
-  background-color: #a2afc8;
-}
-table.dataTable.display tbody tr:hover.selected > .sorting_3,
-table.dataTable.display tbody tr.odd:hover.selected > .sorting_3,
-table.dataTable.display tbody tr.even:hover.selected > .sorting_3, table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_3,
-table.dataTable.order-column.hover tbody tr.odd:hover.selected > .sorting_3,
-table.dataTable.order-column.hover tbody tr.even:hover.selected > .sorting_3 {
-  background-color: #a4b2cb;
-}
-
-table.dataTable,
-table.dataTable th,
-table.dataTable td {
-  -webkit-box-sizing: content-box;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-}
-
-/*
- * Control feature layout
- */
-.dataTables_wrapper {
-  position: relative;
-  clear: both;
-  *zoom: 1;
-  zoom: 1;
-}
-.dataTables_wrapper .dataTables_length {
-  float: left;
-}
-.dataTables_wrapper .dataTables_filter {
-  float: right;
-  text-align: right;
-}
-.dataTables_wrapper .dataTables_filter input {
-  margin-left: 0.5em;
-}
-.dataTables_wrapper .dataTables_info {
-  clear: both;
-  float: left;
-  padding-top: 0.55em;
-}
-.dataTables_wrapper .dataTables_paginate {
-  float: right;
-  text-align: right;
-}
-.dataTables_wrapper .dataTables_paginate .fg-button {
-  box-sizing: border-box;
-  display: inline-block;
-  min-width: 1.5em;
-  padding: 0.5em;
-  margin-left: 2px;
-  text-align: center;
-  text-decoration: none !important;
-  cursor: pointer;
-  *cursor: hand;
-  color: #333333 !important;
-  border: 1px solid transparent;
-}
-.dataTables_wrapper .dataTables_paginate .fg-button:active {
-  outline: none;
-}
-.dataTables_wrapper .dataTables_paginate .fg-button:first-child {
-  border-top-left-radius: 3px;
-  border-bottom-left-radius: 3px;
-}
-.dataTables_wrapper .dataTables_paginate .fg-button:last-child {
-  border-top-right-radius: 3px;
-  border-bottom-right-radius: 3px;
-}
-.dataTables_wrapper .dataTables_processing {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  width: 100%;
-  height: 40px;
-  margin-left: -50%;
-  margin-top: -25px;
-  padding-top: 20px;
-  text-align: center;
-  font-size: 1.2em;
-  background-color: white;
-  background: -webkit-gradient(linear, left top, right top, color-stop(0%, rgba(255, 255, 255, 0)), color-stop(25%, rgba(255, 255, 255, 0.9)), color-stop(75%, rgba(255, 255, 255, 0.9)), color-stop(100%, rgba(255, 255, 255, 0)));
-  /* Chrome,Safari4+ */
-  background: -webkit-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%);
-  /* Chrome10+,Safari5.1+ */
-  background: -moz-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%);
-  /* FF3.6+ */
-  background: -ms-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%);
-  /* IE10+ */
-  background: -o-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%);
-  /* Opera 11.10+ */
-  background: linear-gradient(to right, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%);
-  /* W3C */
-}
-.dataTables_wrapper .dataTables_length,
-.dataTables_wrapper .dataTables_filter,
-.dataTables_wrapper .dataTables_info,
-.dataTables_wrapper .dataTables_processing,
-.dataTables_wrapper .dataTables_paginate {
-  color: #333333;
-}
-.dataTables_wrapper .dataTables_scroll {
-  clear: both;
-}
-.dataTables_wrapper .dataTables_scrollBody {
-  *margin-top: -1px;
-  -webkit-overflow-scrolling: touch;
-}
-.dataTables_wrapper .ui-widget-header {
-  font-weight: normal;
-}
-.dataTables_wrapper .ui-toolbar {
-  padding: 8px;
-}
-.dataTables_wrapper:after {
-  visibility: hidden;
-  display: block;
-  content: "";
-  clear: both;
-  height: 0;
-}
-
-@media screen and (max-width: 767px) {
-  .dataTables_wrapper .dataTables_length,
-  .dataTables_wrapper .dataTables_filter,
-  .dataTables_wrapper .dataTables_info,
-  .dataTables_wrapper .dataTables_paginate {
-    float: none;
-    text-align: center;
-  }
-  .dataTables_wrapper .dataTables_filter,
-  .dataTables_wrapper .dataTables_paginate {
-    margin-top: 0.5em;
-  }
-}
diff --git a/src/main/resources/META-INF/resources/designer/css/plugins/dataTables.bootstrap.css b/src/main/resources/META-INF/resources/designer/css/plugins/dataTables.bootstrap.css
deleted file mode 100644 (file)
index c07dac9..0000000
+++ /dev/null
@@ -1,233 +0,0 @@
-div.dataTables_length label {
-    float: left;
-    text-align: left;
-    font-weight: normal;
-}
-
-div.dataTables_length select {
-    width: 75px;
-}
-
-div.dataTables_filter label {
-    float: right;
-    font-weight: normal;
-}
-
-div.dataTables_filter input {
-    width: 16em;
-}
-
-div.dataTables_info {
-    padding-top: 8px;
-}
-
-div.dataTables_paginate {
-    float: right;
-    margin: 0;
-}
-
-div.dataTables_paginate ul.pagination {
-    margin: 2px 0;
-    white-space: nowrap;
-}
-
-table.dataTable,
-table.dataTable td,
-table.dataTable th {
-    -webkit-box-sizing: content-box;
-    -moz-box-sizing: content-box;
-    box-sizing: content-box;
-}
-
-table.dataTable {
-    clear: both;
-    margin-top: 6px !important;
-    margin-bottom: 6px !important;
-    max-width: none !important;
-}
-
-table.dataTable thead .sorting,
-table.dataTable thead .sorting_asc,
-table.dataTable thead .sorting_desc,
-table.dataTable thead .sorting_asc_disabled,
-table.dataTable thead .sorting_desc_disabled {
-    cursor: pointer;
-}
-
-table.dataTable thead .sorting {
-    background: url('../images/sort_both.png') no-repeat center right;
-}
-
-table.dataTable thead .sorting_asc {
-    background: url('../images/sort_asc.png') no-repeat center right;
-}
-
-table.dataTable thead .sorting_desc {
-    background: url('../images/sort_desc.png') no-repeat center right;
-}
-
-table.dataTable thead .sorting_asc_disabled {
-    background: url('../images/sort_asc_disabled.png') no-repeat center right;
-}
-
-table.dataTable thead .sorting_desc_disabled {
-    background: url('../images/sort_desc_disabled.png') no-repeat center right;
-}
-
-table.dataTable th:active {
-    outline: none;
-}
-
-/* Scrolling */
-
-div.dataTables_scrollHead table {
-    margin-bottom: 0 !important;
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
-}
-
-div.dataTables_scrollHead table thead tr:last-child th:first-child,
-div.dataTables_scrollHead table thead tr:last-child td:first-child {
-    border-bottom-left-radius: 0 !important;
-    border-bottom-right-radius: 0 !important;
-}
-
-div.dataTables_scrollBody table {
-    margin-top: 0 !important;
-    margin-bottom: 0 !important;
-    border-top: none;
-}
-
-div.dataTables_scrollBody tbody tr:first-child th,
-div.dataTables_scrollBody tbody tr:first-child td {
-    border-top: none;
-}
-
-div.dataTables_scrollFoot table {
-    margin-top: 0 !important;
-    border-top: none;
-}
-
-/*
- * TableTools styles
- */
-
-.table tbody tr.active td,
-.table tbody tr.active th {
-    color: white;
-    background-color: #08C;
-}
-
-.table tbody tr.active:hover td,
-.table tbody tr.active:hover th {
-    background-color: #0075b0 !important;
-}
-
-.table tbody tr.active a {
-    color: white;
-}
-
-.table-striped tbody tr.active:nth-child(odd) td,
-.table-striped tbody tr.active:nth-child(odd) th {
-    background-color: #017ebc;
-}
-
-table.DTTT_selectable tbody tr {
-    cursor: pointer;
-}
-
-div.DTTT .btn {
-    font-size: 12px;
-    color: #333 !important;
-}
-
-div.DTTT .btn:hover {
-    text-decoration: none !important;
-}
-
-ul.DTTT_dropdown.dropdown-menu {
-    z-index: 2003;
-}
-
-ul.DTTT_dropdown.dropdown-menu a {
-    color: #333 !important; /* needed only when demo_page.css is included */
-}
-
-ul.DTTT_dropdown.dropdown-menu li {
-    position: relative;
-}
-
-ul.DTTT_dropdown.dropdown-menu li:hover a {
-    color: white !important;
-    background-color: #0088cc;
-}
-
-div.DTTT_collection_background {
-    z-index: 2002;
-}
-
-/* TableTools information display */
-
-div.DTTT_print_info.modal {
-    height: 150px;
-    margin-top: -75px;
-    text-align: center;
-}
-
-div.DTTT_print_info h6 {
-    margin: 1em;
-    font-size: 28px;
-    font-weight: normal;
-    line-height: 28px;
-}
-
-div.DTTT_print_info p {
-    font-size: 14px;
-    line-height: 20px;
-}
-
-/*
- * FixedColumns styles
- */
-
-div.DTFC_LeftHeadWrapper table,
-div.DTFC_LeftFootWrapper table,
-div.DTFC_RightHeadWrapper table,
-div.DTFC_RightFootWrapper table,
-table.DTFC_Cloned tr.even {
-    background-color: white;
-}
-
-div.DTFC_RightHeadWrapper table,
-div.DTFC_LeftHeadWrapper table {
-    margin-bottom: 0 !important;
-    border-top-right-radius: 0 !important;
-    border-bottom-left-radius: 0 !important;
-    border-bottom-right-radius: 0 !important;
-}
-
-div.DTFC_RightHeadWrapper table thead tr:last-child th:first-child,
-div.DTFC_RightHeadWrapper table thead tr:last-child td:first-child,
-div.DTFC_LeftHeadWrapper table thead tr:last-child th:first-child,
-div.DTFC_LeftHeadWrapper table thead tr:last-child td:first-child {
-    border-bottom-left-radius: 0 !important;
-    border-bottom-right-radius: 0 !important;
-}
-
-div.DTFC_RightBodyWrapper table,
-div.DTFC_LeftBodyWrapper table {
-    margin-bottom: 0 !important;
-    border-top: none;
-}
-
-div.DTFC_RightBodyWrapper tbody tr:first-child th,
-div.DTFC_RightBodyWrapper tbody tr:first-child td,
-div.DTFC_LeftBodyWrapper tbody tr:first-child th,
-div.DTFC_LeftBodyWrapper tbody tr:first-child td {
-    border-top: none;
-}
-
-div.DTFC_RightFootWrapper table,
-div.DTFC_LeftFootWrapper table {
-    border-top: none;
-}
index 584d2f8..83928a9 100644 (file)
  
 
 <!-- DataTables CSS -->
-<link href="css/dataTables.bootstrap.css" rel="stylesheet">
 <link href="css/jquery.dataTables.css" rel="stylesheet">
 
-<link href="css/dataTables.tableTools.css" rel="stylesheet">
-<link href="css/dataTables.fixedColumns.css" rel="stylesheet">
-
-
 <link href="css/loading-bar.css" rel="stylesheet">
 <link href="css/navmenu.css" rel="stylesheet">
 <link href="css/dialogs.css" rel="stylesheet">
index f626e1a..17f8581 100644 (file)
@@ -178,6 +178,7 @@ clamp.config.sdc.InstanceID=X-ECOMP-InstanceID
 clamp.config.sdc.header.requestId = X-ECOMP-RequestID\r
 #\r
 clamp.config.sdc.csarFolder = /tmp/sdc-controllers\r
+clamp.config.sdc.blueprint.parser.mapping = classpath:/clds/blueprint-parser-mapping.json\r
 #\r
 clamp.config.ui.location.default=classpath:/clds/templates/ui-location-default.json\r
 clamp.config.ui.alarm.default=classpath:/clds/templates/ui-alarm-default.json\r
diff --git a/src/main/resources/clds/blueprint-parser-mapping.json b/src/main/resources/clds/blueprint-parser-mapping.json
new file mode 100644 (file)
index 0000000..a16ef0c
--- /dev/null
@@ -0,0 +1,16 @@
+[
+       {
+               "blueprintKey": "tca_",
+               "files": {
+                       "bpmnXmlFilePath": "classpath:/clds/templates/bpmn/tca-template.xml",
+                       "svgXmlFilePath": "classpath:/clds/templates/bpmn/tca-img.xml"
+               }
+       },
+       {
+               "blueprintKey": "holmes_",
+               "files": {
+                       "bpmnXmlFilePath": "classpath:/clds/templates/bpmn/holmes-template.xml",
+                       "svgXmlFilePath": "classpath:/clds/templates/bpmn/holmes-img.xml"
+               }
+       }
+]
diff --git a/src/main/resources/clds/templates/bpmn/holmes-img.xml b/src/main/resources/clds/templates/bpmn/holmes-img.xml
new file mode 100644 (file)
index 0000000..f84b6a1
--- /dev/null
@@ -0,0 +1,315 @@
+<?xml version="1.0" encoding="utf-8"?>
+\n<!-- created with bpmn-js / http://bpmn.io -->
+\n<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+\n
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+               width="900" height="92" viewBox="44 134 900 92" version="1.1">
+               <defs>
+                               <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10"
+                                               orient="auto" refX="11" refY="10" id="markerSjdype4kmbu">
+                                               <path d="M 1 5 L 11 10 L 1 15 Z"
+                                                               style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;"
+                                                               fill="#000000" />
+                               </marker>
+                               <marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20"
+                                               orient="auto" refX="6" refY="6" id="markerSjdype4kmbw">
+                                               <circle cx="6" cy="6" r="3.5"
+                                                               style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;"
+                                                               fill="#ffffff" stroke="#000000" />
+                               </marker>
+                               <marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20"
+                                               orient="auto" refX="8.5" refY="5" id="markerSjdype4kmby">
+                                               <path d="m 1 5 l 0 -3 l 7 3 l -7 3 z"
+                                                               style="stroke-width: 1; stroke-linecap: butt; stroke-dasharray: 10000, 1;"
+                                                               fill="#ffffff" stroke="#000000" />
+                               </marker>
+                               <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10"
+                                               orient="auto" refX="11" refY="10" id="markerSjdype4kmc0">
+                                               <path d="M 1 5 L 11 10 L 1 15"
+                                                               style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;"
+                                                               fill="#ffffff" stroke="#000000" />
+                               </marker>
+                               <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10"
+                                               orient="auto" refX="-1" refY="10" id="markerSjdype4kmc2">
+                                               <path d="M 0 10 L 8 6 L 16 10 L 8 14 Z"
+                                                               style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;"
+                                                               fill="#ffffff" stroke="#000000" />
+                               </marker>
+                               <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10"
+                                               orient="auto" refX="-5" refY="10" id="markerSjdype4kmc4">
+                                               <path d="M 1 4 L 5 16"
+                                                               style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;"
+                                                               fill="#000000" stroke="#000000" />
+                               </marker>
+               </defs>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="StartEvent_1"
+                                               transform="matrix(1,0,0,1,50,162)" style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="48"
+                                                               height="48"></rect>
+                                               <g class="djs-visual">
+                                                               <circle cx="18" cy="18" r="18" style="stroke-width: 2;"
+                                                                               stroke="#000000" fill="#ffffff"></circle>
+                                               </g>
+                                               <rect x="0" y="0" width="36" height="36"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="StartEvent_1_label"
+                                               transform="matrix(1,0,0,1,23,198)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="Holmes_0bsv00m"
+                                               transform="matrix(1,0,0,1,438,140)" style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="132"
+                                                               height="92"></rect>
+                                               <g class="djs-visual">
+                                                               <rect x="0" y="0" width="120" height="80" rx="0" ry="0"
+                                                                               style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect>
+                                                               <circle cx="15" cy="15" r="10" style="stroke-width: 1;"
+                                                                               stroke="#000000" fill="#ffffff"></circle>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;">
+                                                                               <tspan x="11" y="20">H</tspan>
+                                                               </text>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="39" y="43.5">Holmes</tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="120" height="80"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="VesCollector_1ljyqg8"
+                                               transform="matrix(1,0,0,1,213,140)" style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="132"
+                                                               height="92"></rect>
+                                               <g class="djs-visual">
+                                                               <rect x="0" y="0" width="120" height="80" rx="0" ry="0"
+                                                                               style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect>
+                                                               <polyline points="120,80 120,20 " style="stroke-width: 2;"
+                                                                               fill="none" stroke="#000000"></polyline>
+                                                               <polyline points="20,0 20,80 " style="stroke-width: 2;"
+                                                                               fill="none" stroke="#000000"></polyline>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;">
+                                                                               <tspan x="5" y="14">V</tspan>
+                                                               </text>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;">
+                                                                               <tspan x="5" y="26">E</tspan>
+                                                               </text>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;">
+                                                                               <tspan x="5" y="38">S</tspan>
+                                                               </text>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="25.5" y="43.5">VesCollector</tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="120" height="80"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="Policy_114xo8j"
+                                               transform="matrix(1,0,0,1,678,140)" style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="132"
+                                                               height="92"></rect>
+                                               <g class="djs-visual">
+                                                               <rect x="0" y="0" width="120" height="80" rx="0" ry="0"
+                                                                               style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect>
+                                                               <polyline points="0,40 60,0 " style="stroke-width: 2;"
+                                                                               fill="none" stroke="#000000"></polyline>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="43.5" y="43.5">Policy</tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="120" height="80"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape selected" data-element-id="EndEvent_0b4m6bk"
+                                               transform="matrix(1,0,0,1,901,162)" style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="48"
+                                                               height="48"></rect>
+                                               <g class="djs-visual">
+                                                               <circle cx="18" cy="18" r="18" style="stroke-width: 4;"
+                                                                               stroke="#000000" fill="#ffffff"></circle>
+                                               </g>
+                                               <rect x="0" y="0" width="36" height="36"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                                               <g class=" djs-resizer djs-resizer-nw" transform="matrix(1,0,0,1,0,0)">
+                                                               <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect>
+                                                               <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect>
+                                               </g>
+                                               <g class=" djs-resizer djs-resizer-ne" transform="matrix(0,1,-1,0,36,0)">
+                                                               <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect>
+                                                               <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect>
+                                               </g>
+                                               <g class=" djs-resizer djs-resizer-se" transform="matrix(-1,0,0,-1,36,36)">
+                                                               <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect>
+                                                               <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect>
+                                               </g>
+                                               <g class=" djs-resizer djs-resizer-sw" transform="matrix(0,-1,1,0,0,36)">
+                                                               <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect>
+                                                               <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect>
+                                               </g>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="EndEvent_0b4m6bk_label"
+                                               transform="matrix(1,0,0,1,874,198)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-connection" data-element-id="SequenceFlow_1c9hzec"
+                                               style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="80" y="174" width="139"
+                                                               height="12"></rect>
+                                               <g class="djs-visual">
+                                                               <path d="m  86,180L213,180 "
+                                                                               style="stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmbu&quot;);"
+                                                                               fill="none" stroke="#000000"></path>
+                                               </g>
+                                               <polyline points="86,180 213,180 " style="stroke-opacity: 0; stroke-width: 15;"
+                                                               fill="none" stroke="#ffffff" class="djs-hit"></polyline>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="SequenceFlow_1c9hzec_label"
+                                               transform="matrix(1,0,0,1,104.5,170)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-connection" data-element-id="SequenceFlow_1ig3gix"
+                                               style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="327" y="174" width="117"
+                                                               height="12"></rect>
+                                               <g class="djs-visual">
+                                                               <path d="m  333,180L438,180 "
+                                                                               style="stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmbu&quot;);"
+                                                                               fill="none" stroke="#000000"></path>
+                                               </g>
+                                               <polyline points="333,180 438,180 " style="stroke-opacity: 0; stroke-width: 15;"
+                                                               fill="none" stroke="#ffffff" class="djs-hit"></polyline>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="SequenceFlow_1ig3gix_label"
+                                               transform="matrix(1,0,0,1,340.5,170)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-connection" data-element-id="SequenceFlow_0zwbn2r"
+                                               style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="552" y="174" width="132"
+                                                               height="12"></rect>
+                                               <g class="djs-visual">
+                                                               <path d="m  558,180L678,180 "
+                                                                               style="stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmbu&quot;);"
+                                                                               fill="none" stroke="#000000"></path>
+                                               </g>
+                                               <polyline points="558,180 678,180 " style="stroke-opacity: 0; stroke-width: 15;"
+                                                               fill="none" stroke="#ffffff" class="djs-hit"></polyline>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="SequenceFlow_0zwbn2r_label"
+                                               transform="matrix(1,0,0,1,573,170)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-connection" data-element-id="SequenceFlow_0ox6r95"
+                                               style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="792" y="174" width="115"
+                                                               height="12"></rect>
+                                               <g class="djs-visual">
+                                                               <path d="m  798,180L901,180 "
+                                                                               style="stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmbu&quot;);"
+                                                                               fill="none" stroke="#000000"></path>
+                                               </g>
+                                               <polyline points="798,180 901,180 " style="stroke-opacity: 0; stroke-width: 15;"
+                                                               fill="none" stroke="#ffffff" class="djs-hit"></polyline>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="SequenceFlow_0ox6r95_label"
+                                               transform="matrix(1,0,0,1,804.5,170)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+</svg>
\ No newline at end of file
diff --git a/src/main/resources/clds/templates/bpmn/holmes-template.xml b/src/main/resources/clds/templates/bpmn/holmes-template.xml
new file mode 100644 (file)
index 0000000..0ea1587
--- /dev/null
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+               xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI"
+               xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn">
+               <bpmn:process id="Process_1" isExecutable="false">
+                               <bpmn:startEvent id="StartEvent_1">
+                                               <bpmn:outgoing>SequenceFlow_1c9hzec</bpmn:outgoing>
+                               </bpmn:startEvent>
+                               <bpmn:holmes id="Holmes_0bsv00m">
+                                               <bpmn:incoming>SequenceFlow_1ig3gix</bpmn:incoming>
+                                               <bpmn:outgoing>SequenceFlow_0zwbn2r</bpmn:outgoing>
+                               </bpmn:holmes>
+                               <bpmn:vesCollector id="VesCollector_1ljyqg8">
+                                               <bpmn:incoming>SequenceFlow_1c9hzec</bpmn:incoming>
+                                               <bpmn:outgoing>SequenceFlow_1ig3gix</bpmn:outgoing>
+                               </bpmn:vesCollector>
+                               <bpmn:policy id="Policy_114xo8j">
+                                               <bpmn:incoming>SequenceFlow_0zwbn2r</bpmn:incoming>
+                                               <bpmn:outgoing>SequenceFlow_0ox6r95</bpmn:outgoing>
+                               </bpmn:policy>
+                               <bpmn:endEvent id="EndEvent_0b4m6bk">
+                                               <bpmn:incoming>SequenceFlow_0ox6r95</bpmn:incoming>
+                               </bpmn:endEvent>
+                               <bpmn:sequenceFlow id="SequenceFlow_1c9hzec"
+                                               sourceRef="StartEvent_1" targetRef="VesCollector_1ljyqg8" />
+                               <bpmn:sequenceFlow id="SequenceFlow_1ig3gix"
+                                               sourceRef="VesCollector_1ljyqg8" targetRef="Holmes_0bsv00m" />
+                               <bpmn:sequenceFlow id="SequenceFlow_0zwbn2r"
+                                               sourceRef="Holmes_0bsv00m" targetRef="Policy_114xo8j" />
+                               <bpmn:sequenceFlow id="SequenceFlow_0ox6r95"
+                                               sourceRef="Policy_114xo8j" targetRef="EndEvent_0b4m6bk" />
+               </bpmn:process>
+               <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+                               <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">
+                                               <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2"
+                                                               bpmnElement="StartEvent_1">
+                                                               <dc:Bounds x="50" y="162" width="36" height="36" />
+                                               </bpmndi:BPMNShape>
+                                               <bpmndi:BPMNShape id="Holmes_0bsv00m_di"
+                                                               bpmnElement="Holmes_0bsv00m">
+                                                               <dc:Bounds x="438" y="140" width="120" height="80" />
+                                               </bpmndi:BPMNShape>
+                                               <bpmndi:BPMNShape id="VesCollector_1ljyqg8_di"
+                                                               bpmnElement="VesCollector_1ljyqg8">
+                                                               <dc:Bounds x="213" y="140" width="120" height="80" />
+                                               </bpmndi:BPMNShape>
+                                               <bpmndi:BPMNShape id="Policy_114xo8j_di"
+                                                               bpmnElement="Policy_114xo8j">
+                                                               <dc:Bounds x="678" y="140" width="120" height="80" />
+                                               </bpmndi:BPMNShape>
+                                               <bpmndi:BPMNShape id="EndEvent_0b4m6bk_di"
+                                                               bpmnElement="EndEvent_0b4m6bk">
+                                                               <dc:Bounds x="901" y="162" width="36" height="36" />
+                                                               <bpmndi:BPMNLabel>
+                                                                               <dc:Bounds x="874" y="198" width="90" height="20" />
+                                                               </bpmndi:BPMNLabel>
+                                               </bpmndi:BPMNShape>
+                                               <bpmndi:BPMNEdge id="SequenceFlow_1c9hzec_di"
+                                                               bpmnElement="SequenceFlow_1c9hzec">
+                                                               <di:waypoint xsi:type="dc:Point" x="86" y="180" />
+                                                               <di:waypoint xsi:type="dc:Point" x="213" y="180" />
+                                                               <bpmndi:BPMNLabel>
+                                                                               <dc:Bounds x="104.5" y="170" width="90" height="20" />
+                                                               </bpmndi:BPMNLabel>
+                                               </bpmndi:BPMNEdge>
+                                               <bpmndi:BPMNEdge id="SequenceFlow_1ig3gix_di"
+                                                               bpmnElement="SequenceFlow_1ig3gix">
+                                                               <di:waypoint xsi:type="dc:Point" x="333" y="180" />
+                                                               <di:waypoint xsi:type="dc:Point" x="438" y="180" />
+                                                               <bpmndi:BPMNLabel>
+                                                                               <dc:Bounds x="340.5" y="170" width="90" height="20" />
+                                                               </bpmndi:BPMNLabel>
+                                               </bpmndi:BPMNEdge>
+                                               <bpmndi:BPMNEdge id="SequenceFlow_0zwbn2r_di"
+                                                               bpmnElement="SequenceFlow_0zwbn2r">
+                                                               <di:waypoint xsi:type="dc:Point" x="558" y="180" />
+                                                               <di:waypoint xsi:type="dc:Point" x="678" y="180" />
+                                                               <bpmndi:BPMNLabel>
+                                                                               <dc:Bounds x="573" y="170" width="90" height="20" />
+                                                               </bpmndi:BPMNLabel>
+                                               </bpmndi:BPMNEdge>
+                                               <bpmndi:BPMNEdge id="SequenceFlow_0ox6r95_di"
+                                                               bpmnElement="SequenceFlow_0ox6r95">
+                                                               <di:waypoint xsi:type="dc:Point" x="798" y="180" />
+                                                               <di:waypoint xsi:type="dc:Point" x="901" y="180" />
+                                                               <bpmndi:BPMNLabel>
+                                                                               <dc:Bounds x="804.5" y="170" width="90" height="20" />
+                                                               </bpmndi:BPMNLabel>
+                                               </bpmndi:BPMNEdge>
+                               </bpmndi:BPMNPlane>
+               </bpmndi:BPMNDiagram>
+</bpmn:definitions>
\ No newline at end of file
diff --git a/src/main/resources/clds/templates/bpmn/tca-img.xml b/src/main/resources/clds/templates/bpmn/tca-img.xml
new file mode 100644 (file)
index 0000000..a2ec5af
--- /dev/null
@@ -0,0 +1,309 @@
+<?xml version="1.0" encoding="utf-8"?><!-- created with bpmn-js / http://bpmn.io --><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+               width="924" height="92" viewBox="44 134 924 92" version="1.1">
+               <defs>
+                               <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10"
+                                               orient="auto" refX="11" refY="10" id="markerSjdype4kmnw">
+                                               <path d="M 1 5 L 11 10 L 1 15 Z"
+                                                               style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;"
+                                                               fill="#000000" />
+                               </marker>
+                               <marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20"
+                                               orient="auto" refX="6" refY="6" id="markerSjdype4kmny">
+                                               <circle cx="6" cy="6" r="3.5"
+                                                               style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;"
+                                                               fill="#ffffff" stroke="#000000" />
+                               </marker>
+                               <marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20"
+                                               orient="auto" refX="8.5" refY="5" id="markerSjdype4kmo0">
+                                               <path d="m 1 5 l 0 -3 l 7 3 l -7 3 z"
+                                                               style="stroke-width: 1; stroke-linecap: butt; stroke-dasharray: 10000, 1;"
+                                                               fill="#ffffff" stroke="#000000" />
+                               </marker>
+                               <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10"
+                                               orient="auto" refX="11" refY="10" id="markerSjdype4kmo2">
+                                               <path d="M 1 5 L 11 10 L 1 15"
+                                                               style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;"
+                                                               fill="#ffffff" stroke="#000000" />
+                               </marker>
+                               <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10"
+                                               orient="auto" refX="-1" refY="10" id="markerSjdype4kmo4">
+                                               <path d="M 0 10 L 8 6 L 16 10 L 8 14 Z"
+                                                               style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;"
+                                                               fill="#ffffff" stroke="#000000" />
+                               </marker>
+                               <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10"
+                                               orient="auto" refX="-5" refY="10" id="markerSjdype4kmo6">
+                                               <path d="M 1 4 L 5 16"
+                                                               style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;"
+                                                               fill="#000000" stroke="#000000" />
+                               </marker>
+               </defs>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="StartEvent_1"
+                                               transform="matrix(1,0,0,1,50,162)" style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="48"
+                                                               height="48"></rect>
+                                               <g class="djs-visual">
+                                                               <circle cx="18" cy="18" r="18" style="stroke-width: 2;"
+                                                                               stroke="#000000" fill="#ffffff"></circle>
+                                               </g>
+                                               <rect x="0" y="0" width="36" height="36"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="StartEvent_1_label"
+                                               transform="matrix(1,0,0,1,23,198)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="VesCollector_1g9cmz0"
+                                               transform="matrix(1,0,0,1,207,140)" style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="132"
+                                                               height="92"></rect>
+                                               <g class="djs-visual">
+                                                               <rect x="0" y="0" width="120" height="80" rx="0" ry="0"
+                                                                               style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect>
+                                                               <polyline points="120,80 120,20 " style="stroke-width: 2;"
+                                                                               fill="none" stroke="#000000"></polyline>
+                                                               <polyline points="20,0 20,80 " style="stroke-width: 2;"
+                                                                               fill="none" stroke="#000000"></polyline>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;">
+                                                                               <tspan x="5" y="14">V</tspan>
+                                                               </text>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;">
+                                                                               <tspan x="5" y="26">E</tspan>
+                                                               </text>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;">
+                                                                               <tspan x="5" y="38">S</tspan>
+                                                               </text>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="25.5" y="43.5">VesCollector</tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="120" height="80"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="TCA_1d13unw"
+                                               transform="matrix(1,0,0,1,453,140)" style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="132"
+                                                               height="92"></rect>
+                                               <g class="djs-visual">
+                                                               <rect x="0" y="0" width="120" height="80" rx="0" ry="0"
+                                                                               style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect>
+                                                               <polyline points="0,60 120,60 " style="stroke-width: 2;"
+                                                                               fill="none" stroke="#000000"></polyline>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="48" y="43.5">TCA</tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="120" height="80"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="Policy_12lup3h"
+                                               transform="matrix(1,0,0,1,687,140)" style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="132"
+                                                               height="92"></rect>
+                                               <g class="djs-visual">
+                                                               <rect x="0" y="0" width="120" height="80" rx="0" ry="0"
+                                                                               style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect>
+                                                               <polyline points="0,40 60,0 " style="stroke-width: 2;"
+                                                                               fill="none" stroke="#000000"></polyline>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="43.5" y="43.5">Policy</tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="120" height="80"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape selected" data-element-id="EndEvent_16kg9fx"
+                                               transform="matrix(1,0,0,1,925,162)" style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="48"
+                                                               height="48"></rect>
+                                               <g class="djs-visual">
+                                                               <circle cx="18" cy="18" r="18" style="stroke-width: 4;"
+                                                                               stroke="#000000" fill="#ffffff"></circle>
+                                               </g>
+                                               <rect x="0" y="0" width="36" height="36"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                                               <g class=" djs-resizer djs-resizer-nw" transform="matrix(1,0,0,1,0,0)">
+                                                               <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect>
+                                                               <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect>
+                                               </g>
+                                               <g class=" djs-resizer djs-resizer-ne" transform="matrix(0,1,-1,0,36,0)">
+                                                               <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect>
+                                                               <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect>
+                                               </g>
+                                               <g class=" djs-resizer djs-resizer-se" transform="matrix(-1,0,0,-1,36,36)">
+                                                               <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect>
+                                                               <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect>
+                                               </g>
+                                               <g class=" djs-resizer djs-resizer-sw" transform="matrix(0,-1,1,0,0,36)">
+                                                               <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect>
+                                                               <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect>
+                                               </g>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="EndEvent_16kg9fx_label"
+                                               transform="matrix(1,0,0,1,898,198)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-connection" data-element-id="SequenceFlow_1ahk7jg"
+                                               style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="80" y="174" width="133"
+                                                               height="12"></rect>
+                                               <g class="djs-visual">
+                                                               <path d="m  86,180L207,180 "
+                                                                               style="stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);"
+                                                                               fill="none" stroke="#000000"></path>
+                                               </g>
+                                               <polyline points="86,180 207,180 " style="stroke-opacity: 0; stroke-width: 15;"
+                                                               fill="none" stroke="#ffffff" class="djs-hit"></polyline>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="SequenceFlow_1ahk7jg_label"
+                                               transform="matrix(1,0,0,1,101.5,170)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-connection" data-element-id="SequenceFlow_18ahat1"
+                                               style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="321" y="174" width="138"
+                                                               height="12"></rect>
+                                               <g class="djs-visual">
+                                                               <path d="m  327,180L453,180 "
+                                                                               style="stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);"
+                                                                               fill="none" stroke="#000000"></path>
+                                               </g>
+                                               <polyline points="327,180 453,180 " style="stroke-opacity: 0; stroke-width: 15;"
+                                                               fill="none" stroke="#ffffff" class="djs-hit"></polyline>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="SequenceFlow_18ahat1_label"
+                                               transform="matrix(1,0,0,1,345,170)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-connection" data-element-id="SequenceFlow_1mo9gxb"
+                                               style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="567" y="174" width="126"
+                                                               height="12"></rect>
+                                               <g class="djs-visual">
+                                                               <path d="m  573,180L687,180 "
+                                                                               style="stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);"
+                                                                               fill="none" stroke="#000000"></path>
+                                               </g>
+                                               <polyline points="573,180 687,180 " style="stroke-opacity: 0; stroke-width: 15;"
+                                                               fill="none" stroke="#ffffff" class="djs-hit"></polyline>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="SequenceFlow_1mo9gxb_label"
+                                               transform="matrix(1,0,0,1,585,170)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-connection" data-element-id="SequenceFlow_1dgtrrq"
+                                               style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="801" y="174" width="130"
+                                                               height="12"></rect>
+                                               <g class="djs-visual">
+                                                               <path d="m  807,180L925,180 "
+                                                                               style="stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);"
+                                                                               fill="none" stroke="#000000"></path>
+                                               </g>
+                                               <polyline points="807,180 925,180 " style="stroke-opacity: 0; stroke-width: 15;"
+                                                               fill="none" stroke="#ffffff" class="djs-hit"></polyline>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="SequenceFlow_1dgtrrq_label"
+                                               transform="matrix(1,0,0,1,821,170)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+</svg>
\ No newline at end of file
diff --git a/src/main/resources/clds/templates/bpmn/tca-template.xml b/src/main/resources/clds/templates/bpmn/tca-template.xml
new file mode 100644 (file)
index 0000000..cc942ef
--- /dev/null
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+               xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI"
+               xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn">
+               <bpmn:process id="Process_1" isExecutable="false">
+                               <bpmn:startEvent id="StartEvent_1">
+                                               <bpmn:outgoing>SequenceFlow_1ahk7jg</bpmn:outgoing>
+                               </bpmn:startEvent>
+                               <bpmn:vesCollector id="VesCollector_1g9cmz0">
+                                               <bpmn:incoming>SequenceFlow_1ahk7jg</bpmn:incoming>
+                                               <bpmn:outgoing>SequenceFlow_18ahat1</bpmn:outgoing>
+                               </bpmn:vesCollector>
+                               <bpmn:tCA id="TCA_1d13unw">
+                                               <bpmn:incoming>SequenceFlow_18ahat1</bpmn:incoming>
+                                               <bpmn:outgoing>SequenceFlow_1mo9gxb</bpmn:outgoing>
+                               </bpmn:tCA>
+                               <bpmn:policy id="Policy_12lup3h">
+                                               <bpmn:incoming>SequenceFlow_1mo9gxb</bpmn:incoming>
+                                               <bpmn:outgoing>SequenceFlow_1dgtrrq</bpmn:outgoing>
+                               </bpmn:policy>
+                               <bpmn:endEvent id="EndEvent_16kg9fx">
+                                               <bpmn:incoming>SequenceFlow_1dgtrrq</bpmn:incoming>
+                               </bpmn:endEvent>
+                               <bpmn:sequenceFlow id="SequenceFlow_1ahk7jg"
+                                               sourceRef="StartEvent_1" targetRef="VesCollector_1g9cmz0" />
+                               <bpmn:sequenceFlow id="SequenceFlow_18ahat1"
+                                               sourceRef="VesCollector_1g9cmz0" targetRef="TCA_1d13unw" />
+                               <bpmn:sequenceFlow id="SequenceFlow_1mo9gxb"
+                                               sourceRef="TCA_1d13unw" targetRef="Policy_12lup3h" />
+                               <bpmn:sequenceFlow id="SequenceFlow_1dgtrrq"
+                                               sourceRef="Policy_12lup3h" targetRef="EndEvent_16kg9fx" />
+               </bpmn:process>
+               <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+                               <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">
+                                               <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2"
+                                                               bpmnElement="StartEvent_1">
+                                                               <dc:Bounds x="50" y="162" width="36" height="36" />
+                                               </bpmndi:BPMNShape>
+                                               <bpmndi:BPMNShape id="VesCollector_1g9cmz0_di"
+                                                               bpmnElement="VesCollector_1g9cmz0">
+                                                               <dc:Bounds x="207" y="140" width="120" height="80" />
+                                               </bpmndi:BPMNShape>
+                                               <bpmndi:BPMNShape id="TCA_1d13unw_di"
+                                                               bpmnElement="TCA_1d13unw">
+                                                               <dc:Bounds x="453" y="140" width="120" height="80" />
+                                               </bpmndi:BPMNShape>
+                                               <bpmndi:BPMNShape id="Policy_12lup3h_di"
+                                                               bpmnElement="Policy_12lup3h">
+                                                               <dc:Bounds x="687" y="140" width="120" height="80" />
+                                               </bpmndi:BPMNShape>
+                                               <bpmndi:BPMNShape id="EndEvent_16kg9fx_di"
+                                                               bpmnElement="EndEvent_16kg9fx">
+                                                               <dc:Bounds x="925" y="162" width="36" height="36" />
+                                                               <bpmndi:BPMNLabel>
+                                                                               <dc:Bounds x="898" y="198" width="90" height="20" />
+                                                               </bpmndi:BPMNLabel>
+                                               </bpmndi:BPMNShape>
+                                               <bpmndi:BPMNEdge id="SequenceFlow_1ahk7jg_di"
+                                                               bpmnElement="SequenceFlow_1ahk7jg">
+                                                               <di:waypoint xsi:type="dc:Point" x="86" y="180" />
+                                                               <di:waypoint xsi:type="dc:Point" x="207" y="180" />
+                                                               <bpmndi:BPMNLabel>
+                                                                               <dc:Bounds x="101.5" y="170" width="90" height="20" />
+                                                               </bpmndi:BPMNLabel>
+                                               </bpmndi:BPMNEdge>
+                                               <bpmndi:BPMNEdge id="SequenceFlow_18ahat1_di"
+                                                               bpmnElement="SequenceFlow_18ahat1">
+                                                               <di:waypoint xsi:type="dc:Point" x="327" y="180" />
+                                                               <di:waypoint xsi:type="dc:Point" x="453" y="180" />
+                                                               <bpmndi:BPMNLabel>
+                                                                               <dc:Bounds x="345" y="170" width="90" height="20" />
+                                                               </bpmndi:BPMNLabel>
+                                               </bpmndi:BPMNEdge>
+                                               <bpmndi:BPMNEdge id="SequenceFlow_1mo9gxb_di"
+                                                               bpmnElement="SequenceFlow_1mo9gxb">
+                                                               <di:waypoint xsi:type="dc:Point" x="573" y="180" />
+                                                               <di:waypoint xsi:type="dc:Point" x="687" y="180" />
+                                                               <bpmndi:BPMNLabel>
+                                                                               <dc:Bounds x="585" y="170" width="90" height="20" />
+                                                               </bpmndi:BPMNLabel>
+                                               </bpmndi:BPMNEdge>
+                                               <bpmndi:BPMNEdge id="SequenceFlow_1dgtrrq_di"
+                                                               bpmnElement="SequenceFlow_1dgtrrq">
+                                                               <di:waypoint xsi:type="dc:Point" x="807" y="180" />
+                                                               <di:waypoint xsi:type="dc:Point" x="925" y="180" />
+                                                               <bpmndi:BPMNLabel>
+                                                                               <dc:Bounds x="821" y="170" width="90" height="20" />
+                                                               </bpmndi:BPMNLabel>
+                                               </bpmndi:BPMNEdge>
+                               </bpmndi:BPMNPlane>
+               </bpmndi:BPMNDiagram>
+
+</bpmn:definitions>
\ No newline at end of file
index 1caa637..be2997a 100644 (file)
@@ -35,7 +35,6 @@ import java.security.Principal;
 import java.util.List;
 
 import javax.ws.rs.core.SecurityContext;
-import javax.xml.transform.TransformerException;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -93,13 +92,7 @@ public class CldsTemplateServiceItCase {
         cldsTemplate.setBpmnText(bpmnText);
         cldsTemplate.setImageText(imageText);
         cldsTemplate.setPropText(bpmnPropText);
-        try {
-            cldsTemplateService.putTemplate("testModel", cldsTemplate);
-        } catch (IOException e) {
-            logger.error("IOException while saving template", e);
-        } catch (TransformerException ex) {
-            logger.error("Transforming exception while saving template.", ex);
-        }
+        cldsTemplateService.putTemplate("testModel", cldsTemplate);
     }
 
     @Test
diff --git a/src/test/java/org/onap/clamp/clds/it/sdc/controller/installer/CsarInstallerItCase.java b/src/test/java/org/onap/clamp/clds/it/sdc/controller/installer/CsarInstallerItCase.java
new file mode 100644 (file)
index 0000000..94adfaf
--- /dev/null
@@ -0,0 +1,102 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+package org.onap.clamp.clds.it.sdc.controller.installer;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import com.att.aft.dme2.internal.apache.commons.io.IOUtils;
+import com.att.aft.dme2.internal.apache.commons.lang.RandomStringUtils;
+
+import java.io.IOException;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.onap.clamp.clds.dao.CldsDao;
+import org.onap.clamp.clds.exception.sdc.controller.CsarHandlerException;
+import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
+import org.onap.clamp.clds.model.CldsTemplate;
+import org.onap.clamp.clds.sdc.controller.installer.CsarHandler;
+import org.onap.clamp.clds.sdc.controller.installer.CsarInstaller;
+import org.onap.clamp.clds.sdc.controller.installer.CsarInstallerImpl;
+import org.onap.clamp.clds.util.ResourceFileUtil;
+import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.openecomp.sdc.toscaparser.api.elements.Metadata;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.util.ReflectionTestUtils;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class CsarInstallerItCase {
+
+    private static final String sdcFolder = "/tmp/csar-handler-tests";
+    private static final String csarArtifactName = "testArtifact.csar";
+    @Autowired
+    private CsarInstaller csarInstaller;
+    @Autowired
+    private CldsDao cldsDao;
+
+    private void loadFile(String fileName) throws IOException {
+        ReflectionTestUtils.setField(csarInstaller, "blueprintMappingFile", fileName);
+        ((CsarInstallerImpl) csarInstaller).loadConfiguration();
+    }
+
+    @Test(expected = SdcArtifactInstallerException.class)
+    public void testInstallTheCsarFail()
+            throws SdcArtifactInstallerException, SdcToscaParserException, CsarHandlerException, IOException {
+        CsarHandler csarHandler = Mockito.mock(CsarHandler.class);
+        Mockito.when(csarHandler.getDcaeBlueprint()).thenReturn(IOUtils
+                .toString(ResourceFileUtil.getResourceAsStream("example/sdc/blueprint-dcae/not-recognized.yaml")));
+        csarInstaller.installTheCsar(csarHandler);
+        fail("Should have raised an SdcArtifactInstallerException");
+    }
+
+    @Test()
+    public void testInstallTheCsarTca()
+            throws SdcArtifactInstallerException, SdcToscaParserException, CsarHandlerException, IOException {
+        String generatedName = RandomStringUtils.randomAlphanumeric(5);
+        CsarHandler csarHandler = Mockito.mock(CsarHandler.class);
+        Mockito.when(csarHandler.getDcaeBlueprint()).thenReturn(
+                IOUtils.toString(ResourceFileUtil.getResourceAsStream("example/sdc/blueprint-dcae/tca.yaml")));
+        ISdcCsarHelper csarHelper = Mockito.mock(ISdcCsarHelper.class);
+        Metadata data = Mockito.mock(Metadata.class);
+        Mockito.when(data.getValue("name")).thenReturn(generatedName);
+        Mockito.when(csarHelper.getServiceMetadata()).thenReturn(data);
+        Mockito.when(csarHandler.getSdcCsarHelper()).thenReturn(csarHelper);
+        csarInstaller.installTheCsar(csarHandler);
+        // Get it back from DB
+        CldsTemplate templateFromDB = CldsTemplate.retrieve(cldsDao,
+                generatedName + CsarInstallerImpl.TEMPLATE_NAME_SUFFIX, false);
+        assertNotNull(templateFromDB);
+        assertNotNull(templateFromDB.getBpmnText());
+        assertNotNull(templateFromDB.getImageText());
+        assertNotNull(templateFromDB.getPropText());
+        assertEquals(templateFromDB.getName(), generatedName + CsarInstallerImpl.TEMPLATE_NAME_SUFFIX);
+    }
+}
index d1b177d..34805d8 100644 (file)
@@ -38,7 +38,6 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.AfterClass;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.onap.clamp.clds.exception.sdc.controller.CsarHandlerException;
@@ -54,13 +53,6 @@ public class CsarHandlerTest {
     private static final String sdcFolder = "/tmp/csar-handler-tests";
     private static final String csarArtifactName = "testArtifact.csar";
 
-    @AfterClass
-    public static void removeAllFiles() throws IOException {
-        // Do some cleanup
-        Path path = Paths.get(sdcFolder + "/test-controller/" + csarArtifactName);
-        Files.deleteIfExists(path);
-    }
-
     @Test
     public void testConstructor() throws CsarHandlerException {
         IArtifactInfo serviceArtifact = Mockito.mock(IArtifactInfo.class);
@@ -96,9 +88,18 @@ public class CsarHandlerTest {
         IDistributionClientDownloadResult resultArtifact = Mockito.mock(IDistributionClientDownloadResult.class);
         Mockito.when(resultArtifact.getArtifactPayload()).thenReturn(
                 IOUtils.toByteArray(ResourceFileUtil.getResourceAsStream("example/sdc/service-Simsfoimap0112.csar")));
+        // Test the save
         csar.save(resultArtifact);
         assertTrue((new File(sdcFolder + "/test-controller/" + csarArtifactName)).exists());
         assertEquals(csarArtifactName, csar.getArtifactElement().getArtifactName());
         assertNotNull(csar.getSdcCsarHelper());
+        // Test dcaeBlueprint
+        String blueprint = csar.getDcaeBlueprint();
+        assertNotNull(blueprint);
+        assertTrue(!blueprint.isEmpty());
+        assertTrue(blueprint.contains("DCAE-VES-PM-EVENT-v1"));
+        // Do some cleanup
+        Path path = Paths.get(sdcFolder + "/test-controller/" + csarArtifactName);
+        Files.deleteIfExists(path);
     }
 }
index 413cfe7..ad03552 100644 (file)
@@ -178,6 +178,7 @@ clamp.config.sdc.InstanceID=X-ECOMP-InstanceID
 clamp.config.sdc.header.requestId = X-ECOMP-RequestID\r
 #\r
 clamp.config.sdc.csarFolder = /tmp/sdc-tests\r
+clamp.config.sdc.blueprint.parser.mapping = classpath:/clds/blueprint-parser-mapping.json\r
 #\r
 clamp.config.ui.location.default=classpath:/clds/templates/ui-location-default.json\r
 clamp.config.ui.alarm.default=classpath:/clds/templates/ui-alarm-default.json\r
diff --git a/src/test/resources/clds/blueprint-parser-mapping.json b/src/test/resources/clds/blueprint-parser-mapping.json
new file mode 100644 (file)
index 0000000..a16ef0c
--- /dev/null
@@ -0,0 +1,16 @@
+[
+       {
+               "blueprintKey": "tca_",
+               "files": {
+                       "bpmnXmlFilePath": "classpath:/clds/templates/bpmn/tca-template.xml",
+                       "svgXmlFilePath": "classpath:/clds/templates/bpmn/tca-img.xml"
+               }
+       },
+       {
+               "blueprintKey": "holmes_",
+               "files": {
+                       "bpmnXmlFilePath": "classpath:/clds/templates/bpmn/holmes-template.xml",
+                       "svgXmlFilePath": "classpath:/clds/templates/bpmn/holmes-img.xml"
+               }
+       }
+]
diff --git a/src/test/resources/clds/templates/bpmn/holmes-img.xml b/src/test/resources/clds/templates/bpmn/holmes-img.xml
new file mode 100644 (file)
index 0000000..f84b6a1
--- /dev/null
@@ -0,0 +1,315 @@
+<?xml version="1.0" encoding="utf-8"?>
+\n<!-- created with bpmn-js / http://bpmn.io -->
+\n<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+\n
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+               width="900" height="92" viewBox="44 134 900 92" version="1.1">
+               <defs>
+                               <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10"
+                                               orient="auto" refX="11" refY="10" id="markerSjdype4kmbu">
+                                               <path d="M 1 5 L 11 10 L 1 15 Z"
+                                                               style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;"
+                                                               fill="#000000" />
+                               </marker>
+                               <marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20"
+                                               orient="auto" refX="6" refY="6" id="markerSjdype4kmbw">
+                                               <circle cx="6" cy="6" r="3.5"
+                                                               style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;"
+                                                               fill="#ffffff" stroke="#000000" />
+                               </marker>
+                               <marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20"
+                                               orient="auto" refX="8.5" refY="5" id="markerSjdype4kmby">
+                                               <path d="m 1 5 l 0 -3 l 7 3 l -7 3 z"
+                                                               style="stroke-width: 1; stroke-linecap: butt; stroke-dasharray: 10000, 1;"
+                                                               fill="#ffffff" stroke="#000000" />
+                               </marker>
+                               <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10"
+                                               orient="auto" refX="11" refY="10" id="markerSjdype4kmc0">
+                                               <path d="M 1 5 L 11 10 L 1 15"
+                                                               style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;"
+                                                               fill="#ffffff" stroke="#000000" />
+                               </marker>
+                               <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10"
+                                               orient="auto" refX="-1" refY="10" id="markerSjdype4kmc2">
+                                               <path d="M 0 10 L 8 6 L 16 10 L 8 14 Z"
+                                                               style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;"
+                                                               fill="#ffffff" stroke="#000000" />
+                               </marker>
+                               <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10"
+                                               orient="auto" refX="-5" refY="10" id="markerSjdype4kmc4">
+                                               <path d="M 1 4 L 5 16"
+                                                               style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;"
+                                                               fill="#000000" stroke="#000000" />
+                               </marker>
+               </defs>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="StartEvent_1"
+                                               transform="matrix(1,0,0,1,50,162)" style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="48"
+                                                               height="48"></rect>
+                                               <g class="djs-visual">
+                                                               <circle cx="18" cy="18" r="18" style="stroke-width: 2;"
+                                                                               stroke="#000000" fill="#ffffff"></circle>
+                                               </g>
+                                               <rect x="0" y="0" width="36" height="36"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="StartEvent_1_label"
+                                               transform="matrix(1,0,0,1,23,198)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="Holmes_0bsv00m"
+                                               transform="matrix(1,0,0,1,438,140)" style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="132"
+                                                               height="92"></rect>
+                                               <g class="djs-visual">
+                                                               <rect x="0" y="0" width="120" height="80" rx="0" ry="0"
+                                                                               style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect>
+                                                               <circle cx="15" cy="15" r="10" style="stroke-width: 1;"
+                                                                               stroke="#000000" fill="#ffffff"></circle>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;">
+                                                                               <tspan x="11" y="20">H</tspan>
+                                                               </text>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="39" y="43.5">Holmes</tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="120" height="80"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="VesCollector_1ljyqg8"
+                                               transform="matrix(1,0,0,1,213,140)" style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="132"
+                                                               height="92"></rect>
+                                               <g class="djs-visual">
+                                                               <rect x="0" y="0" width="120" height="80" rx="0" ry="0"
+                                                                               style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect>
+                                                               <polyline points="120,80 120,20 " style="stroke-width: 2;"
+                                                                               fill="none" stroke="#000000"></polyline>
+                                                               <polyline points="20,0 20,80 " style="stroke-width: 2;"
+                                                                               fill="none" stroke="#000000"></polyline>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;">
+                                                                               <tspan x="5" y="14">V</tspan>
+                                                               </text>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;">
+                                                                               <tspan x="5" y="26">E</tspan>
+                                                               </text>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;">
+                                                                               <tspan x="5" y="38">S</tspan>
+                                                               </text>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="25.5" y="43.5">VesCollector</tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="120" height="80"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="Policy_114xo8j"
+                                               transform="matrix(1,0,0,1,678,140)" style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="132"
+                                                               height="92"></rect>
+                                               <g class="djs-visual">
+                                                               <rect x="0" y="0" width="120" height="80" rx="0" ry="0"
+                                                                               style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect>
+                                                               <polyline points="0,40 60,0 " style="stroke-width: 2;"
+                                                                               fill="none" stroke="#000000"></polyline>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="43.5" y="43.5">Policy</tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="120" height="80"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape selected" data-element-id="EndEvent_0b4m6bk"
+                                               transform="matrix(1,0,0,1,901,162)" style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="48"
+                                                               height="48"></rect>
+                                               <g class="djs-visual">
+                                                               <circle cx="18" cy="18" r="18" style="stroke-width: 4;"
+                                                                               stroke="#000000" fill="#ffffff"></circle>
+                                               </g>
+                                               <rect x="0" y="0" width="36" height="36"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                                               <g class=" djs-resizer djs-resizer-nw" transform="matrix(1,0,0,1,0,0)">
+                                                               <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect>
+                                                               <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect>
+                                               </g>
+                                               <g class=" djs-resizer djs-resizer-ne" transform="matrix(0,1,-1,0,36,0)">
+                                                               <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect>
+                                                               <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect>
+                                               </g>
+                                               <g class=" djs-resizer djs-resizer-se" transform="matrix(-1,0,0,-1,36,36)">
+                                                               <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect>
+                                                               <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect>
+                                               </g>
+                                               <g class=" djs-resizer djs-resizer-sw" transform="matrix(0,-1,1,0,0,36)">
+                                                               <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect>
+                                                               <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect>
+                                               </g>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="EndEvent_0b4m6bk_label"
+                                               transform="matrix(1,0,0,1,874,198)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-connection" data-element-id="SequenceFlow_1c9hzec"
+                                               style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="80" y="174" width="139"
+                                                               height="12"></rect>
+                                               <g class="djs-visual">
+                                                               <path d="m  86,180L213,180 "
+                                                                               style="stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmbu&quot;);"
+                                                                               fill="none" stroke="#000000"></path>
+                                               </g>
+                                               <polyline points="86,180 213,180 " style="stroke-opacity: 0; stroke-width: 15;"
+                                                               fill="none" stroke="#ffffff" class="djs-hit"></polyline>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="SequenceFlow_1c9hzec_label"
+                                               transform="matrix(1,0,0,1,104.5,170)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-connection" data-element-id="SequenceFlow_1ig3gix"
+                                               style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="327" y="174" width="117"
+                                                               height="12"></rect>
+                                               <g class="djs-visual">
+                                                               <path d="m  333,180L438,180 "
+                                                                               style="stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmbu&quot;);"
+                                                                               fill="none" stroke="#000000"></path>
+                                               </g>
+                                               <polyline points="333,180 438,180 " style="stroke-opacity: 0; stroke-width: 15;"
+                                                               fill="none" stroke="#ffffff" class="djs-hit"></polyline>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="SequenceFlow_1ig3gix_label"
+                                               transform="matrix(1,0,0,1,340.5,170)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-connection" data-element-id="SequenceFlow_0zwbn2r"
+                                               style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="552" y="174" width="132"
+                                                               height="12"></rect>
+                                               <g class="djs-visual">
+                                                               <path d="m  558,180L678,180 "
+                                                                               style="stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmbu&quot;);"
+                                                                               fill="none" stroke="#000000"></path>
+                                               </g>
+                                               <polyline points="558,180 678,180 " style="stroke-opacity: 0; stroke-width: 15;"
+                                                               fill="none" stroke="#ffffff" class="djs-hit"></polyline>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="SequenceFlow_0zwbn2r_label"
+                                               transform="matrix(1,0,0,1,573,170)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-connection" data-element-id="SequenceFlow_0ox6r95"
+                                               style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="792" y="174" width="115"
+                                                               height="12"></rect>
+                                               <g class="djs-visual">
+                                                               <path d="m  798,180L901,180 "
+                                                                               style="stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmbu&quot;);"
+                                                                               fill="none" stroke="#000000"></path>
+                                               </g>
+                                               <polyline points="798,180 901,180 " style="stroke-opacity: 0; stroke-width: 15;"
+                                                               fill="none" stroke="#ffffff" class="djs-hit"></polyline>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="SequenceFlow_0ox6r95_label"
+                                               transform="matrix(1,0,0,1,804.5,170)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+</svg>
\ No newline at end of file
diff --git a/src/test/resources/clds/templates/bpmn/holmes-template.xml b/src/test/resources/clds/templates/bpmn/holmes-template.xml
new file mode 100644 (file)
index 0000000..0ea1587
--- /dev/null
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+               xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI"
+               xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn">
+               <bpmn:process id="Process_1" isExecutable="false">
+                               <bpmn:startEvent id="StartEvent_1">
+                                               <bpmn:outgoing>SequenceFlow_1c9hzec</bpmn:outgoing>
+                               </bpmn:startEvent>
+                               <bpmn:holmes id="Holmes_0bsv00m">
+                                               <bpmn:incoming>SequenceFlow_1ig3gix</bpmn:incoming>
+                                               <bpmn:outgoing>SequenceFlow_0zwbn2r</bpmn:outgoing>
+                               </bpmn:holmes>
+                               <bpmn:vesCollector id="VesCollector_1ljyqg8">
+                                               <bpmn:incoming>SequenceFlow_1c9hzec</bpmn:incoming>
+                                               <bpmn:outgoing>SequenceFlow_1ig3gix</bpmn:outgoing>
+                               </bpmn:vesCollector>
+                               <bpmn:policy id="Policy_114xo8j">
+                                               <bpmn:incoming>SequenceFlow_0zwbn2r</bpmn:incoming>
+                                               <bpmn:outgoing>SequenceFlow_0ox6r95</bpmn:outgoing>
+                               </bpmn:policy>
+                               <bpmn:endEvent id="EndEvent_0b4m6bk">
+                                               <bpmn:incoming>SequenceFlow_0ox6r95</bpmn:incoming>
+                               </bpmn:endEvent>
+                               <bpmn:sequenceFlow id="SequenceFlow_1c9hzec"
+                                               sourceRef="StartEvent_1" targetRef="VesCollector_1ljyqg8" />
+                               <bpmn:sequenceFlow id="SequenceFlow_1ig3gix"
+                                               sourceRef="VesCollector_1ljyqg8" targetRef="Holmes_0bsv00m" />
+                               <bpmn:sequenceFlow id="SequenceFlow_0zwbn2r"
+                                               sourceRef="Holmes_0bsv00m" targetRef="Policy_114xo8j" />
+                               <bpmn:sequenceFlow id="SequenceFlow_0ox6r95"
+                                               sourceRef="Policy_114xo8j" targetRef="EndEvent_0b4m6bk" />
+               </bpmn:process>
+               <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+                               <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">
+                                               <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2"
+                                                               bpmnElement="StartEvent_1">
+                                                               <dc:Bounds x="50" y="162" width="36" height="36" />
+                                               </bpmndi:BPMNShape>
+                                               <bpmndi:BPMNShape id="Holmes_0bsv00m_di"
+                                                               bpmnElement="Holmes_0bsv00m">
+                                                               <dc:Bounds x="438" y="140" width="120" height="80" />
+                                               </bpmndi:BPMNShape>
+                                               <bpmndi:BPMNShape id="VesCollector_1ljyqg8_di"
+                                                               bpmnElement="VesCollector_1ljyqg8">
+                                                               <dc:Bounds x="213" y="140" width="120" height="80" />
+                                               </bpmndi:BPMNShape>
+                                               <bpmndi:BPMNShape id="Policy_114xo8j_di"
+                                                               bpmnElement="Policy_114xo8j">
+                                                               <dc:Bounds x="678" y="140" width="120" height="80" />
+                                               </bpmndi:BPMNShape>
+                                               <bpmndi:BPMNShape id="EndEvent_0b4m6bk_di"
+                                                               bpmnElement="EndEvent_0b4m6bk">
+                                                               <dc:Bounds x="901" y="162" width="36" height="36" />
+                                                               <bpmndi:BPMNLabel>
+                                                                               <dc:Bounds x="874" y="198" width="90" height="20" />
+                                                               </bpmndi:BPMNLabel>
+                                               </bpmndi:BPMNShape>
+                                               <bpmndi:BPMNEdge id="SequenceFlow_1c9hzec_di"
+                                                               bpmnElement="SequenceFlow_1c9hzec">
+                                                               <di:waypoint xsi:type="dc:Point" x="86" y="180" />
+                                                               <di:waypoint xsi:type="dc:Point" x="213" y="180" />
+                                                               <bpmndi:BPMNLabel>
+                                                                               <dc:Bounds x="104.5" y="170" width="90" height="20" />
+                                                               </bpmndi:BPMNLabel>
+                                               </bpmndi:BPMNEdge>
+                                               <bpmndi:BPMNEdge id="SequenceFlow_1ig3gix_di"
+                                                               bpmnElement="SequenceFlow_1ig3gix">
+                                                               <di:waypoint xsi:type="dc:Point" x="333" y="180" />
+                                                               <di:waypoint xsi:type="dc:Point" x="438" y="180" />
+                                                               <bpmndi:BPMNLabel>
+                                                                               <dc:Bounds x="340.5" y="170" width="90" height="20" />
+                                                               </bpmndi:BPMNLabel>
+                                               </bpmndi:BPMNEdge>
+                                               <bpmndi:BPMNEdge id="SequenceFlow_0zwbn2r_di"
+                                                               bpmnElement="SequenceFlow_0zwbn2r">
+                                                               <di:waypoint xsi:type="dc:Point" x="558" y="180" />
+                                                               <di:waypoint xsi:type="dc:Point" x="678" y="180" />
+                                                               <bpmndi:BPMNLabel>
+                                                                               <dc:Bounds x="573" y="170" width="90" height="20" />
+                                                               </bpmndi:BPMNLabel>
+                                               </bpmndi:BPMNEdge>
+                                               <bpmndi:BPMNEdge id="SequenceFlow_0ox6r95_di"
+                                                               bpmnElement="SequenceFlow_0ox6r95">
+                                                               <di:waypoint xsi:type="dc:Point" x="798" y="180" />
+                                                               <di:waypoint xsi:type="dc:Point" x="901" y="180" />
+                                                               <bpmndi:BPMNLabel>
+                                                                               <dc:Bounds x="804.5" y="170" width="90" height="20" />
+                                                               </bpmndi:BPMNLabel>
+                                               </bpmndi:BPMNEdge>
+                               </bpmndi:BPMNPlane>
+               </bpmndi:BPMNDiagram>
+</bpmn:definitions>
\ No newline at end of file
diff --git a/src/test/resources/clds/templates/bpmn/tca-img.xml b/src/test/resources/clds/templates/bpmn/tca-img.xml
new file mode 100644 (file)
index 0000000..a2ec5af
--- /dev/null
@@ -0,0 +1,309 @@
+<?xml version="1.0" encoding="utf-8"?><!-- created with bpmn-js / http://bpmn.io --><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+               width="924" height="92" viewBox="44 134 924 92" version="1.1">
+               <defs>
+                               <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10"
+                                               orient="auto" refX="11" refY="10" id="markerSjdype4kmnw">
+                                               <path d="M 1 5 L 11 10 L 1 15 Z"
+                                                               style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;"
+                                                               fill="#000000" />
+                               </marker>
+                               <marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20"
+                                               orient="auto" refX="6" refY="6" id="markerSjdype4kmny">
+                                               <circle cx="6" cy="6" r="3.5"
+                                                               style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;"
+                                                               fill="#ffffff" stroke="#000000" />
+                               </marker>
+                               <marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20"
+                                               orient="auto" refX="8.5" refY="5" id="markerSjdype4kmo0">
+                                               <path d="m 1 5 l 0 -3 l 7 3 l -7 3 z"
+                                                               style="stroke-width: 1; stroke-linecap: butt; stroke-dasharray: 10000, 1;"
+                                                               fill="#ffffff" stroke="#000000" />
+                               </marker>
+                               <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10"
+                                               orient="auto" refX="11" refY="10" id="markerSjdype4kmo2">
+                                               <path d="M 1 5 L 11 10 L 1 15"
+                                                               style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;"
+                                                               fill="#ffffff" stroke="#000000" />
+                               </marker>
+                               <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10"
+                                               orient="auto" refX="-1" refY="10" id="markerSjdype4kmo4">
+                                               <path d="M 0 10 L 8 6 L 16 10 L 8 14 Z"
+                                                               style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;"
+                                                               fill="#ffffff" stroke="#000000" />
+                               </marker>
+                               <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10"
+                                               orient="auto" refX="-5" refY="10" id="markerSjdype4kmo6">
+                                               <path d="M 1 4 L 5 16"
+                                                               style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;"
+                                                               fill="#000000" stroke="#000000" />
+                               </marker>
+               </defs>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="StartEvent_1"
+                                               transform="matrix(1,0,0,1,50,162)" style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="48"
+                                                               height="48"></rect>
+                                               <g class="djs-visual">
+                                                               <circle cx="18" cy="18" r="18" style="stroke-width: 2;"
+                                                                               stroke="#000000" fill="#ffffff"></circle>
+                                               </g>
+                                               <rect x="0" y="0" width="36" height="36"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="StartEvent_1_label"
+                                               transform="matrix(1,0,0,1,23,198)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="VesCollector_1g9cmz0"
+                                               transform="matrix(1,0,0,1,207,140)" style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="132"
+                                                               height="92"></rect>
+                                               <g class="djs-visual">
+                                                               <rect x="0" y="0" width="120" height="80" rx="0" ry="0"
+                                                                               style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect>
+                                                               <polyline points="120,80 120,20 " style="stroke-width: 2;"
+                                                                               fill="none" stroke="#000000"></polyline>
+                                                               <polyline points="20,0 20,80 " style="stroke-width: 2;"
+                                                                               fill="none" stroke="#000000"></polyline>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;">
+                                                                               <tspan x="5" y="14">V</tspan>
+                                                               </text>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;">
+                                                                               <tspan x="5" y="26">E</tspan>
+                                                               </text>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;">
+                                                                               <tspan x="5" y="38">S</tspan>
+                                                               </text>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="25.5" y="43.5">VesCollector</tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="120" height="80"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="TCA_1d13unw"
+                                               transform="matrix(1,0,0,1,453,140)" style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="132"
+                                                               height="92"></rect>
+                                               <g class="djs-visual">
+                                                               <rect x="0" y="0" width="120" height="80" rx="0" ry="0"
+                                                                               style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect>
+                                                               <polyline points="0,60 120,60 " style="stroke-width: 2;"
+                                                                               fill="none" stroke="#000000"></polyline>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="48" y="43.5">TCA</tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="120" height="80"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="Policy_12lup3h"
+                                               transform="matrix(1,0,0,1,687,140)" style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="132"
+                                                               height="92"></rect>
+                                               <g class="djs-visual">
+                                                               <rect x="0" y="0" width="120" height="80" rx="0" ry="0"
+                                                                               style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect>
+                                                               <polyline points="0,40 60,0 " style="stroke-width: 2;"
+                                                                               fill="none" stroke="#000000"></polyline>
+                                                               <text style="font-family: Arial,sans-serif; font-size: 12px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="43.5" y="43.5">Policy</tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="120" height="80"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape selected" data-element-id="EndEvent_16kg9fx"
+                                               transform="matrix(1,0,0,1,925,162)" style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="48"
+                                                               height="48"></rect>
+                                               <g class="djs-visual">
+                                                               <circle cx="18" cy="18" r="18" style="stroke-width: 4;"
+                                                                               stroke="#000000" fill="#ffffff"></circle>
+                                               </g>
+                                               <rect x="0" y="0" width="36" height="36"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                                               <g class=" djs-resizer djs-resizer-nw" transform="matrix(1,0,0,1,0,0)">
+                                                               <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect>
+                                                               <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect>
+                                               </g>
+                                               <g class=" djs-resizer djs-resizer-ne" transform="matrix(0,1,-1,0,36,0)">
+                                                               <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect>
+                                                               <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect>
+                                               </g>
+                                               <g class=" djs-resizer djs-resizer-se" transform="matrix(-1,0,0,-1,36,36)">
+                                                               <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect>
+                                                               <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect>
+                                               </g>
+                                               <g class=" djs-resizer djs-resizer-sw" transform="matrix(0,-1,1,0,0,36)">
+                                                               <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect>
+                                                               <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect>
+                                               </g>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="EndEvent_16kg9fx_label"
+                                               transform="matrix(1,0,0,1,898,198)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-connection" data-element-id="SequenceFlow_1ahk7jg"
+                                               style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="80" y="174" width="133"
+                                                               height="12"></rect>
+                                               <g class="djs-visual">
+                                                               <path d="m  86,180L207,180 "
+                                                                               style="stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);"
+                                                                               fill="none" stroke="#000000"></path>
+                                               </g>
+                                               <polyline points="86,180 207,180 " style="stroke-opacity: 0; stroke-width: 15;"
+                                                               fill="none" stroke="#ffffff" class="djs-hit"></polyline>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="SequenceFlow_1ahk7jg_label"
+                                               transform="matrix(1,0,0,1,101.5,170)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-connection" data-element-id="SequenceFlow_18ahat1"
+                                               style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="321" y="174" width="138"
+                                                               height="12"></rect>
+                                               <g class="djs-visual">
+                                                               <path d="m  327,180L453,180 "
+                                                                               style="stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);"
+                                                                               fill="none" stroke="#000000"></path>
+                                               </g>
+                                               <polyline points="327,180 453,180 " style="stroke-opacity: 0; stroke-width: 15;"
+                                                               fill="none" stroke="#ffffff" class="djs-hit"></polyline>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="SequenceFlow_18ahat1_label"
+                                               transform="matrix(1,0,0,1,345,170)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-connection" data-element-id="SequenceFlow_1mo9gxb"
+                                               style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="567" y="174" width="126"
+                                                               height="12"></rect>
+                                               <g class="djs-visual">
+                                                               <path d="m  573,180L687,180 "
+                                                                               style="stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);"
+                                                                               fill="none" stroke="#000000"></path>
+                                               </g>
+                                               <polyline points="573,180 687,180 " style="stroke-opacity: 0; stroke-width: 15;"
+                                                               fill="none" stroke="#ffffff" class="djs-hit"></polyline>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="SequenceFlow_1mo9gxb_label"
+                                               transform="matrix(1,0,0,1,585,170)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-connection" data-element-id="SequenceFlow_1dgtrrq"
+                                               style="display: block;">
+                                               <rect fill="none" class="djs-outline" x="801" y="174" width="130"
+                                                               height="12"></rect>
+                                               <g class="djs-visual">
+                                                               <path d="m  807,180L925,180 "
+                                                                               style="stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);"
+                                                                               fill="none" stroke="#000000"></path>
+                                               </g>
+                                               <polyline points="807,180 925,180 " style="stroke-opacity: 0; stroke-width: 15;"
+                                                               fill="none" stroke="#ffffff" class="djs-hit"></polyline>
+                               </g>
+               </g>
+               <g class="djs-group" xmlns="http://www.w3.org/2000/svg">
+                               <g class="djs-element djs-shape" data-element-id="SequenceFlow_1dgtrrq_label"
+                                               transform="matrix(1,0,0,1,821,170)" style="display: none;">
+                                               <rect fill="none" class="djs-outline" x="-6" y="-6" width="102"
+                                                               height="32"></rect>
+                                               <g class="djs-visual">
+                                                               <text style="font-family: Arial,sans-serif; font-size: 11px;"
+                                                                               class=" djs-label">
+                                                                               <tspan x="45" y="0"></tspan>
+                                                               </text>
+                                               </g>
+                                               <rect x="0" y="0" width="90" height="20"
+                                                               style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff"
+                                                               class="djs-hit"></rect>
+                               </g>
+               </g>
+</svg>
\ No newline at end of file
diff --git a/src/test/resources/clds/templates/bpmn/tca-template.xml b/src/test/resources/clds/templates/bpmn/tca-template.xml
new file mode 100644 (file)
index 0000000..cc942ef
--- /dev/null
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL"
+               xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI"
+               xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn">
+               <bpmn:process id="Process_1" isExecutable="false">
+                               <bpmn:startEvent id="StartEvent_1">
+                                               <bpmn:outgoing>SequenceFlow_1ahk7jg</bpmn:outgoing>
+                               </bpmn:startEvent>
+                               <bpmn:vesCollector id="VesCollector_1g9cmz0">
+                                               <bpmn:incoming>SequenceFlow_1ahk7jg</bpmn:incoming>
+                                               <bpmn:outgoing>SequenceFlow_18ahat1</bpmn:outgoing>
+                               </bpmn:vesCollector>
+                               <bpmn:tCA id="TCA_1d13unw">
+                                               <bpmn:incoming>SequenceFlow_18ahat1</bpmn:incoming>
+                                               <bpmn:outgoing>SequenceFlow_1mo9gxb</bpmn:outgoing>
+                               </bpmn:tCA>
+                               <bpmn:policy id="Policy_12lup3h">
+                                               <bpmn:incoming>SequenceFlow_1mo9gxb</bpmn:incoming>
+                                               <bpmn:outgoing>SequenceFlow_1dgtrrq</bpmn:outgoing>
+                               </bpmn:policy>
+                               <bpmn:endEvent id="EndEvent_16kg9fx">
+                                               <bpmn:incoming>SequenceFlow_1dgtrrq</bpmn:incoming>
+                               </bpmn:endEvent>
+                               <bpmn:sequenceFlow id="SequenceFlow_1ahk7jg"
+                                               sourceRef="StartEvent_1" targetRef="VesCollector_1g9cmz0" />
+                               <bpmn:sequenceFlow id="SequenceFlow_18ahat1"
+                                               sourceRef="VesCollector_1g9cmz0" targetRef="TCA_1d13unw" />
+                               <bpmn:sequenceFlow id="SequenceFlow_1mo9gxb"
+                                               sourceRef="TCA_1d13unw" targetRef="Policy_12lup3h" />
+                               <bpmn:sequenceFlow id="SequenceFlow_1dgtrrq"
+                                               sourceRef="Policy_12lup3h" targetRef="EndEvent_16kg9fx" />
+               </bpmn:process>
+               <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+                               <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">
+                                               <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2"
+                                                               bpmnElement="StartEvent_1">
+                                                               <dc:Bounds x="50" y="162" width="36" height="36" />
+                                               </bpmndi:BPMNShape>
+                                               <bpmndi:BPMNShape id="VesCollector_1g9cmz0_di"
+                                                               bpmnElement="VesCollector_1g9cmz0">
+                                                               <dc:Bounds x="207" y="140" width="120" height="80" />
+                                               </bpmndi:BPMNShape>
+                                               <bpmndi:BPMNShape id="TCA_1d13unw_di"
+                                                               bpmnElement="TCA_1d13unw">
+                                                               <dc:Bounds x="453" y="140" width="120" height="80" />
+                                               </bpmndi:BPMNShape>
+                                               <bpmndi:BPMNShape id="Policy_12lup3h_di"
+                                                               bpmnElement="Policy_12lup3h">
+                                                               <dc:Bounds x="687" y="140" width="120" height="80" />
+                                               </bpmndi:BPMNShape>
+                                               <bpmndi:BPMNShape id="EndEvent_16kg9fx_di"
+                                                               bpmnElement="EndEvent_16kg9fx">
+                                                               <dc:Bounds x="925" y="162" width="36" height="36" />
+                                                               <bpmndi:BPMNLabel>
+                                                                               <dc:Bounds x="898" y="198" width="90" height="20" />
+                                                               </bpmndi:BPMNLabel>
+                                               </bpmndi:BPMNShape>
+                                               <bpmndi:BPMNEdge id="SequenceFlow_1ahk7jg_di"
+                                                               bpmnElement="SequenceFlow_1ahk7jg">
+                                                               <di:waypoint xsi:type="dc:Point" x="86" y="180" />
+                                                               <di:waypoint xsi:type="dc:Point" x="207" y="180" />
+                                                               <bpmndi:BPMNLabel>
+                                                                               <dc:Bounds x="101.5" y="170" width="90" height="20" />
+                                                               </bpmndi:BPMNLabel>
+                                               </bpmndi:BPMNEdge>
+                                               <bpmndi:BPMNEdge id="SequenceFlow_18ahat1_di"
+                                                               bpmnElement="SequenceFlow_18ahat1">
+                                                               <di:waypoint xsi:type="dc:Point" x="327" y="180" />
+                                                               <di:waypoint xsi:type="dc:Point" x="453" y="180" />
+                                                               <bpmndi:BPMNLabel>
+                                                                               <dc:Bounds x="345" y="170" width="90" height="20" />
+                                                               </bpmndi:BPMNLabel>
+                                               </bpmndi:BPMNEdge>
+                                               <bpmndi:BPMNEdge id="SequenceFlow_1mo9gxb_di"
+                                                               bpmnElement="SequenceFlow_1mo9gxb">
+                                                               <di:waypoint xsi:type="dc:Point" x="573" y="180" />
+                                                               <di:waypoint xsi:type="dc:Point" x="687" y="180" />
+                                                               <bpmndi:BPMNLabel>
+                                                                               <dc:Bounds x="585" y="170" width="90" height="20" />
+                                                               </bpmndi:BPMNLabel>
+                                               </bpmndi:BPMNEdge>
+                                               <bpmndi:BPMNEdge id="SequenceFlow_1dgtrrq_di"
+                                                               bpmnElement="SequenceFlow_1dgtrrq">
+                                                               <di:waypoint xsi:type="dc:Point" x="807" y="180" />
+                                                               <di:waypoint xsi:type="dc:Point" x="925" y="180" />
+                                                               <bpmndi:BPMNLabel>
+                                                                               <dc:Bounds x="821" y="170" width="90" height="20" />
+                                                               </bpmndi:BPMNLabel>
+                                               </bpmndi:BPMNEdge>
+                               </bpmndi:BPMNPlane>
+               </bpmndi:BPMNDiagram>
+
+</bpmn:definitions>
\ No newline at end of file
diff --git a/src/test/resources/example/sdc/blueprint-dcae/holmes.yaml b/src/test/resources/example/sdc/blueprint-dcae/holmes.yaml
new file mode 100644 (file)
index 0000000..1277a02
--- /dev/null
@@ -0,0 +1,167 @@
+tosca_definitions_version: cloudify_dsl_1_3
+imports:
+- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
+- https://nexus01.research.att.com:8443/repository/solutioning01-mte2-raw/type_files/docker/2.3.0+t.0.4/node-type.yaml
+- https://nexus01.research.att.com:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml
+- http://nexus01.research.att.com:8081/repository/solutioning01-mte2-raw/type_files/dmaap/1.2.0/dmaap.yaml
+inputs:
+  dcae_service_location:
+    type: string
+  docker_host_override:
+    type: string
+  topic0_aaf_password:
+    type: string
+  topic0_aaf_username:
+    type: string
+  topic0_client_role:
+    type: string
+  topic1_aaf_password:
+    type: string
+  topic1_aaf_username:
+    type: string
+  topic1_client_role:
+    type: string
+node_templates:
+  docker_host_host:
+    type: dcae.nodes.SelectedDockerHost
+    properties:
+      docker_host_override:
+        get_input: docker_host_override
+      location_id:
+        get_input: dcae_service_location
+  holmes-rule_homes-rule:
+    type: dcae.nodes.DockerContainerForComponentsUsingDmaap
+    properties:
+      application_config:
+        holmes.default.rule.volte.scenario1: 'package dcae.ves.test
+
+          import org.onap.some.related.packages;
+
+          rule"SameVNF_Relation_Rule"
+
+          salience 120
+
+          no-loop true
+
+          when
+
+          $root : VesAlarm(
+
+          $sourceId: sourceId, sourceId != null && !sourceId.equals(""),
+
+          specificProblem in ( "LSS_cpiPCSCFFailReg(121297)", "LSS_cpiSIPRetransmitInvite(120267)" ),
+
+          $eventId: eventId)
+
+          $child : VesAlarm( eventId != $eventId,
+
+          CorrelationUtil.getInstance().isTopologicallyRelated(sourceId, $sourceId),
+
+          specificProblem in ("LSS_externalLinkDown(4271)","LSS_failedAttachReqsRateExceeded(4272)"),
+
+          this after [-60s, 60s] $root)
+
+          then
+
+          DmaapService.publishResult(...);
+
+          end'
+        holmes.default.rule.volte.scenario2: 'package dcae.ves.test
+
+          import org.onap.some.related.packages;
+
+          rule"SameVNF_Relation_Rule_1"
+
+          salience 120
+
+          no-loop true
+
+          when
+
+          $root : VesAlarm(
+
+          $sourceId: sourceId, sourceId != null && !sourceId.equals(""),
+
+          specificProblem in ( "LSS_cpiPCSCFFailReg(121297)", "LSS_cpiSIPRetransmitInvite(120267)" ),
+
+          $eventId: eventId)
+
+          $child : VesAlarm( eventId != $eventId,
+
+          CorrelationUtil.getInstance().isTopologicallyRelated(sourceId, $sourceId),
+
+          specificProblem in ("LSS_externalLinkDown(4271)","LSS_failedAttachReqsRateExceeded(4272)"),
+
+          this after [-60s, 60s] $root)
+
+          then
+
+          DmaapService.publishResult(...);
+
+          end'
+        services_calls:
+        - msb_config:
+            concat:
+            - '{{'
+            - get_property:
+              - SELF
+              - msb_config
+              - node_name
+            - '}}'
+        streams_publishes: []
+        streams_subscribes:
+        - sec_measurement_unsecure:
+            aaf_password:
+              get_input: topic0_aaf_password
+            aaf_username:
+              get_input: topic0_aaf_username
+            dmaap_info: <<topic0>>
+            type: message_router
+        - sec_measurement:
+            aaf_password:
+              get_input: topic1_aaf_password
+            aaf_username:
+              get_input: topic1_aaf_username
+            dmaap_info: <<topic1>>
+            type: message_router
+      docker_config:
+        healthcheck:
+          endpoint: api/holmes-rule-mgmt/v1/healthcheck
+          interval: 15s
+          timeout: 1s
+          type: http
+        ports:
+        - 9101:9101
+      image: nexus3.onap.org:10001/onap/holmes/rule-manamgement:latest
+      location_id:
+        get_input: dcae_service_location
+      service_component_type: dcae-analytics-holmes-rule-manamgement
+      streams_publishes: []
+      streams_subscribes:
+      - client_role:
+          get_input: topic0_client_role
+        location:
+          get_input: dcae_service_location
+        name: topic0
+        type: message_router
+      - client_role:
+          get_input: topic1_client_role
+        location:
+          get_input: dcae_service_location
+        name: topic1
+        type: message_router
+    relationships:
+    - target: docker_host_host
+      type: dcae.relationships.component_contained_in
+    - target: topic0
+      type: dcae.relationships.subscribe_to_events
+    - target: topic1
+      type: dcae.relationships.subscribe_to_events
+  topic0:
+    type: dcae.nodes.Topic
+    properties:
+      topic_name: ''
+  topic1:
+    type: dcae.nodes.Topic
+    properties:
+      topic_name: ''
diff --git a/src/test/resources/example/sdc/blueprint-dcae/not-recognized.yaml b/src/test/resources/example/sdc/blueprint-dcae/not-recognized.yaml
new file mode 100644 (file)
index 0000000..6522885
--- /dev/null
@@ -0,0 +1,130 @@
+tosca_definitions_version: cloudify_dsl_1_3
+imports:
+- http://dockercentral.it.att.com:8093/nexus/repository/rawcentral/com.att.dcae.controller/type_files/dockerplugin/2.4.0+t.0.8/node-type.yaml
+- http://dockercentral.it.att.com:8093/nexus/repository/rawcentral/com.att.dcae.controller/type_files/dmaap/1.2.0+t.0.9/dmaap.yaml
+- http://dockercentral.it.att.com:8093/nexus/repository/rawcentral/com.att.dcae.controller/type_files/relationship/1.0.0+t.0.1/relationship-types.yaml
+inputs:
+  commonEventHeader.domain:
+    type: string
+  commonEventHeader.version:
+    type: string
+  dcae_service_location:
+    type: string
+  docker_host_override:
+    type: string
+    default: ''
+  elementType:
+    type: string
+  feed_id:
+    type: string
+  mappingType:
+    type: string
+  measurementsForVfScalingFields.measurementsForVfScalingVersion:
+    type: string
+  phases.docker_map.phaseName:
+    type: string
+  topic1_aaf_password:
+    type: string
+  topic1_aaf_username:
+    type: string
+  topic1_client_role:
+    type: string
+node_templates:
+  DockerMap_n.1519416493392.3_DockerMap:
+    type: dcae.nodes.DockerContainerForComponentsUsingDmaap
+    properties:
+      application_config:
+        commonEventHeader.domain:
+          get_input: commonEventHeader.domain
+        commonEventHeader.version:
+          get_input: commonEventHeader.version
+        csvToVesJson: '{"processing":[{"phase":"pmossFoiPhase","filter":{"class":"Contains","string":"${file}","value":"NOKvMRF"},"processors":[{"class":"LogEvent","title":"PM-FOIEvent-Received","logName":"com.att.gfp.dcae.eventProcessor.input","logLevel":"DEBUG"},{"class":"RunPhase","phase":"vFoiNokRunPhase"}]},{"phase":"vFoiNokRunPhase","comments":"generic parsing","processors":[{"replace":",","field":"data","class":"ReplaceText","find":";"},{"replace":",","field":"file","class":"ReplaceText","find":"_"}]},{"phase":"vFoiNokRunPhase","filter":{"class":"Contains","string":"${data[1]}","value":"Begin date"},"processors":[{"class":"ExtractText","field":"event.commonEventHeader.startEpochMicrosec","value":"${data[1]}","regex":".*Begin date,([^,]*),.*"},{"class":"DateFormatter","value":"${event.commonEventHeader.startEpochMicrosec}","fromFormat":"MM/dd/yy HH:mm:ss a","fromTz":"GMT","toField":"event.commonEventHeader.startEpochMicrosec","toFormat":"#ms","toTz":"#ms"}]},{"phase":"vFoiNokRunPhase","filter":{"class":"Contains","string":"${data[2]}","value":"End date"},"processors":[{"class":"ExtractText","field":"event.commonEventHeader.lastEpochMicrosec","value":"${data[2]}","regex":".*End date,([^,]*),.*"},{"class":"DateFormatter","value":"${event.commonEventHeader.lastEpochMicrosec}","fromFormat":"MM/dd/yy HH:mm:ss a","fromTz":"GMT","toField":"event.commonEventHeader.lastEpochMicrosec","toFormat":"#ms","toTz":"#ms"},{"class":"DateFormatter","value":"${event.commonEventHeader.lastEpochMicrosec}","fromFormat":"#ms","fromTz":"#ms","toField":"event.commonEventHeader.internalHeaderFields.DATETIMEUTC","toFormat":"yyyyMMddHHmmss","toTz":"GMT"}]},{"phase":"vFoiNokRunPhase","processors":[{"class":"ExtractText","field":"event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[0].value","value":"${data[7]}","regex":".*CpuSys,+(\\d+,){3}.*"},{"class":"ReplaceText","replace":"","field":"event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[0].value","find":","},{"class":"ExtractText","field":"event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[1].value","value":"${data[5]}","regex":".*CpuUsage,+(\\d+,){3}.*"},{"class":"ReplaceText","replace":"","field":"event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[1].value","find":","},{"class":"ExtractText","field":"event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[2].value","value":"${data[7]}","regex":".*CpuSys,+(\\d+,){2}.*"},{"class":"ReplaceText","replace":"","field":"event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[2].value","find":","},{"class":"ExtractText","field":"event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[3].value","value":"${data[5]}","regex":".*CpuUsage,+(\\d+,){2}.*"},{"class":"ReplaceText","replace":"","field":"event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[3].value","find":","}]},{"phase":"vFoiNokRunPhase","processors":[{"class":"ExtractText","field":"event.commonEventHeader.eventName","value":"${file}","regex":"([^,]*),.*"},{"class":"ExtractText","field":"event.commonEventHeader.reportingEntityName","value":"${file}","regex":".*,([^,]*)\\..*"}]},{"phase":"vFoiNokRunPhase","comments":"generic parsing","processors":[{"class":"Set","updates":{"event.commonEventHeader.lastEpochMicrosec":"${event.commonEventHeader.lastEpochMicrosec}000","event.commonEventHeader.startEpochMicrosec":"${event.commonEventHeader.startEpochMicrosec}000","event.commonEventHeader.domain":"measurementsForVfScaling","event.commonEventHeader.eventName":"Mfvs_${event.commonEventHeader.eventName}","event.commonEventHeader.eventType":"csv2ves","event.commonEventHeader.priority":"Normal","event.commonEventHeader.sequence":0,"event.commonEventHeader.sourceName":"${event.commonEventHeader.reportingEntityName}","event.commonEventHeader.version":3.0,"event.commonEventHeader.eventId":"%{now.ms}","event.commonEventHeader.internalHeaderFields.dbTableSuffix":"","event.measurementsForVfScalingFields.measurementInterval":900,"event.measurementsForVfScalingFields.measurementsForVfScalingVersion":2.0,"event.measurementsForVfScalingFields.additionalMeasurements.name":"csv2ves","event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[0].name":"CpuSysMax","event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[1].name":"CpuUsageMax","event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[2].name":"CpuSysAverage","event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[3].name":"CpuUsageAverage"}},{"class":"DateFormatter","value":"${event.commonEventHeader.eventId}","fromFormat":"#ms","fromTz":"#ms","toField":"event.commonEventHeader.eventId","toFormat":"yyyyMMddHHmmssSSS","toTz":"GMT"}]},{"phase":"vFoiNokRunPhase","processors":[{"class":"Clear","fields":["data","file"]},{"class":"LogText","logLevel":"INFO","logText":"Finished-PM-FOIEvent-parsing"},{"class":"LogEvent","title":"PM-FOIEvent-Received-Output"},{"class":"RunPhase","phase":"foiEventToDmaapPhase"}]}]}'
+        elementType:
+          get_input: elementType
+        isSelfServeComponent: 'True'
+        mappingType:
+          get_input: mappingType
+        measurementsForVfScalingFields.measurementsForVfScalingVersion:
+          get_input: measurementsForVfScalingFields.measurementsForVfScalingVersion
+        phases.docker_map.phaseName:
+          get_input: phases.docker_map.phaseName
+        services_calls: {}
+        streams_publishes:
+          DCAE-VES-PM-EVENT:
+            aaf_password:
+              get_input: topic1_aaf_password
+            aaf_username:
+              get_input: topic1_aaf_username
+            dmaap_info: <<topic1_n.1519416493404.5>>
+            type: message_router
+        streams_subscribes:
+          DCAE_PM_DATA_C_M:
+            dmaap_info: <<feed_n.1519416394214.2>>
+            type: data_router
+        useDtiConfig: 'False'
+      docker_config:
+        healthcheck:
+          interval: 300s
+          script: /opt/app/vec/bin/common/HealthCheck_DockerMap.sh
+          timeout: 15s
+          type: docker
+        volumes:
+        - container:
+            bind: /opt/app/dcae-certificate
+          host:
+            path: /opt/app/dcae-certificate
+        - container:
+            bind: /opt/app/dmd/log/AGENT
+          host:
+            path: /opt/logs/DCAE/dockermap/dmd/AGENT
+        - container:
+            bind: /opt/app/dmd/log/WATCHER
+          host:
+            path: /opt/logs/DCAE/dockermap/dmd/WATCHER
+        - container:
+            bind: /opt/app/vec/logs/DCAE
+          host:
+            path: /opt/logs/DCAE/dockermap/dockermap-logs
+        - container:
+            bind: /opt/app/vec/archive/data
+          host:
+            path: /opt/data/DCAE/dockermap/dockermap-archive
+      image: dockercentral.it.att.com:5100/com.att.dcae.controller/dcae-controller-dockermap:18.02-004
+      location_id:
+        get_input: dcae_service_location
+      service_component_type: dcae.collectors.docker.map.pm
+      streams_publishes:
+      - client_role:
+          get_input: topic1_client_role
+        location:
+          get_input: dcae_service_location
+        name: topic1_n.1519416493404.5
+        type: message_router
+      streams_subscribes:
+      - location:
+          get_input: dcae_service_location
+        name: feed_n.1519416394214.2
+        type: data_router
+    relationships:
+    - target: docker_host_host
+      type: dcae.relationships.component_contained_in
+    - target: feed_n.1519416394214.2
+      type: dcae.relationships.subscribe_to_files
+    - target: topic1_n.1519416493404.5
+      type: dcae.relationships.publish_events
+  docker_host_host:
+    type: dcae.nodes.SelectedDockerHost
+    properties:
+      docker_host_override:
+        get_input: docker_host_override
+      location_id:
+        get_input: dcae_service_location
+  feed_n.1519416394214.2:
+    type: dcae.nodes.ExistingFeed
+    properties:
+      feed_id:
+        get_input: feed_id
+  topic1_n.1519416493404.5:
+    type: dcae.nodes.Topic
+    properties:
+      topic_name: DCAE-VES-PM-EVENT-v1
diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca.yaml b/src/test/resources/example/sdc/blueprint-dcae/tca.yaml
new file mode 100644 (file)
index 0000000..101dc2c
--- /dev/null
@@ -0,0 +1,82 @@
+tosca_definitions_version: cloudify_dsl_1_3
+imports:
+- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
+- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml
+- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml
+- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml
+inputs:
+  location_id:
+    type: string
+  service_id:
+    type: string
+node_templates:
+  cdap_host_host:
+    type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure
+    properties:
+      location_id:
+        get_input: location_id
+      scn_override: cdap_broker.solutioning-central.dcae.onap.org
+    interfaces:
+      cloudify.interfaces.lifecycle: {
+        }
+  tca_tca:
+    type: dcae.nodes.MicroService.cdap
+    properties:
+      app_config:
+        appDescription: DCAE Analytics Threshold Crossing Alert Application
+        appName: dcae-tca
+        tcaSubscriberOutputStreamName: TCASubscriberOutputStream
+        tcaVESAlertsTableName: TCAVESAlertsTable
+        tcaVESAlertsTableTTLSeconds: '1728000'
+        tcaVESMessageStatusTableName: TCAVESMessageStatusTable
+        tcaVESMessageStatusTableTTLSeconds: '86400'
+        thresholdCalculatorFlowletInstances: '2'
+      app_preferences:
+        publisherContentType: application/json
+        publisherHostName: mrlocal-mtnjftle01.onap.org
+        publisherHostPort: '3905'
+        publisherMaxBatchSize: '10'
+        publisherMaxRecoveryQueueSize: '100000'
+        publisherPollingInterval: '20000'
+        publisherProtocol: https
+        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub
+        publisherUserName: m00502@tca.af.dcae.onap.org
+        publisherUserPassword: Te5021abc
+        subscriberConsumerGroup: OpenDCAE-c12
+        subscriberConsumerId: c12
+        subscriberContentType: application/json
+        subscriberHostName: mrlocal-mtnjftle01.onap.org
+        subscriberHostPort: '3905'
+        subscriberMessageLimit: '-1'
+        subscriberPollingInterval: '20000'
+        subscriberProtocol: https
+        subscriberTimeoutMS: '-1'
+        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub
+        subscriberUserName: m00502@tca.af.dcae.onap.org
+        subscriberUserPassword: Te5021abc
+        tca_policy: null
+      artifact_name: dcae-analytics-tca
+      artifact_version: 1.0.0
+      connections:
+        streams_publishes: [
+          ]
+        streams_subscribes: [
+          ]
+      jar_url: http://somejar
+      location_id:
+        get_input: location_id
+      namespace: cdap_tca_hi_lo
+      programs:
+      - program_id: TCAVESCollectorFlow
+        program_type: flows
+      - program_id: TCADMaaPMRSubscriberWorker
+        program_type: workers
+      - program_id: TCADMaaPMRPublisherWorker
+        program_type: workers
+      service_component_type: cdap_app_tca
+      service_id:
+        get_input: service_id
+      streamname: TCASubscriberOutputStream
+    relationships:
+    - target: cdap_host_host
+      type: dcae.relationships.component_contained_in
\ No newline at end of file