Issue-ID: DCAEGEN2-1055 Generic RestConfCollector

Change-Id: I1800affa2b34cbb7487c0d8411e078adec5a0c48
Signed-off-by: s00370346 <swarup.nayak1@huawei.com>

18 files changed, 444 insertions, 37 deletions

diff --git a/src/test/resources/RestConfEvent.json b/src/test/resources/RestConfEvent.json
deleted file mode 100755
index 93d0b64..0000000
--- a/src/test/resources/RestConfEvent.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "ietf-notification:notification" : {
-        "eventTime" : "eventtime",
-        "ietf-yang-push:push-change-update": {
-            "subscription-id":"100",
-            "datastore-changes": {
-                "ietf-yang-patch:yang-patch":{
-                    "patch-id":"patch-id",
-                    "edit":[{
-                        "edit-id":"edit-id",
-                        "operation":"create",
-                        "target":"target",
-                        "value": {
-                            "ietf-interfaces:interfaces-state":{
-                                "interface": {
-                                    "name":"eth0",
-                                    "oper-status":"up"
-                                }
-                            }
-                        }
-                    }]
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/resources/controller-config_dmaap_ip.json b/src/test/resources/controller-config_dmaap_ip.json
new file mode 100755
index 0000000..060c51e
--- /dev/null
+++ b/src/test/resources/controller-config_dmaap_ip.json
@@ -0,0 +1,238 @@
+{
+	"header.authflag": 1,
+	"collector.inputQueue.maxPending": 8096,
+	"collector.schema.checkflag": 1,
+	"collector.keystore.file.location": "/opt/app/dcae-certificate/keystore.jks",
+	"tomcat.maxthreads": "200",
+	"collector.keystore.passwordfile": "/opt/app/dcae-certificate/.password",
+	"collector.service.secure.port": 8687,
+	"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",
+	"streams_subscribes": {},
+	"collector.service.port": -1,
+	"services_calls": {},
+	"streams_publishes": {
+		"ves-other": {
+			"aaf_username": null,
+			"type": "message_router",
+			"aaf_password": null,
+			"dmaap_info": {
+				"client_id": null,
+				"location": "mtl5",
+				"client_role": null,
+				"topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+			}
+		},
+		"ves-fault": {
+			"aaf_username": null,
+			"type": "message_router",
+			"aaf_password": null,
+			"dmaap_info": {
+				"client_id": null,
+				"location": "mtl5",
+				"client_role": null,
+				"topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+			}
+		},
+		"ves-syslog": {
+			"aaf_username": null,
+			"type": "message_router",
+			"aaf_password": null,
+			"dmaap_info": {
+				"client_id": null,
+				"location": "mtl5",
+				"client_role": null,
+				"topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+			}
+		},
+		"ves-other-secondary": {
+			"aaf_username": null,
+			"type": "message_router",
+			"aaf_password": null,
+			"dmaap_info": {
+				"client_id": null,
+				"location": "mtl5",
+				"client_role": null,
+				"topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+			}
+		},
+		"ves-syslog-secondary": {
+			"aaf_username": null,
+			"type": "message_router",
+			"aaf_password": null,
+			"dmaap_info": {
+				"client_id": null,
+				"location": "mtl5",
+				"client_role": null,
+				"topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+			}
+		},
+		"ves-thresholdCrossingAlert-secondary": {
+			"aaf_username": null,
+			"type": "message_router",
+			"aaf_password": null,
+			"dmaap_info": {
+				"client_id": null,
+				"location": "mtl5",
+				"client_role": null,
+				"topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+			}
+		},
+		"ves-voicequality": {
+			"aaf_username": null,
+			"type": "message_router",
+			"aaf_password": null,
+			"dmaap_info": {
+				"client_id": null,
+				"location": "mtl5",
+				"client_role": null,
+				"topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+			}
+		},
+		"ves-sipsignaling-secondary": {
+			"aaf_username": null,
+			"type": "message_router",
+			"aaf_password": null,
+			"dmaap_info": {
+				"client_id": null,
+				"location": "mtl5",
+				"client_role": null,
+				"topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+			}
+		},
+		"ves-heartbeat": {
+			"aaf_username": null,
+			"type": "message_router",
+			"aaf_password": null,
+			"dmaap_info": {
+				"client_id": null,
+				"location": "mtl5",
+				"client_role": null,
+				"topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+			}
+		},
+		"ves-mobileflow-secondary": {
+			"aaf_username": null,
+			"type": "message_router",
+			"aaf_password": null,
+			"dmaap_info": {
+				"client_id": null,
+				"location": "mtl5",
+				"client_role": null,
+				"topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+			}
+		},
+		"ves-heartbeat-secondary": {
+			"aaf_username": null,
+			"type": "message_router",
+			"aaf_password": null,
+			"dmaap_info": {
+				"client_id": null,
+				"location": "mtl5",
+				"client_role": null,
+				"topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+			}
+		},
+		"ves-measurement-secondary": {
+			"aaf_username": null,
+			"type": "message_router",
+			"aaf_password": null,
+			"dmaap_info": {
+				"client_id": null,
+				"location": "mtl5",
+				"client_role": null,
+				"topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+			}
+		},
+		"ves-measurement": {
+			"aaf_username": null,
+			"type": "message_router",
+			"aaf_password": null,
+			"dmaap_info": {
+				"client_id": null,
+				"location": "mtl5",
+				"client_role": null,
+				"topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+			}
+		},
+		"ves-sipsignaling": {
+			"aaf_username": null,
+			"type": "message_router",
+			"aaf_password": null,
+			"dmaap_info": {
+				"client_id": null,
+				"location": "mtl5",
+				"client_role": null,
+				"topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+			}
+		},
+		"ves-statechange-secondary": {
+			"aaf_username": null,
+			"type": "message_router",
+			"aaf_password": null,
+			"dmaap_info": {
+				"client_id": null,
+				"location": "mtl5",
+				"client_role": null,
+				"topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+			}
+		},
+		"ves-voicequality-secondary": {
+			"aaf_username": null,
+			"type": "message_router",
+			"aaf_password": null,
+			"dmaap_info": {
+				"client_id": null,
+				"location": "mtl5",
+				"client_role": null,
+				"topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+			}
+		},
+		"ves-fault-secondary": {
+			"aaf_username": null,
+			"type": "message_router",
+			"aaf_password": null,
+			"dmaap_info": {
+				"client_id": null,
+				"location": "mtl5",
+				"client_role": null,
+				"topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+			}
+		},
+		"ves-statechange": {
+			"aaf_username": null,
+			"type": "message_router",
+			"aaf_password": null,
+			"dmaap_info": {
+				"client_id": null,
+				"location": "mtl5",
+				"client_role": null,
+				"topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+			}
+		},
+		"ves-mobileflow": {
+			"aaf_username": null,
+			"type": "message_router",
+			"aaf_password": null,
+			"dmaap_info": {
+				"client_id": null,
+				"location": "mtl5",
+				"client_role": null,
+				"topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+			}
+		},
+		"ves-thresholdCrossingAlert": {
+			"aaf_username": null,
+			"type": "message_router",
+			"aaf_password": null,
+			"dmaap_info": {
+				"client_id": null,
+				"location": "mtl5",
+				"client_role": null,
+				"topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV"
+			}
+		}
+	},
+	"event.transform.flag": 1,
+	"header.authlist": "sample1,$2a$10$pgjaxDzSuc6XVFEeqvxQ5u90DKJnM/u7TJTcinAlFJVaavXMWf/Zi|userid1,$2a$10$61gNubgJJl9lh3nvQvY9X.x4e5ETWJJ7ao7ZhJEvmfJigov26Z6uq|userid2,$2a$10$G52y/3uhuhWAMy.bx9Se8uzWinmbJa.dlm1LW6bYPdPkkywLDPLiy"
+}
diff --git a/src/test/resources/controller-config_singleline_ip.json b/src/test/resources/controller-config_singleline_ip.json
new file mode 100755
index 0000000..752a64f
--- /dev/null
+++ b/src/test/resources/controller-config_singleline_ip.json
@@ -0,0 +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",
+  "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",
+  "collector.header.authlist": "sample1,$2a$10$pgjaxDzSuc6XVFEeqvxQ5u90DKJnM/u7TJTcinAlFJVaavXMWf/Zi|userid1,$2a$10$61gNubgJJl9lh3nvQvY9X.x4e5ETWJJ7ao7ZhJEvmfJigov26Z6uq|userid2,$2a$10$G52y/3uhuhWAMy.bx9Se8uzWinmbJa.dlm1LW6bYPdPkkywLDPLiy",
+  "collector.rcc.service.secure.port": "8687",
+  "collector.rcc.service.port": "-1"
+}
\ No newline at end of file
diff --git a/src/test/resources/keystore b/src/test/resources/keystore
new file mode 100755
index 0000000..f0822cb
--- /dev/null
+++ b/src/test/resources/keystore
diff --git a/src/test/resources/passwordfile b/src/test/resources/passwordfile
new file mode 100755
index 0000000..11e1e24
--- /dev/null
+++ b/src/test/resources/passwordfile
@@ -0,0 +1 @@
+vestest
\ No newline at end of file
diff --git a/src/test/resources/rcc_passwordfile b/src/test/resources/rcc_passwordfile
new file mode 100755
index 0000000..25acfbf
--- /dev/null
+++ b/src/test/resources/rcc_passwordfile
@@ -0,0 +1 @@
+collector
\ No newline at end of file
diff --git a/src/test/resources/sdnc.p12 b/src/test/resources/sdnc.p12
new file mode 100755
index 0000000..15c8893
--- /dev/null
+++ b/src/test/resources/sdnc.p12
diff --git a/src/test/resources/testDmaapConfig_ip.json b/src/test/resources/testDmaapConfig_ip.json
new file mode 100755
index 0000000..247db78
--- /dev/null
+++ b/src/test/resources/testDmaapConfig_ip.json
@@ -0,0 +1,12 @@
+{
+
+	"channels": [{
+			"name": "sec_fault_ueb",
+			"type": "out",
+			"class": "HpCambriaOutputStream",
+			"cambria.hosts": "uebsb91kcdc.it.att.com,uebsb92kcdc.it.att.com,uebsb93kcdc.it.att.com",
+			"cambria.topic": "DCAE-SE-COLLECTOR-EVENTS-DEV",
+			"stripHpId": "true"
+		}
+	]
+}
diff --git a/src/test/resources/testFullDmaapConfig_gen2.json b/src/test/resources/testFullDmaapConfig_gen2.json
new file mode 100755
index 0000000..6880466
--- /dev/null
+++ b/src/test/resources/testFullDmaapConfig_gen2.json
@@ -0,0 +1,24 @@
+{
+  "ves-fault-secondary": {
+    "aaf_username": "sampleUsername",
+    "dmaap_info": {
+      "topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV",
+      "location": "mtl5",
+      "client_id": null,
+      "client_role": null
+    },
+    "type": "message_router",
+    "aaf_password": "SamplePasswd"
+  },
+  "ves-thresholdCrossingAlert-secondary": {
+    "aaf_username": "sampleUsername2",
+    "dmaap_info": {
+      "topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV",
+      "location": "mtl5",
+      "client_id": null,
+      "client_role": null
+    },
+    "type": "message_router",
+    "aaf_password": "SamplePassWD2"
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/testParseDMaaPCredentialsGen2.json b/src/test/resources/testParseDMaaPCredentialsGen2.json
index 23230c1..953cb6e 100755
--- a/src/test/resources/testParseDMaaPCredentialsGen2.json
+++ b/src/test/resources/testParseDMaaPCredentialsGen2.json
@@ -2,20 +2,20 @@
   "auth-credentials-null": {
     "aaf_username": null,
     "dmaap_info": {
-      "topic_url": "http://UEBHOST:3904/events/DCAE-RESTCONF-COLLECTOR-EVENTS-DEV"
+      "topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV",
     },
     "aaf_password": null
   },
   "auth-credentials-present": {
     "aaf_username": "sampleUser",
     "dmaap_info": {
-      "topic_url": "http://UEBHOST:3904/events/DCAE-RESTCONF-COLLECTOR-EVENTS-DEV"
+      "topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV",
     },
     "aaf_password": "samplePassword"
   },
   "auth-credentials-missing": {
     "dmaap_info": {
-      "topic_url": "http://UEBHOST:3904/events/DCAE-RESTCONF-COLLECTOR-EVENTS-DEV"
+      "topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV",
     }
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/testParseDMaaPCredentialsGen2Temp.json b/src/test/resources/testParseDMaaPCredentialsGen2Temp.json
new file mode 100755
index 0000000..fef7a8b
--- /dev/null
+++ b/src/test/resources/testParseDMaaPCredentialsGen2Temp.json
@@ -0,0 +1,9 @@
+{
+  "auth-credentials-present": {
+    "aaf_username": "sampleUser",
+    "dmaap_info": {
+      "topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV",
+    },
+    "aaf_password": "samplePassword"
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/testParseDMaaPCredentialsLegacy.json b/src/test/resources/testParseDMaaPCredentialsLegacy.json
index ee215e2..9f19b2c 100755
--- a/src/test/resources/testParseDMaaPCredentialsLegacy.json
+++ b/src/test/resources/testParseDMaaPCredentialsLegacy.json
@@ -4,7 +4,7 @@
       "name": "auth-credentials-null",
       "cambria.url": "127.0.0.1:3904",
       "cambria.hosts": "uebsb91kcdc.it.att.com,uebsb92kcdc.it.att.com,uebsb93kcdc.it.att.com",
-      "cambria.topic": "DCAE-RESTCONF-COLLECTOR-EVENTS-DEV",
+      "cambria.topic": "DCAE-SE-COLLECTOR-EVENTS-DEV",
       "basicAuthPassword": null,
       "basicAuthUsername": null
     },
@@ -12,7 +12,7 @@
       "name": "auth-credentials-present",
       "cambria.url": "127.0.0.1:3904",
       "cambria.hosts": "uebsb91kcdc.it.att.com,uebsb92kcdc.it.att.com,uebsb93kcdc.it.att.com",
-      "cambria.topic": "DCAE-RESTCONF-COLLECTOR-EVENTS-DEV",
+      "cambria.topic": "DCAE-SE-COLLECTOR-EVENTS-DEV",
       "basicAuthPassword": "samplePassword",
       "basicAuthUsername": "sampleUser"
     },
@@ -20,7 +20,7 @@
       "name": "auth-credentials-missing",
       "cambria.url": "127.0.0.1:3904",
       "cambria.hosts": "uebsb91kcdc.it.att.com,uebsb92kcdc.it.att.com,uebsb93kcdc.it.att.com",
-      "cambria.topic": "DCAE-RESTCONF-COLLECTOR-EVENTS-DEV"
+      "cambria.topic": "DCAE-SE-COLLECTOR-EVENTS-DEV"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/test/resources/testParseDMaaPGen2.json b/src/test/resources/testParseDMaaPGen2.json
index 4ef04a2..5b4fe6a 100755
--- a/src/test/resources/testParseDMaaPGen2.json
+++ b/src/test/resources/testParseDMaaPGen2.json
@@ -1,12 +1,12 @@
 {
   "event-segments-with-port": {
     "dmaap_info": {
-      "topic_url": "http://UEBHOST:3904/events/DCAE-RESTCONF-COLLECTOR-EVENTS-DEV"
+      "topic_url": "http://UEBHOST:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV",
     }
   },
   "other-segments-without-ports": {
     "dmaap_info": {
-      "topic_url": "http://UEBHOST:3904/somethingHere/DCAE-RESTCONF-COLLECTOR-EVENTS-DEV"
+      "topic_url": "http://UEBHOST:3904/somethingHere/DCAE-SE-COLLECTOR-EVENTS-DEV",
     }
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/testParseDMaaPLegacy.json b/src/test/resources/testParseDMaaPLegacy.json
index fda9c60..9661e30 100755
--- a/src/test/resources/testParseDMaaPLegacy.json
+++ b/src/test/resources/testParseDMaaPLegacy.json
@@ -4,18 +4,18 @@
       "name": "url-precedes-hosts",
       "cambria.url": "127.0.0.1:3904",
       "cambria.hosts": "h1.att.com,h2.att.com",
-      "cambria.topic": "DCAE-RESTCONF-COLLECTOR-EVENTS-DEV"
+      "cambria.topic": "DCAE-SE-COLLECTOR-EVENTS-DEV",
     },
     {
       "name": "url-key-missing",
       "cambria.hosts": "h1.att.com,h2.att.com",
-      "cambria.topic": "DCAE-RESTCONF-COLLECTOR-EVENTS-DEV"
+      "cambria.topic": "DCAE-SE-COLLECTOR-EVENTS-DEV",
     },
     {
       "name": "url-is-null",
       "cambria.url": null,
       "cambria.hosts": "h1.att.com,h2.att.com",
-      "cambria.topic": "DCAE-RESTCONF-COLLECTOR-EVENTS-DEV"
+      "cambria.topic": "DCAE-SE-COLLECTOR-EVENTS-DEV"
     }
   ]
 }
\ No newline at end of file
diff --git a/src/test/resources/test_anynode_class.json b/src/test/resources/test_anynode_class.json
new file mode 100755
index 0000000..0d34945
--- /dev/null
+++ b/src/test/resources/test_anynode_class.json
@@ -0,0 +1,9 @@
+{
+  "channels": [{
+    "one": "number1", "two": "number2", "three": "number3"}],
+  "sampleStrList": ["1", "2", "3", "4", "5"],
+  "sampleNestedObject": {"a": 1, "b": 2},
+  "sampleInt": 1,
+  "sampleString": "str",
+  "sampleNull": null
+}
diff --git a/src/test/resources/testcollector.properties b/src/test/resources/testcollector.properties
new file mode 100755
index 0000000..677e1c8
--- /dev/null
+++ b/src/test/resources/testcollector.properties
@@ -0,0 +1,10 @@
+collector.rcc.service.port=9999

+collector.rcc.service.secure.port=8687

+collector.rcc.keystore.file.location=../etc/keystore

+collector.rcc.keystore.passwordfile=./etc/passwordfile

+collector.rcc.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

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

+collector.header.authflag=1

+collector.header.authlist=sample1,$2a$10$pgjaxDzSuc6XVFEeqvxQ5u90DKJnM/u7TJTcinAlFJVaavXMWf/Zi|userid1,$2a$10$61gNubgJJl9lh3nvQvY9X.x4e5ETWJJ7ao7ZhJEvmfJigov26Z6uq|userid2,$2a$10$G52y/3uhuhWAMy.bx9Se8uzWinmbJa.dlm1LW6bYPdPkkywLDPLiy

+

+

diff --git a/src/test/resources/trustpasswordfile b/src/test/resources/trustpasswordfile
new file mode 100755
index 0000000..11e1e24
--- /dev/null
+++ b/src/test/resources/trustpasswordfile
@@ -0,0 +1 @@
+vestest
\ No newline at end of file
diff --git a/src/test/resources/truststore b/src/test/resources/truststore
new file mode 100755
index 0000000..b0802a7
--- /dev/null
+++ b/src/test/resources/truststore