aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Rose <dr695h@att.com>2019-07-31 14:14:09 +0000
committerGerrit Code Review <gerrit@onap.org>2019-07-31 14:14:09 +0000
commit50e113e064e31aed7435ac814e4776b72f842c8f (patch)
treeacca0ec7b209bf852f881095fb9eab6884c12aca
parent9a45cee472289cbf0b4c4f45c9154b77d330f65f (diff)
parent117e5988f2ef517d00f16deb93f1b564569572da (diff)
Merge "Update to Setup and Test Case due to dmaap plugin feature in PM Mapper"
-rw-r--r--plans/dcaegen2-pmmapper/pmmapper/assets/config.json70
-rw-r--r--plans/dcaegen2-pmmapper/pmmapper/assets/createTopic.json5
-rw-r--r--plans/dcaegen2-pmmapper/pmmapper/assets/mrserver.js25
-rw-r--r--plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml2
-rw-r--r--plans/dcaegen2-pmmapper/pmmapper/setup.sh14
-rw-r--r--tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json61
-rw-r--r--tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json61
-rw-r--r--tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot19
8 files changed, 127 insertions, 130 deletions
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/config.json b/plans/dcaegen2-pmmapper/pmmapper/assets/config.json
index 0b62454d..aacbb5b0 100644
--- a/plans/dcaegen2-pmmapper/pmmapper/assets/config.json
+++ b/plans/dcaegen2-pmmapper/pmmapper/assets/config.json
@@ -1,39 +1,35 @@
{
- "pm-mapper-filter": { "filters":[]},
- "streams_subscribes": {
- "dmaap_subscriber": {
- "type": "data_router",
- "aaf_username": null,
- "aaf_password": null,
- "dmaap_info": {
- "location": "csit-pmmapper",
- "delivery_url": "http://dcae-pm-mapper:8081/delivery",
- "username": "username",
- "password": "password",
- "subscriber_id": "1"
- }
- }
- },
- "streams_publishes": {
- "dmaap_publisher": {
- "type": "message_router",
- "aaf_password": null,
- "dmaap_info": {
- "topic_url": "http://message-router:3904/events/PM_MAPPER",
- "client_role": "org.onap.dmaap.mr.topic",
- "location": "csit-pmmapper",
- "client_id": null
- },
- "aaf_username": null
- }
- },
- "dmaap_dr_feed_name": "1",
- "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
- "services_calls": {},
- "enable_http": true,
- "key_store_path": "/opt/app/pm-mapper/etc/cert.jks.b64",
- "key_store_pass_path": "/opt/app/pm-mapper/etc/jks.pass",
- "trust_store_path": "/opt/app/pm-mapper/etc/trust.jks.b64",
- "trust_store_pass_path": "/opt/app/pm-mapper/etc/trust.pass"
-
+ "pm-mapper-filter": { "filters":[]},
+ "key_store_path": "/opt/app/pm-mapper/etc/cert.jks.b64",
+ "key_store_pass_path": "/opt/app/pm-mapper/etc/jks.pass",
+ "trust_store_path": "/opt/app/pm-mapper/etc/trust.jks.b64",
+ "trust_store_pass_path": "/opt/app/pm-mapper/etc/trust.pass",
+ "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+ "dmaap_dr_feed_name": "1",
+ "aaf_identity": "aaf_admin@people.osaaf.org",
+ "aaf_password": "demo123456!",
+ "enable_http": true,
+ "streams_publishes": {
+ "dmaap_publisher": {
+ "type": "message_router",
+ "dmaap_info": {
+ "topic_url": "http://message-router:3904/events/org.onap.dmaap.mr.VES_PM",
+ "client_role": "org.onap.dcae.pmPublisher",
+ "location": "csit-pmmapper",
+ "client_id": "1562763644939"
+ }
+ }
+ },
+ "streams_subscribes": {
+ "dmaap_subscriber": {
+ "type": "data_router",
+ "dmaap_info": {
+ "username": "username",
+ "password": "password",
+ "location": "csit-pmmapper",
+ "delivery_url": "http://dcae-pm-mapper:8081/delivery",
+ "subscriber_id": 1
+ }
+ }
+ }
} \ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/createTopic.json b/plans/dcaegen2-pmmapper/pmmapper/assets/createTopic.json
deleted file mode 100644
index 4d20974b..00000000
--- a/plans/dcaegen2-pmmapper/pmmapper/assets/createTopic.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "topicName":"PM_MAPPER",
- "topicDescription":"PM Mapper VES Event",
- "owner":"pmmapper"
-} \ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/mrserver.js b/plans/dcaegen2-pmmapper/pmmapper/assets/mrserver.js
new file mode 100644
index 00000000..a6a61303
--- /dev/null
+++ b/plans/dcaegen2-pmmapper/pmmapper/assets/mrserver.js
@@ -0,0 +1,25 @@
+var httpServer = function() {
+var http = require('http'),
+url = require('url'),
+fs = require('fs'),
+
+start = function(port) {
+ var server = http.createServer(function(req, res) {
+ processHttpRequest(res);
+ });
+ server.listen(port, function() {
+ console.log('Listening on ' + port + '...');
+ });
+},
+
+processHttpRequest = function(res) {
+ res.writeHead(200, {'Content-Type': 'text/plain'});
+ res.end('Published Successfully.\n');
+};
+
+return {
+ start: start
+}
+}();
+
+httpServer.start(3904); \ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml b/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml
index 2e3919b6..7646c0b4 100644
--- a/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml
+++ b/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml
@@ -2,7 +2,7 @@ version: '2.1'
services:
pmmapper:
container_name: pmmapper
- image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper:latest
+ image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper:1.1.3
ports:
- "8081:8081"
environment:
diff --git a/plans/dcaegen2-pmmapper/pmmapper/setup.sh b/plans/dcaegen2-pmmapper/pmmapper/setup.sh
index e52195f5..29b8d9c5 100644
--- a/plans/dcaegen2-pmmapper/pmmapper/setup.sh
+++ b/plans/dcaegen2-pmmapper/pmmapper/setup.sh
@@ -71,7 +71,7 @@ cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapp
CBS_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' cbs)
sed -i 's/CBSIP/'$CBS_IP'/g' docker-compose.yml
sed -i 's/1.1.1.1/'$DR_NODE_IP'/g' docker-compose.yml
-sed -i 's/4.4.4.4/'$DMAAP_MR_IP'/g' docker-compose.yml
+sed -i 's/4.4.4.4/'$MARIADB'/g' docker-compose.yml
docker-compose up -d
cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose
@@ -119,15 +119,19 @@ docker exec -i datarouter-prov sh -c "curl -k -X PUT https://$DR_PROV_IP:8443/i
curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.feed" -H "X-DMAAP-DR-ON-BEHALF-OF:pmmapper" --data-ascii @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/createFeed.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443
curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.subscription" -H "X-DMAAP-DR-ON-BEHALF-OF:pmmapper" --data-ascii @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1
-# Create PM Mapper tocic in Message Router
-curl -v -X POST http://${DMAAP_MR_IP}:3904/topics/create -d @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/createTopic.json -H "Content-Type: application/json"
+# Simulation setup for Message Router
+docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/mrserver.js mariadb:/
+docker exec mariadb /bin/bash -c "apt update"
+sleep 2
+docker exec mariadb /bin/bash -c "apt install nodejs -y"
+sleep 10
+docker exec mariadb /bin/bash -c "nodejs mrserver.js &" &
+
PMMAPPER_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' pmmapper)
docker exec pmmapper /bin/sh -c "cat /var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log" > /tmp/pmmapper.log
cat /tmp/pmmapper.log
docker exec -it datarouter-prov sh -c "curl http://dmaap-dr-node:8080/internal/fetchProv"
sleep 10
curl -k https://$DR_PROV_IP:8443/internal/prov
-curl http://${DMAAP_MR_IP}:3904/events/PM_MAPPER/CG1/C1?timeout=1000
-
#Pass any variables required by Robot test suites in ROBOT_VARIABLES
ROBOT_VARIABLES="-v CONSUL_IP:${CONSUL_IP} -v DR_PROV_IP:${DR_PROV_IP} -v DMAAP_MR_IP:${DMAAP_MR_IP} -v CBS_IP:${CBS_IP} -v PMMAPPER_IP:${PMMAPPER_IP} -v DR_NODE_IP:${DR_NODE_IP}" \ No newline at end of file
diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json b/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json
index 1e3604f6..992fdaaa 100644
--- a/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json
+++ b/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json
@@ -7,39 +7,36 @@
"measTypes": ["attTCHSeizures","succTCHSeizures2","succImmediateAssignProcs8"]
}]
},
- "streams_subscribes": {
- "dmaap_subscriber": {
- "type": "data_router",
- "aaf_username": null,
- "aaf_password": null,
- "dmaap_info": {
- "location": "csit-pmmapper",
- "delivery_url": "http://dcae-pm-mapper:8081/delivery",
- "username": "username",
- "password": "password",
- "subscriber_id": "1"
- }
- }
- },
- "streams_publishes": {
- "dmaap_publisher": {
- "type": "message_router",
- "aaf_password": null,
- "dmaap_info": {
- "topic_url": "http://message-router:3904/events/PM_MAPPER",
- "client_role": "org.onap.dmaap.client.pub",
- "location": "csit-pmmapper",
- "client_id": null
- },
- "aaf_username": null
- }
- },
- "dmaap_dr_feed_name": "1",
- "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
- "services_calls": {},
- "enable_http": true,
"key_store_path": "/opt/app/pm-mapper/etc/cert.jks.b64",
"key_store_pass_path": "/opt/app/pm-mapper/etc/jks.pass",
"trust_store_path": "/opt/app/pm-mapper/etc/trust.jks.b64",
- "trust_store_pass_path": "/opt/app/pm-mapper/etc/trust.pass"
+ "trust_store_pass_path": "/opt/app/pm-mapper/etc/trust.pass",
+ "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+ "dmaap_dr_feed_name": "1",
+ "aaf_identity": "aaf_admin@people.osaaf.org",
+ "aaf_password": "demo123456!",
+ "enable_http": true,
+ "streams_publishes": {
+ "dmaap_publisher": {
+ "type": "message_router",
+ "dmaap_info": {
+ "topic_url": "http://message-router:3904/events/org.onap.dmaap.mr.VES_PM",
+ "client_role": "org.onap.dcae.pmPublisher",
+ "location": "csit-pmmapper",
+ "client_id": "1562763644939"
+ }
+ }
+ },
+ "streams_subscribes": {
+ "dmaap_subscriber": {
+ "type": "data_router",
+ "dmaap_info": {
+ "username": "username",
+ "password": "password",
+ "location": "csit-pmmapper",
+ "delivery_url": "http://dcae-pm-mapper:8081/delivery",
+ "subscriber_id": 1
+ }
+ }
+ }
} \ No newline at end of file
diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json b/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json
index cbb313d0..c2ac9839 100644
--- a/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json
+++ b/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json
@@ -7,39 +7,36 @@
"measTypes": []
}]
},
- "streams_subscribes": {
- "dmaap_subscriber": {
- "type": "data_router",
- "aaf_username": null,
- "aaf_password": null,
- "dmaap_info": {
- "location": "csit-pmmapper",
- "delivery_url": "http://dcae-pm-mapper:8081/delivery",
- "username": "username",
- "password": "password",
- "subscriber_id": "1"
- }
- }
- },
- "streams_publishes": {
- "dmaap_publisher": {
- "type": "message_router",
- "aaf_password": null,
- "dmaap_info": {
- "topic_url": "http://message-router:3904/events/PM_MAPPER",
- "client_role": "org.onap.dmaap.client.pub",
- "location": "csit-pmmapper",
- "client_id": null
- },
- "aaf_username": null
- }
- },
- "dmaap_dr_feed_name": "1",
- "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
- "services_calls": {},
- "enable_http": true,
"key_store_path": "/opt/app/pm-mapper/etc/cert.jks.b64",
"key_store_pass_path": "/opt/app/pm-mapper/etc/jks.pass",
"trust_store_path": "/opt/app/pm-mapper/etc/trust.jks.b64",
- "trust_store_pass_path": "/opt/app/pm-mapper/etc/trust.pass"
+ "trust_store_pass_path": "/opt/app/pm-mapper/etc/trust.pass",
+ "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
+ "dmaap_dr_feed_name": "1",
+ "aaf_identity": "aaf_admin@people.osaaf.org",
+ "aaf_password": "demo123456!",
+ "enable_http": true,
+ "streams_publishes": {
+ "dmaap_publisher": {
+ "type": "message_router",
+ "dmaap_info": {
+ "topic_url": "http://message-router:3904/events/org.onap.dmaap.mr.VES_PM",
+ "client_role": "org.onap.dcae.pmPublisher",
+ "location": "csit-pmmapper",
+ "client_id": "1562763644939"
+ }
+ }
+ },
+ "streams_subscribes": {
+ "dmaap_subscriber": {
+ "type": "data_router",
+ "dmaap_info": {
+ "username": "username",
+ "password": "password",
+ "location": "csit-pmmapper",
+ "delivery_url": "http://dcae-pm-mapper:8081/delivery",
+ "subscriber_id": 1
+ }
+ }
+ }
} \ No newline at end of file
diff --git a/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot b/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot
index c211e7d6..dfd2b66b 100644
--- a/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot
+++ b/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot
@@ -87,11 +87,6 @@ Verify that PM Mapper maps Type-C xml file and publish 3gpp perf VES evnets to m
[Timeout] 1 minute
SendToDatarouter ${TYPE-C_PM_DATA_FILE_PATH} ${VALID_METADATA_PATH} X-ONAP-RequestID=5
CheckLog ${CLI_EXEC_CLI_PM_LOG} Successfully published VES events to messagerouter
- CheckLog ${CLI_EXEC_CLI_PM_LOG} RequestID=5
- Run Process ${CLI_MESSAGE_ROUTER_TOPIC} shell=yes
- CheckLog ${CLI_MR_LOG} measInfoId1
- CheckLog ${CLI_MR_LOG} measInfoId2
- CheckLog ${CLI_MR_LOG} measInfoId3
Verify 3GPP PM Mapper maps Type-A file based on counter filtering and publish 3gpp perf VES evnets to message router
[Tags] PM_MAPPER_08
@@ -102,18 +97,6 @@ Verify 3GPP PM Mapper maps Type-A file based on counter filtering and publish 3g
Sleep 5s
SendToDatarouter ${TYPE-A_PM_DATA_FILE_PATH} ${VALID_METADATA_PATH} X-ONAP-RequestID=6
CheckLog ${CLI_EXEC_CLI_PM_LOG} Successfully published VES events to messagerouter
- CheckLog ${CLI_EXEC_CLI_PM_LOG} RequestID=6
- Run Process ${CLI_MESSAGE_ROUTER_TOPIC} shell=yes
- CheckLog ${CLI_MR_LOG} attTCHSeizures
- CheckLog ${CLI_MR_LOG} 234
- CheckLog ${CLI_MR_LOG} 890
- CheckLog ${CLI_MR_LOG} 456
- CheckLog ${CLI_MR_LOG} succTCHSeizures2
- CheckLog ${CLI_MR_LOG} 86,87,2,6,77,96,75,33,24
- CheckLog ${CLI_MR_LOG} succImmediateAssignProcs8
- CheckLog ${CLI_MR_LOG} 787
- CheckLog ${CLI_MR_LOG} 238
- CheckLog ${CLI_MR_LOG} 785
Verify that PM Mapper correctly identifies a file that should not be mapped based on metadata filtering.
[Tags] PM_MAPPER_09
@@ -132,7 +115,7 @@ Verify that PM Mapper correctly identifies a non-xml file.
[Documentation] Verify that PM Mapper correctly identifies a non-xml file.
[Timeout] 1 minute
SendToDatarouter ${NON_XML_FILE} ${VALID_METADATA_PATH} X-ONAP-RequestID=8
- CheckLog ${CLI_EXEC_CLI_PM_LOG} PM measurement file type not supported
+ CheckLog ${CLI_EXEC_CLI_PM_LOG} PM measurement file must have an extension of .xml
CheckLog ${CLI_EXEC_CLI_PM_LOG} RequestID=8