HZN-741, HZN-742, HZN-780: Adding tests in Junit files for kafka feat…

…ures. Adding trapd kafka feature in pom.xml and added the kafka-default to the list of features and pom.xml.
OpenNMS · Jul 18, 2016 · 60d4c0c · 60d4c0c
1 parent 2cc1184
commit 60d4c0c
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 18 deletions.
diff --git a/container/features/pom.xml b/container/features/pom.xml
@@ -217,10 +217,14 @@
             <feature>opennms-syslogd-listener-nio</feature>
             <feature>opennms-syslogd-handler-default</feature>
             <feature>opennms-syslogd-handler-kafka</feature>
+            <feature>opennms-syslogd-handler-kafka-default</feature>
             <feature>opennms-syslogd-handler-minion</feature>
             <feature>opennms-trapd</feature>
             <feature>opennms-trapd-handler-default</feature>
             <feature>opennms-trapd-listener</feature>
+            <feature>opennms-trapd-handler-kafka</feature>
+            <feature>opennms-trapd-handler-kafka-default</feature>
+
             <!-- <feature>opennms-webapp</feature> -->
             <feature>org.json</feature>
             <feature>postgresql</feature>

diff --git a/container/features/src/main/resources/features-minion.xml b/container/features/src/main/resources/features-minion.xml
@@ -51,6 +51,14 @@
       <bundle>blueprint:mvn:org.opennms.features.events/org.opennms.features.events.traps/${project.version}/xml/blueprint-trapd-handler-minion</bundle>
     </feature>
 
+    <feature name="opennms-trapd-handler-kafka" description="OpenNMS :: Trapd :: Handler :: Kafka" version="${project.version}">
+      <feature>camel-blueprint</feature>
+      <feature>minion-core-api</feature>
+      <feature>opennms-dao-minion</feature>
+      <feature>opennms-trapd</feature>
+      <bundle>blueprint:mvn:org.opennms.features.events/org.opennms.features.events.traps/${project.version}/xml/blueprint-trapd-handler-kafka</bundle>
+    </feature>
+
     <feature name="minion-heartbeat" description="OpenNMS :: Minion :: HeartBeat" version="${project.version}">
       <feature>camel-blueprint</feature>
       <feature>minion-core-api</feature>

diff --git a/container/features/src/main/resources/features.xml b/container/features/src/main/resources/features.xml
@@ -811,13 +811,6 @@
       <bundle>blueprint:mvn:org.opennms.features.events/org.opennms.features.events.traps/${project.version}/xml/blueprint-trapd-handler-default</bundle>
     </feature>
 
-    <feature name="opennms-trapd-handler-kafka" description="OpenNMS :: Trapd :: Handler :: Kafka" version="${project.version}">
-      <feature>camel-blueprint</feature>
-      <feature>opennms-trapd</feature>
-
-      <bundle>blueprint:mvn:org.opennms.features.events/org.opennms.features.events.traps/${project.version}/xml/blueprint-trapd-handler-kafka</bundle>
-    </feature>
-
     <feature name="opennms-trapd-handler-kafka-default" description="OpenNMS :: Trapd :: Handler :: Kafka :: default" version="${project.version}">
       <feature>camel-blueprint</feature>
       <feature>opennms-trapd</feature>

diff --git a/features/events/traps/blueprint-trapd-handler-kafka-default.xml b/features/events/traps/blueprint-trapd-handler-kafka-default.xml
@@ -57,7 +57,17 @@
 		<route id="receiveTrapConnection">
 			<from uri="kafka:{{kafkahost}}:{{kafkaport}}?topic={{kafkatopic}}&amp;zookeeperHost={{zookeeperhost}}&amp;zookeeperPort={{zookeeperport}}&amp;groupId={{groupId}}"/>
 				<convertBodyTo type="org.opennms.netmgt.snmp.TrapNotification"/>
