additional testcase

Change-Id: Ib4fcdf3754c43f4d1996ea50b888d976e728705a
Signed-off-by: VENKATESH KUMAR <vv770d@att.com>
Issue-ID: DCAEGEN2-227

3 files changed, 106 insertions, 96 deletions

diff --git a/etc/DmaapConfig.json b/etc/DmaapConfig.json
index fd38d093..f144b382 100644
--- a/etc/DmaapConfig.json
+++ b/etc/DmaapConfig.json
@@ -1,20 +1,28 @@
-{
-	"channels": [
-		{
-			"name": "ves_measurement",
-			"cambria.topic": "unauthenticated.SEC_MEASUREMENT_OUTPUT",
-			"class": "HpCambriaOutputStream",
-			"stripHpId": "true",
-			"type": "out",
-			"cambria.hosts": "onap.dmaap.org"
-		},
-		{
-			"name": "ves_fault",
-			"cambria.topic": "unauthenticated.SEC_FAULT_OUTPUT",
-			"class": "HpCambriaOutputStream",
-			"stripHpId": "true",
-			"type": "out",
-			"cambria.hosts": "onap.dmaap.org"
-		}
-	]
-}
+{

+	"channels": [

+		{

+			"name": "ves_measurement",

+			"cambria.topic": "unauthenticated.SEC_MEASUREMENT_OUTPUT",

+			"class": "HpCambriaOutputStream",

+			"stripHpId": "true",

+			"type": "out",

+			"cambria.hosts": "onap.dmaap.org"

+		},

+		{

+			"name": "ves_fault",

+			"cambria.topic": "unauthenticated.SEC_FAULT_OUTPUT",

+			"class": "HpCambriaOutputStream",

+			"stripHpId": "true",

+			"type": "out",

+			"cambria.hosts": "onap.dmaap.org"

+		},

+		{

+			"name": "ves_heartbeat",

+			"cambria.topic": "unauthenticated.SEC_FAULT_OUTPUT",

+			"class": "HpCambriaOutputStream",

+			"stripHpId": "true",

+			"type": "out",

+			"cambria.hosts": "onap.dmaap.org"

+		}

+	]

+}

diff --git a/etc/collector.properties b/etc/collector.properties
index 26c12936..251cb02a 100755
--- a/etc/collector.properties
+++ b/etc/collector.properties
@@ -1,74 +1,74 @@
-###############################################################################
-##
-## Collector Server config
-##
-##	- Default values are shown as commented settings.
-##
-###############################################################################
-##
-## HTTP(S) service
-##
-##	Normally:
-##
-##		- 8080 is http service
-##		- https is disabled by default (-1)
-##
-##		- At this time, the server always binds to 0.0.0.0
-##
-## The default port when header.authflag is disabled (0)
-collector.service.port=8080
-
-## The secure port is required if header.authflag is set to 1 (true)
-## Authentication is only supported via secure port
-## When enabled - require valid keystore defined
-collector.service.secure.port=8443
-
-## 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
-
-
-###############################################################################
-## Processing
-##
-## If there's a problem that prevents the collector from processing alarms,
-## it's normally better to apply back pressure to the caller than to try to
-## buffer beyond a reasonable size limit. With a limit, the server won't crash
-## due to being out of memory, and the caller will get a 5xx reply saying the
-## server is in trouble.
-collector.inputQueue.maxPending=8096
-
-## Schema Validation checkflag
-## default no validation checkflag (-1)
-## If enabled (1) - schemafile location must be specified
-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.1.json\"}
-
-## List all streamid per domain to be supported. The streamid should match to channel name on dmaapfile  
-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
-collector.dmaapfile=./etc/DmaapConfig.json
-
-## Custom ExceptionConfiguration
-exceptionConfig=./etc/ExceptionConfig.json
-
-## authflag control authentication by the collector
-## If enabled (1) - then authlist has to be defined
-## When authflag is enabled, only secure port will be supported
-## To disable enter 0
-header.authflag=1
-## Combination of userid,base64 encoded pwd list to be supported
-## userid and pwd comma separated; pipe delimitation between each pair
-header.authlist=sample1,c2FtcGxlMQ==
-
-## Event transformation Flag - when set expects configurable transformation
-## defined under ./etc/eventTransform.json
-## Enabled by default; to disable set to 0
-event.transform.flag=1
-
-###############################################################################
-##
-## Tomcat control
-##
-#tomcat.maxthreads=(tomcat default, which is usually 200)
-
+###############################################################################

+##

+## Collector Server config

+##

+##	- Default values are shown as commented settings.

+##

+###############################################################################

+##

+## HTTP(S) service

+##

+##	Normally:

+##

+##		- 8080 is http service

+##		- https is disabled by default (-1)

+##

+##		- At this time, the server always binds to 0.0.0.0

+##

+## The default port when header.authflag is disabled (0)

+collector.service.port=8080

+

+## The secure port is required if header.authflag is set to 1 (true)

+## Authentication is only supported via secure port

+## When enabled - require valid keystore defined

+#ccollector.service.secure.port=8443

+

+## 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

+

+

+###############################################################################

+## Processing

+##

+## If there's a problem that prevents the collector from processing alarms,

+## it's normally better to apply back pressure to the caller than to try to

+## buffer beyond a reasonable size limit. With a limit, the server won't crash

+## due to being out of memory, and the caller will get a 5xx reply saying the

+## server is in trouble.

+collector.inputQueue.maxPending=8096

+

+## Schema Validation checkflag

+## default no validation checkflag (-1)

+## If enabled (1) - schemafile location must be specified

+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.1.json\"}

+

+## List all streamid per domain to be supported. The streamid should match to channel name on dmaapfile  

+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

+collector.dmaapfile=./etc/DmaapConfig.json

+

+## Custom ExceptionConfiguration

+exceptionConfig=./etc/ExceptionConfig.json

+

+## authflag control authentication by the collector

+## If enabled (1) - then authlist has to be defined

+## When authflag is enabled, only secure port will be supported

+## To disable enter 0

+header.authflag=0

+## Combination of userid,base64 encoded pwd list to be supported

+## userid and pwd comma separated; pipe delimitation between each pair

+header.authlist=sample1,c2FtcGxlMQ==

+

+## Event transformation Flag - when set expects configurable transformation

+## defined under ./etc/eventTransform.json

+## Enabled by default; to disable set to 0

+event.transform.flag=1

+

+###############################################################################

+##

+## Tomcat control

+##

+#tomcat.maxthreads=(tomcat default, which is usually 200)

+

diff --git a/etc/log4j.xml b/etc/log4j.xml
index dc5fe100..baf03559 100644
--- a/etc/log4j.xml
+++ b/etc/log4j.xml
@@ -1,3 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
 <!--
 ================================================================================
 Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
@@ -17,8 +20,7 @@ limitations under the License.
 
 ECOMP is a trademark and service mark of AT&T Intellectual Property.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
 
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">