summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMichal Banka <michal.banka@nokia.com>2021-03-31 13:43:34 +0200
committerMichal Banka <michal.banka@nokia.com>2021-04-01 10:51:50 +0200
commit516014379cdc27d163be223bb8ce9f87d72dea1f (patch)
tree680fa171ca6b9fa2b439f0ea727b96618c8ca158 /tools
parentc398d5afd86d1aedab9cbd7b8f8c3d7b48eb2e2b (diff)
Add stndDefined domain to HV-VES1.8.0
- Updated SDK dependency to 1.8.2 so HV-VES recognizes stndDefinedNamespace field during events deserialization - Added new domain stndDefined - Added routings specific for stndDefined events which is controled by stndDefinedNamespace field, not domain - Bumped HV-VES to 1.8.0 Signed-off-by: Michal Banka <michal.banka@nokia.com> Change-Id: Ia27f2de7a4b64df5e8a182888006f7e8a941ca63 Issue-ID: DCAEGEN2-2702
Diffstat (limited to 'tools')
-rw-r--r--tools/development/docker-compose.yml30
-rw-r--r--tools/development/routing.json59
2 files changed, 69 insertions, 20 deletions
diff --git a/tools/development/docker-compose.yml b/tools/development/docker-compose.yml
index 1f655df2..df8fee0b 100644
--- a/tools/development/docker-compose.yml
+++ b/tools/development/docker-compose.yml
@@ -56,22 +56,12 @@ services:
consul-config:
image: docker.io/consul:1.0.6
restart: on-failure
- command: ["kv", "put", "-http-addr=http://consul-server:8500", "dcae-hv-ves-collector", '{
- "streams_publishes": {
- "perf3gpp": {
- "type": "kafka",
- "aaf_credentials": {
- "username": "admin",
- "password": "admin_secret"
- },
- "kafka_info": {
- "bootstrap_servers": "message-router-kafka-0:9093",
- "topic_name": "HV_VES_PERF3GPP"
- }
- }
- }
- }'
- ]
+ command: "kv put -http-addr=http://consul-server:8500 dcae-hv-ves-collector '@/home/consul/routing.json'"
+ volumes:
+ - type: bind
+ source: ./routing.json
+ target: /home/consul/routing.json
+ read_only: true
depends_on:
- consul-server
@@ -89,7 +79,7 @@ services:
#
ves-hv-collector:
- image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.7.0-SNAPSHOT
+ image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.8.0-SNAPSHOT
ports:
- "6060:6060"
- "6061:6061/tcp"
@@ -120,7 +110,7 @@ services:
#
xnf-simulator:
- image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-xnf-simulator:1.7.0-SNAPSHOT
+ image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-xnf-simulator:1.8.0-SNAPSHOT
ports:
- "6062:6062/tcp"
- "6063:6063"
@@ -144,12 +134,12 @@ services:
- ../ssl/:/etc/ves-hv/
dcae-app-simulator:
- image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-dcae-app-simulator:1.7.0-SNAPSHOT
+ image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-dcae-app-simulator:1.8.0-SNAPSHOT
ports:
- "6064:6064/tcp"
command: ["--listen-port", "6064",
"--kafka-bootstrap-servers", "message-router-kafka-0:9092",
- "--kafka-topics", "HV_VES_PERF3GPP"]
+ "--kafka-topics", "HV_VES_PERF3GPP,SEC_3GPP_FAULTSUPERVISION_OUTPUT,SEC_3GPP_PROVISIONING_OUTPUT,SEC_3GPP_HEARTBEAT_OUTPUT,SEC_3GPP_PERFORMANCEASSURANCE_OUTPUT"]
depends_on:
- message-router-kafka-0
diff --git a/tools/development/routing.json b/tools/development/routing.json
new file mode 100644
index 00000000..caeafd21
--- /dev/null
+++ b/tools/development/routing.json
@@ -0,0 +1,59 @@
+{
+ "streams_publishes": {
+ "perf3gpp": {
+ "type": "kafka",
+ "aaf_credentials": {
+ "username": "admin",
+ "password": "admin_secret"
+ },
+ "kafka_info": {
+ "bootstrap_servers": "message-router-kafka-0:9093",
+ "topic_name": "HV_VES_PERF3GPP"
+ }
+ },
+ "ves-3gpp-fault-supervision": {
+ "type": "kafka",
+ "aaf_credentials": {
+ "username": "admin",
+ "password": "admin_secret"
+ },
+ "kafka_info": {
+ "bootstrap_servers": "message-router-kafka-0:9093",
+ "topic_name": "SEC_3GPP_FAULTSUPERVISION_OUTPUT"
+ }
+ },
+ "ves-3gpp-provisioning": {
+ "type": "kafka",
+ "aaf_credentials": {
+ "username": "admin",
+ "password": "admin_secret"
+ },
+ "kafka_info": {
+ "bootstrap_servers": "message-router-kafka-0:9093",
+ "topic_name": "SEC_3GPP_PROVISIONING_OUTPUT"
+ }
+ },
+ "ves-3gpp-heartbeat": {
+ "type": "kafka",
+ "aaf_credentials": {
+ "username": "admin",
+ "password": "admin_secret"
+ },
+ "kafka_info": {
+ "bootstrap_servers": "message-router-kafka-0:9093",
+ "topic_name": "SEC_3GPP_HEARTBEAT_OUTPUT"
+ }
+ },
+ "ves-3gpp-performance-assurance": {
+ "type": "kafka",
+ "aaf_credentials": {
+ "username": "admin",
+ "password": "admin_secret"
+ },
+ "kafka_info": {
+ "bootstrap_servers": "message-router-kafka-0:9093",
+ "topic_name": "SEC_3GPP_PERFORMANCEASSURANCE_OUTPUT"
+ }
+ }
+ }
+} \ No newline at end of file