From 516014379cdc27d163be223bb8ce9f87d72dea1f Mon Sep 17 00:00:00 2001
From: Michal Banka <michal.banka@nokia.com>
Date: Wed, 31 Mar 2021 13:43:34 +0200
Subject: Add stndDefined domain to HV-VES

- 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
---
 tools/development/docker-compose.yml | 30 ++++++------------
 tools/development/routing.json       | 59 ++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 20 deletions(-)
 create mode 100644 tools/development/routing.json

(limited to 'tools/development')

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
-- 
cgit 1.2.3-korg