summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Wrobel <tomasz.wrobel@nokia.com>2022-03-11 11:03:30 +0100
committerTomasz Wrobel <tomasz.wrobel@nokia.com>2022-03-11 11:03:30 +0100
commit72c62a090d7551c1619321ab8c8c81a60516efe8 (patch)
tree929150b17f36e0dba059b530d00b6600c442154f
parentb768cba41ac112da9736c872257c6399fd8502cc (diff)
Fix pm-mapper dev tools
Issue-ID: DCAEGEN2-3091 Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com> Change-Id: I16c4e8f38c3dc0d845e571e112cbc25c7fc459e3
-rw-r--r--tools/development/README.md2
-rwxr-xr-xtools/development/env/containers_ip4
-rw-r--r--tools/development/resources/addSubscriber.json38
-rw-r--r--tools/development/resources/createFeed.json35
-rw-r--r--tools/development/resources/mount_config.yaml3
-rwxr-xr-xtools/development/run-pm-mapper.sh2
6 files changed, 42 insertions, 42 deletions
diff --git a/tools/development/README.md b/tools/development/README.md
index 8c3dad8..9dcf35b 100644
--- a/tools/development/README.md
+++ b/tools/development/README.md
@@ -38,7 +38,7 @@ MeasDataFile Examples:
2 b. To send MeasCollec file use:
```
-./send-meas-collec.sh A20181002.0000-1000-0015-1000_5G.xml
+./send-meas-collec.sh A20181002.0000-1000-0015-1000_5G.xml.gz
```
MeasCollec Examples:
diff --git a/tools/development/env/containers_ip b/tools/development/env/containers_ip
index b09ce01..daaf3f5 100755
--- a/tools/development/env/containers_ip
+++ b/tools/development/env/containers_ip
@@ -1,6 +1,6 @@
#!/bin/bash
# ============LICENSE_START=======================================================
-# Copyright (C) 2021 NOKIA
+# Copyright (C) 2021-2022 NOKIA. 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.
@@ -18,8 +18,6 @@
export GATEWAY_IP=172.18.0.1
export DR_NODE_IP=172.18.0.2
export DR_PROV_IP=172.18.0.3
-export CONSUL_IP=172.18.0.4
-export CBS_IP=172.18.0.5
export MARIADB_IP=172.18.0.6
export NODE_IP=172.18.0.7
export PMMAPPER_IP=172.18.0.8
diff --git a/tools/development/resources/addSubscriber.json b/tools/development/resources/addSubscriber.json
index 0666a7d..4892251 100644
--- a/tools/development/resources/addSubscriber.json
+++ b/tools/development/resources/addSubscriber.json
@@ -1,20 +1,20 @@
{
- "delivery":{
- "url":"http://dcae-pm-mapper:8081/delivery",
- "user":"username",
- "password":"password",
- "use100":true
- },
- "follow_redirect":false,
- "metadataOnly":false,
- "suspend":false,
- "groupid":0,
- "links":{
- "self": "https://dmaap-dr-prov/subscribe/1",
- "log": "https://dmaap-dr-prov/feedlog/1",
- "feed": "https://dmaap-dr-prov/feed/1"
- },
- "subscriber":"pmmapper",
- "decompress":true,
- "privilegedSubscriber": true
- } \ No newline at end of file
+ "delivery": {
+ "url": "http://pmmapper:8081/delivery",
+ "user": "username",
+ "password": "password",
+ "use100": true
+ },
+ "follow_redirect": false,
+ "metadataOnly": false,
+ "suspend": false,
+ "groupid": 0,
+ "links": {
+ "self": "https://dmaap-dr-prov/subscribe/1",
+ "log": "https://dmaap-dr-prov/feedlog/1",
+ "feed": "https://dmaap-dr-prov/feed/1"
+ },
+ "subscriber": "pmmapper",
+ "decompress": true,
+ "privilegedSubscriber": true
+}
diff --git a/tools/development/resources/createFeed.json b/tools/development/resources/createFeed.json
index f93633d..493249a 100644
--- a/tools/development/resources/createFeed.json
+++ b/tools/development/resources/createFeed.json
@@ -1,18 +1,19 @@
{
- "name": "PM Mapper Feed",
- "version": "m1.0",
- "description": "PM Mapper Feed",
- "business_description": "PM Mapper",
- "suspend": false,
- "deleted": false,
- "changeowner": true,
- "authorization": {
- "classification": "unclassified",
- "endpoint_addrs": [],
- "endpoint_ids": [
- {
- "password": "pmmapper",
- "id": "pmmapper"
- }]
- }
- } \ No newline at end of file
+ "name": "PM Mapper Feed",
+ "version": "m1.0",
+ "description": "PM Mapper Feed",
+ "business_description": "PM Mapper",
+ "suspend": false,
+ "deleted": false,
+ "changeowner": true,
+ "authorization": {
+ "classification": "unclassified",
+ "endpoint_addrs": [],
+ "endpoint_ids": [
+ {
+ "password": "pmmapper",
+ "id": "pmmapper"
+ }
+ ]
+ }
+}
diff --git a/tools/development/resources/mount_config.yaml b/tools/development/resources/mount_config.yaml
index ff81f1b..8ca551a 100644
--- a/tools/development/resources/mount_config.yaml
+++ b/tools/development/resources/mount_config.yaml
@@ -7,6 +7,7 @@ pm-mapper-filter:
- attTCHSeizures
- succTCHSeizures2
- succImmediateAssignProcs8
+# filters: [] #disabling filters
key_store_path: "/opt/app/pm-mapper/etc/certs/cert.jks"
key_store_pass_path: "/opt/app/pm-mapper/etc/certs/jks.pass"
trust_store_path: "/opt/app/pm-mapper/etc/certs/trust.jks"
@@ -31,5 +32,5 @@ streams_subscribes:
username: "username"
password: "password"
location: "csit-pmmapper"
- delivery_url: "http://dcae-pm-mapper:8081/delivery"
+ delivery_url: "http://pmmapper:8081/delivery"
subscriber_id: 1
diff --git a/tools/development/run-pm-mapper.sh b/tools/development/run-pm-mapper.sh
index ac7ce31..91c7766 100755
--- a/tools/development/run-pm-mapper.sh
+++ b/tools/development/run-pm-mapper.sh
@@ -21,7 +21,7 @@ TARGET_CONFIG_PATH=/app-config/application_config.yaml
docker run -d -p 8081:8081 \
--mount type=bind,source="$PWD/certs",target="/opt/app/pm-mapper/etc/certs/" \
--mount type=bind,source="$PWD/resources/mount_config.yaml",target="$TARGET_CONFIG_PATH" \
- -e "CONFIG_BINDING_SERVICE=$CBS_IP" \
+ -e "CONFIG_BINDING_SERVICE=0.0.0.0" \
-e "CONFIG_BINDING_SERVICE_SERVICE_PORT=10000" \
-e "CBS_CLIENT_CONFIG_PATH=$TARGET_CONFIG_PATH" \
-e "PROCESSING_LIMIT_RATE=1" \