-			<bean ref="trapNotificationHandlerDefault"/>
+			<to uri="seda:trapHandler"/>
+		</route>
+
+		<route id="trapHandler">
+			<from uri="seda:trapHandler" />
+			<convertBodyTo type="org.opennms.netmgt.snmp.TrapNotification" />
+			<!--
+				Pass the message to the default handler which will convert it into 
+				an event and broadcast the event.
+			-->
+			<bean ref="trapNotificationHandlerDefault" />
 		</route>
 	</camelContext>
 

diff --git a/features/events/traps/blueprint-trapd-handler-kafka.xml b/features/events/traps/blueprint-trapd-handler-kafka.xml
@@ -29,21 +29,15 @@
 
 	<camelContext id="trapNotificationHandler" xmlns="http://camel.apache.org/schema/blueprint">
 		<propertyPlaceholder id="properties" location="blueprint:trapdHandlerKafkaProperties" />
-		<route id="handle">
+		<route id="handleTrap">
 			<from uri="seda:handleMessage" />
 			<convertBodyTo type="org.opennms.netmgt.snmp.TrapNotification"/>
 			<setHeader headerName="kafka.PARTITION_KEY">
 				<!-- TODO: Partition by remote address -->
 				<!-- <simple>${body.remoteAddress}</simple> -->
-				<simple>${body.sourceAddress}</simple>
+				<simple>${body.agent}</simple>
 			</setHeader>
- 			<log message="address:       ${body.sourceAddress}"/>
-			<log message="port:          ${body.port}"/>
- 			<transform>
-				<simple>${body.byteBuffer}</simple>
-			</transform>
-			<convertBodyTo type="java.lang.String"/>
-			<log message="bytes:         ${body}"/>
+
 			<!-- Have to use StringEncoder because of camel bug CAMEL-8790 -->
 			<to uri="kafka:{{kafkahost}}:{{kafkaport}}?topic={{kafkatopic}}&amp;serializerClass=kafka.serializer.StringEncoder"/>
 		</route>

diff --git a/features/minion/repository/pom.xml b/features/minion/repository/pom.xml
@@ -47,7 +47,7 @@
                                 <feature>opennms-syslogd-handler-kafka</feature>
                                 <feature>opennms-trapd-listener</feature>
                                 <feature>opennms-trapd-handler-minion</feature>
-                                <!-- <feature>opennms-trapd-handler-kafka</feature> -->
+                                <feature>opennms-trapd-handler-kafka</feature>
                                 <feature>minion-heartbeat</feature>
                                 <feature>minion-snmp-proxy</feature>
                             </features>

diff --git a/opennms-full-assembly/src/test/java/org/opennms/assemblies/karaf/FeatureInstallKarafIT.java b/opennms-full-assembly/src/test/java/org/opennms/assemblies/karaf/FeatureInstallKarafIT.java
@@ -147,6 +147,8 @@ public void testInstallAllOpenNMSFeatures() {
         installFeature("spring-security32");
         installFeature("spring-webflow");
 
+        installFeature("opennms-trapd-handler-kafka");
+
         System.out.println(executeCommand("features:list -i"));
     }
 }
diff --git a/opennms-full-assembly/src/test/java/org/opennms/assemblies/karaf/MinionFeatureKarafIT.java b/opennms-full-assembly/src/test/java/org/opennms/assemblies/karaf/MinionFeatureKarafIT.java
@@ -91,6 +91,12 @@ public void testInstallFeatureOpennmsTrapdHandlerMinion() {
 		System.out.println(executeCommand("features:list -i"));
 	}
 
+	@Test
+	public void testInstallFeatureOpennmsTrapdHandlerKafka() {
+		installFeature("opennms-trapd-handler-kafka");
+		System.out.println(executeCommand("features:list -i"));
+	}
+
 	@Test
 	public void testInstallFeatureMinionHeartbeat() {
 		installFeature("minion-heartbeat");