summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dpo/blueprint/blueprint_ves.yaml1
-rw-r--r--dpo/spec/vescollector-componentspec.json30
-rw-r--r--dpo/tosca_model/schema.yaml2
-rw-r--r--dpo/tosca_model/template.yaml1
-rw-r--r--dpo/tosca_model/translate.yaml4
-rwxr-xr-xetc/collector.properties1
-rw-r--r--src/main/java/org/onap/dcae/ApplicationException.java1
-rw-r--r--src/test/resources/controller-config_dmaap_ip.json1
-rw-r--r--src/test/resources/controller-config_singleline_ip.json129
-rw-r--r--src/test/resources/test_collector_ip_op.properties1
-rw-r--r--src/test/resources/testcollector.properties1
11 files changed, 139 insertions, 33 deletions
diff --git a/dpo/blueprint/blueprint_ves.yaml b/dpo/blueprint/blueprint_ves.yaml
index 3bf50f70..7163766c 100644
--- a/dpo/blueprint/blueprint_ves.yaml
+++ b/dpo/blueprint/blueprint_ves.yaml
@@ -130,7 +130,6 @@ node_templates:
streams_subscribes: {}
collector.inputQueue.maxPending: 8096
collector.schema.file: "./etc/CommonEventFormat_27.2.json"
- collector.keystore.alias: dynamically generated
image:
NEXUS_REPO_HOST:18443/dcae-dev-raw/dcae-controller-ves-collector:1.1.3
docker_config:
diff --git a/dpo/spec/vescollector-componentspec.json b/dpo/spec/vescollector-componentspec.json
index 1b407b14..e5d59834 100644
--- a/dpo/spec/vescollector-componentspec.json
+++ b/dpo/spec/vescollector-componentspec.json
@@ -273,29 +273,21 @@
"designer_editable": false
},
{
- "name": "collector.keystore.alias",
- "value": "dynamically generated",
- "description": "alias to access the keystore; collector will identify this based on keystore and password file",
+ "name": "collector.truststore.file.location",
+ "value": "/opt/app/dcae-certificate/truststore.jks",
+ "description": "fs location of truststore file in vm",
+ "sourced_at_deployment": false,
+ "policy_editable": false,
+ "designer_editable": false
+ },
+ {
+ "name": "collector.truststore.passwordfile",
+ "value": "/opt/app/dcae-certificate/.trustpassword",
+ "description": "location of truststore password file in vm",
"sourced_at_deployment": false,
"policy_editable": false,
"designer_editable": false
},
- {
- "name": "collector.truststore.file.location",
- "value": "/opt/app/dcae-certificate/truststore.jks",
- "description": "fs location of truststore file in vm",
- "sourced_at_deployment": false,
- "policy_editable": false,
- "designer_editable": false
- },
- {
- "name": "collector.truststore.passwordfile",
- "value": "/opt/app/dcae-certificate/.trustpassword",
- "description": "location of truststore password file in vm",
- "sourced_at_deployment": false,
- "policy_editable": false,
- "designer_editable": false
- },
{
"name": "collector.inputQueue.maxPending",
"value": 8096,
diff --git a/dpo/tosca_model/schema.yaml b/dpo/tosca_model/schema.yaml
index d8b16765..6182761b 100644
--- a/dpo/tosca_model/schema.yaml
+++ b/dpo/tosca_model/schema.yaml
@@ -197,8 +197,6 @@ node_types:
type: string
docker_collector.inputQueue.maxPending:
type: string
- docker_collector.keystore.alias:
- type: string
docker_collector.keystore.file.location:
type: string
docker_collector.keystore.passwordfile:
diff --git a/dpo/tosca_model/template.yaml b/dpo/tosca_model/template.yaml
index b439fd18..ce0da721 100644
--- a/dpo/tosca_model/template.yaml
+++ b/dpo/tosca_model/template.yaml
@@ -27,7 +27,6 @@ topology_template:
properties:
docker_collector.dmaap.streamid: fault=sec_fault,roadm-sec-to-hp|syslog=sec_syslog|heartbeat=sec_heartbeat|measurementsForVfScaling=sec_measurement|mobileFlow=sec_mobileflow|other=sec_other|stateChange=sec_statechange|thresholdCrossingAlert=sec_thresholdCrossingAlert
docker_collector.inputQueue.maxPending: '8096'
- docker_collector.keystore.alias: dynamically generated
docker_collector.keystore.file.location: /opt/app/dcae-certificate/keystore.jks
docker_collector.keystore.passwordfile: /opt/app/dcae-certificate/.password
docker_collector.schema.checkflag: '1'
diff --git a/dpo/tosca_model/translate.yaml b/dpo/tosca_model/translate.yaml
index efda8a54..2de809b6 100644
--- a/dpo/tosca_model/translate.yaml
+++ b/dpo/tosca_model/translate.yaml
@@ -26,8 +26,6 @@ topology_template:
type: string
docker_collector.inputQueue.maxPending:
type: string
- docker_collector.keystore.alias:
- type: string
docker_collector.keystore.file.location:
type: string
docker_collector.keystore.passwordfile:
@@ -109,8 +107,6 @@ topology_template:
get_input: docker_collector.dmaap.streamid
collector.inputQueue.maxPending:
get_input: docker_collector.inputQueue.maxPending
- collector.keystore.alias:
- get_input: docker_collector.keystore.alias
collector.keystore.file.location:
get_input: docker_collector.keystore.file.location
collector.keystore.passwordfile:
diff --git a/etc/collector.properties b/etc/collector.properties
index d0c90695..f0aac3b5 100755
--- a/etc/collector.properties
+++ b/etc/collector.properties
@@ -28,7 +28,6 @@ collector.service.secure.clientauth=0
## The keystore must be setup per installation when secure port is configured
collector.keystore.file.location=etc/keystore
collector.keystore.passwordfile=etc/passwordfile
-collector.keystore.alias=tomcat
## The truststore must be setup per installation when mutual tls support is configured
collector.truststore.file.location=etc/truststore
diff --git a/src/main/java/org/onap/dcae/ApplicationException.java b/src/main/java/org/onap/dcae/ApplicationException.java
index 1252423d..5b0e2dfe 100644
--- a/src/main/java/org/onap/dcae/ApplicationException.java
+++ b/src/main/java/org/onap/dcae/ApplicationException.java
@@ -21,7 +21,6 @@
package org.onap.dcae;
-import java.io.IOException;
import org.apache.commons.configuration.ConfigurationException;
public class ApplicationException extends RuntimeException {
diff --git a/src/test/resources/controller-config_dmaap_ip.json b/src/test/resources/controller-config_dmaap_ip.json
index ce2a716e..f12a36fa 100644
--- a/src/test/resources/controller-config_dmaap_ip.json
+++ b/src/test/resources/controller-config_dmaap_ip.json
@@ -1,7 +1,6 @@
{
"header.authflag": 1,
"collector.inputQueue.maxPending": 8096,
- "collector.keystore.alias": "dynamically generated",
"collector.schema.checkflag": 1,
"collector.keystore.file.location": "/opt/app/dcae-certificate/keystore.jks",
"tomcat.maxthreads": "200",
diff --git a/src/test/resources/controller-config_singleline_ip.json b/src/test/resources/controller-config_singleline_ip.json
index 24b80254..827138c7 100644
--- a/src/test/resources/controller-config_singleline_ip.json
+++ b/src/test/resources/controller-config_singleline_ip.json
@@ -1 +1,128 @@
-{"header.authflag": "1", "collector.schema.file": "{\"v1\": \"./etc/CommonEventFormat_27.2.json\", \"v2\": \"./etc/CommonEventFormat_27.2.json\", \"v3\": \"./etc/CommonEventFormat_27.2.json\", \"v4\": \"./etc/CommonEventFormat_27.2.json\", \"v5\": \"./etc/CommonEventFormat_28.4.json\"}", "collector.keystore.passwordfile": "/opt/app/dcae-certificate/.password", "tomcat.maxthreads": "200", "collector.dmaap.streamid": "fault=ves-fault|syslog=ves-syslog|heartbeat=ves-heartbeat|measurementsForVfScaling=ves-measurement|mobileFlow=ves-mobileflow|other=ves-other|stateChange=ves-statechange|thresholdCrossingAlert=ves-thresholdCrossingAlert|voiceQuality=ves-voicequality|sipSignaling=ves-sipsignaling", "streams_subscribes": {}, "collector.inputQueue.maxPending": "8096", "collector.keystore.alias": "dynamically generated", "streams_publishes": {"ves-mobileflow": {"type": "message_router", "dmaap_info": {"client_id": "1517590629043", "client_role": "com.att.secCollector.member", "location": "rdm5bdcc2", "topic_url": "https://DMAAPHOST:3905/events/com.att.dcae.dmaap.FTL.24256-SEC-MOBILEFLOW-OUTPUT-v1"}, "aaf_username": "userid@namespace", "aaf_password": "authpwd"}, "ves-measurement": {"type": "message_router", "dmaap_info": {"client_id": "1517590433916", "client_role": "com.att.secCollector.member", "location": "rdm5bdcc2", "topic_url": "https://DMAAPHOST:3905/events/com.att.dcae.dmaap.FTL.24256-ENC-MEASUREMENT-OUTPUT-v1"}, "aaf_username": "userid@namespace", "aaf_password": "authpwd"}, "ves-voicequality": {"type": "message_router", "dmaap_info": {"client_id": "1517590778397", "client_role": "com.att.secCollector.member", "location": "rdm5bdcc2", "topic_url": "https://DMAAPHOST:3905/events/com.att.dcae.dmaap.FTL.24256-VES-VOICEQUALITY-OUTPUT-v1"}, "aaf_username": "userid@namespace", "aaf_password": "authpwd"}, "ves-thresholdCrossingAlert": {"type": "message_router", "dmaap_info": {"client_id": "1517590728150", "client_role": "com.att.secCollector.member", "location": "rdm5bdcc2", "topic_url": "https://DMAAPHOST:3905/events/com.att.dcae.dmaap.FTL.24256-SEC-TCA-OUTPUT-v1"}, "aaf_username": "userid@namespace", "aaf_password": "authpwd"}, "ves-fault": {"type": "message_router", "dmaap_info": {"client_id": "1517590384670", "client_role": "com.att.secCollector.member", "location": "rdm5bdcc2", "topic_url": "https://DMAAPHOST:3905/events/com.att.dcae.dmaap.FTL.24256-SEC-FAULT-OUTPUT-v1"}, "aaf_username": "userid@namespace", "aaf_password": "authpwd"}, "ves-heartbeat": {"type": "message_router", "dmaap_info": {"client_id": "1517590530041", "client_role": "com.att.secCollector.member", "location": "rdm5bdcc2", "topic_url": "https://DMAAPHOST:3905/events/com.att.dcae.dmaap.FTL.24256-SEC-HEARTBEAT-OUTPUT-v1"}, "aaf_username": "userid@namespace", "aaf_password": "authpwd"}, "ves-sipsignaling": {"type": "message_router", "dmaap_info": {"client_id": "1517590828736", "client_role": "com.att.secCollector.member", "location": "rdm5bdcc2", "topic_url": "https://DMAAPHOST:3905/events/com.att.dcae.dmaap.FTL.24256-VES-SIPSIGNALING-OUTPUT-v1"}, "aaf_username": "userid@namespace", "aaf_password": "authpwd"}, "ves-syslog": {"type": "message_router", "dmaap_info": {"client_id": "1517590482019", "client_role": "com.att.secCollector.member", "location": "rdm5bdcc2", "topic_url": "https://DMAAPHOST:3905/events/com.att.dcae.dmaap.FTL.24256-SEC-SYSLOG-OUTPUT-v1"}, "aaf_username": "userid@namespace", "aaf_password": "authpwd"}, "ves-other": {"type": "message_router", "dmaap_info": {"client_id": "1517590581045", "client_role": "com.att.secCollector.member", "location": "rdm5bdcc2", "topic_url": "https://DMAAPHOST:3905/events/com.att.dcae.dmaap.FTL.24256-SEC-OTHER-OUTPUT-v1"}, "aaf_username": "userid@namespace", "aaf_password": "authpwd"}, "ves-statechange": {"type": "message_router", "dmaap_info": {"client_id": "1517590677649", "client_role": "com.att.secCollector.member", "location": "rdm5bdcc2", "topic_url": "https://DMAAPHOST:3905/events/com.att.dcae.dmaap.FTL.24256-SEC-STATECHANGE-OUTPUT-v1"}, "aaf_username": "userid@namespace", "aaf_password": "authpwd"}}, "collector.schema.checkflag": "1", "services_calls": {}, "event.transform.flag": "1", "collector.keystore.file.location": "/opt/app/dcae-certificate/keystore.jks", "header.authlist": "sample1,$2a$10$pgjaxDzSuc6XVFEeqvxQ5u90DKJnM/u7TJTcinAlFJVaavXMWf/Zi|userid1,$2a$10$61gNubgJJl9lh3nvQvY9X.x4e5ETWJJ7ao7ZhJEvmfJigov26Z6uq|userid2,$2a$10$G52y/3uhuhWAMy.bx9Se8uzWinmbJa.dlm1LW6bYPdPkkywLDPLiy", "collector.service.secure.port": "8443", "collector.service.port": "-1"} \ No newline at end of file
+{
+ "header.authflag": "1",
+ "collector.schema.file": "{\"v1\": \"./etc/CommonEventFormat_27.2.json\", \"v2\": \"./etc/CommonEventFormat_27.2.json\", \"v3\": \"./etc/CommonEventFormat_27.2.json\", \"v4\": \"./etc/CommonEventFormat_27.2.json\", \"v5\": \"./etc/CommonEventFormat_28.4.json\"}",
+ "collector.keystore.passwordfile": "/opt/app/dcae-certificate/.password",
+ "tomcat.maxthreads": "200",
+ "collector.dmaap.streamid": "fault=ves-fault|syslog=ves-syslog|heartbeat=ves-heartbeat|measurementsForVfScaling=ves-measurement|mobileFlow=ves-mobileflow|other=ves-other|stateChange=ves-statechange|thresholdCrossingAlert=ves-thresholdCrossingAlert|voiceQuality=ves-voicequality|sipSignaling=ves-sipsignaling",
+ "streams_subscribes": {},
+ "collector.inputQueue.maxPending": "8096",
+ "streams_publishes": {
+ "ves-mobileflow": {
+ "type": "message_router",
+ "dmaap_info": {
+ "client_id": "1517590629043",
+ "client_role": "com.att.secCollector.member",
+ "location": "rdm5bdcc2",
+ "topic_url": "https://DMAAPHOST:3905/events/com.att.dcae.dmaap.FTL.24256-SEC-MOBILEFLOW-OUTPUT-v1"
+ },
+ "aaf_username": "userid@namespace",
+ "aaf_password": "authpwd"
+ },
+ "ves-measurement": {
+ "type": "message_router",
+ "dmaap_info": {
+ "client_id": "1517590433916",
+ "client_role": "com.att.secCollector.member",
+ "location": "rdm5bdcc2",
+ "topic_url": "https://DMAAPHOST:3905/events/com.att.dcae.dmaap.FTL.24256-ENC-MEASUREMENT-OUTPUT-v1"
+ },
+ "aaf_username": "userid@namespace",
+ "aaf_password": "authpwd"
+ },
+ "ves-voicequality": {
+ "type": "message_router",
+ "dmaap_info": {
+ "client_id": "1517590778397",
+ "client_role": "com.att.secCollector.member",
+ "location": "rdm5bdcc2",
+ "topic_url": "https://DMAAPHOST:3905/events/com.att.dcae.dmaap.FTL.24256-VES-VOICEQUALITY-OUTPUT-v1"
+ },
+ "aaf_username": "userid@namespace",
+ "aaf_password": "authpwd"
+ },
+ "ves-thresholdCrossingAlert": {
+ "type": "message_router",
+ "dmaap_info": {
+ "client_id": "1517590728150",
+ "client_role": "com.att.secCollector.member",
+ "location": "rdm5bdcc2",
+ "topic_url": "https://DMAAPHOST:3905/events/com.att.dcae.dmaap.FTL.24256-SEC-TCA-OUTPUT-v1"
+ },
+ "aaf_username": "userid@namespace",
+ "aaf_password": "authpwd"
+ },
+ "ves-fault": {
+ "type": "message_router",
+ "dmaap_info": {
+ "client_id": "1517590384670",
+ "client_role": "com.att.secCollector.member",
+ "location": "rdm5bdcc2",
+ "topic_url": "https://DMAAPHOST:3905/events/com.att.dcae.dmaap.FTL.24256-SEC-FAULT-OUTPUT-v1"
+ },
+ "aaf_username": "userid@namespace",
+ "aaf_password": "authpwd"
+ },
+ "ves-heartbeat": {
+ "type": "message_router",
+ "dmaap_info": {
+ "client_id": "1517590530041",
+ "client_role": "com.att.secCollector.member",
+ "location": "rdm5bdcc2",
+ "topic_url": "https://DMAAPHOST:3905/events/com.att.dcae.dmaap.FTL.24256-SEC-HEARTBEAT-OUTPUT-v1"
+ },
+ "aaf_username": "userid@namespace",
+ "aaf_password": "authpwd"
+ },
+ "ves-sipsignaling": {
+ "type": "message_router",
+ "dmaap_info": {
+ "client_id": "1517590828736",
+ "client_role": "com.att.secCollector.member",
+ "location": "rdm5bdcc2",
+ "topic_url": "https://DMAAPHOST:3905/events/com.att.dcae.dmaap.FTL.24256-VES-SIPSIGNALING-OUTPUT-v1"
+ },
+ "aaf_username": "userid@namespace",
+ "aaf_password": "authpwd"
+ },
+ "ves-syslog": {
+ "type": "message_router",
+ "dmaap_info": {
+ "client_id": "1517590482019",
+ "client_role": "com.att.secCollector.member",
+ "location": "rdm5bdcc2",
+ "topic_url": "https://DMAAPHOST:3905/events/com.att.dcae.dmaap.FTL.24256-SEC-SYSLOG-OUTPUT-v1"
+ },
+ "aaf_username": "userid@namespace",
+ "aaf_password": "authpwd"
+ },
+ "ves-other": {
+ "type": "message_router",
+ "dmaap_info": {
+ "client_id": "1517590581045",
+ "client_role": "com.att.secCollector.member",
+ "location": "rdm5bdcc2",
+ "topic_url": "https://DMAAPHOST:3905/events/com.att.dcae.dmaap.FTL.24256-SEC-OTHER-OUTPUT-v1"
+ },
+ "aaf_username": "userid@namespace",
+ "aaf_password": "authpwd"
+ },
+ "ves-statechange": {
+ "type": "message_router",
+ "dmaap_info": {
+ "client_id": "1517590677649",
+ "client_role": "com.att.secCollector.member",
+ "location": "rdm5bdcc2",
+ "topic_url": "https://DMAAPHOST:3905/events/com.att.dcae.dmaap.FTL.24256-SEC-STATECHANGE-OUTPUT-v1"
+ },
+ "aaf_username": "userid@namespace",
+ "aaf_password": "authpwd"
+ }
+ },
+ "collector.schema.checkflag": "1",
+ "services_calls": {},
+ "event.transform.flag": "1",
+ "collector.keystore.file.location": "/opt/app/dcae-certificate/keystore.jks",
+ "header.authlist": "sample1,$2a$10$pgjaxDzSuc6XVFEeqvxQ5u90DKJnM/u7TJTcinAlFJVaavXMWf/Zi|userid1,$2a$10$61gNubgJJl9lh3nvQvY9X.x4e5ETWJJ7ao7ZhJEvmfJigov26Z6uq|userid2,$2a$10$G52y/3uhuhWAMy.bx9Se8uzWinmbJa.dlm1LW6bYPdPkkywLDPLiy",
+ "collector.service.secure.port": "8443",
+ "collector.service.port": "-1"
+} \ No newline at end of file
diff --git a/src/test/resources/test_collector_ip_op.properties b/src/test/resources/test_collector_ip_op.properties
index 1673af6f..1d1364bc 100644
--- a/src/test/resources/test_collector_ip_op.properties
+++ b/src/test/resources/test_collector_ip_op.properties
@@ -2,7 +2,6 @@ collector.service.port=-1
collector.service.secure.port=8443
collector.keystore.file.location=/opt/app/dcae-certificate/keystore.jks
collector.keystore.passwordfile=/opt/app/dcae-certificate/.password
-collector.keystore.alias=dynamically generated
collector.schema.checkflag=1
collector.schema.file={\"v1\":\"./etc/CommonEventFormat_27.2.json\",\"v2\":\"./etc/CommonEventFormat_27.2.json\",\"v3\":\"./etc/CommonEventFormat_27.2.json\",\"v4\":\"./etc/CommonEventFormat_27.2.json\",\"v5\":\"./etc/CommonEventFormat_28.4.json\"}
collector.dmaap.streamid=fault=ves-fault,ves-fault-secondary|syslog=ves-syslog,ves-syslog-secondary|heartbeat=ves-heartbeat,ves-heartbeat-secondary|measurementsForVfScaling=ves-measurement,ves-measurement-secondary|mobileFlow=ves-mobileflow,ves-mobileflow-secondary|other=ves-other,ves-other-secondary|stateChange=ves-statechange,ves-statechange-secondary|thresholdCrossingAlert=ves-thresholdCrossingAlert,ves-thresholdCrossingAlert-secondary|voiceQuality=ves-voicequality,ves-voicequality-secondary|sipSignaling=ves-sipsignaling,ves-sipsignaling-secondary
diff --git a/src/test/resources/testcollector.properties b/src/test/resources/testcollector.properties
index 3b6fe58d..a99fd067 100644
--- a/src/test/resources/testcollector.properties
+++ b/src/test/resources/testcollector.properties
@@ -2,7 +2,6 @@ collector.service.port=9999
collector.service.secure.port=8443
collector.keystore.file.location=../etc/keystore
collector.keystore.passwordfile=./etc/passwordfile
-collector.keystore.alias=tomcat
collector.schema.checkflag=1
collector.schema.file={\"v1\":\"./etc/CommonEventFormat_27.2.json\",\"v2\":\"./etc/CommonEventFormat_27.2.json\",\"v3\":\"./etc/CommonEventFormat_27.2.json\",\"v4\":\"./etc/CommonEventFormat_27.2.json\",\"v5\":\"./etc/CommonEventFormat_28.4.json\"}
collector.dmaap.streamid=fault=sec_fault|syslog=sec_syslog|heartbeat=sec_heartbeat|measurementsForVfScaling=sec_measurement|mobileFlow=sec_mobileflow|other=sec_other|stateChange=sec_statechange|thresholdCrossingAlert=sec_thresholdCrossingAlert|voiceQuality=ves_voicequality|sipSignaling=ves_sipsignaling