From 725ddb82a1c0f99f91ce1316d0e8082b6731d41e Mon Sep 17 00:00:00 2001
From: subhash yedugundla <venkatasubhashnaidu.yedugundla@citrix.com>
Date: Wed, 17 Aug 2016 14:08:53 +0530
Subject: [PATCH] CLOUDSTACK-9554 Juniper Contrail plug-in is publishing events
 to wrong message bus

---
 .../network-elements/juniper-contrail/pom.xml   | 11 +++++++++++
 .../network/contrail/management/EventUtils.java | 17 +++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/plugins/network-elements/juniper-contrail/pom.xml b/plugins/network-elements/juniper-contrail/pom.xml
index de57749a16f..4e7373d14a7 100644
--- a/plugins/network-elements/juniper-contrail/pom.xml
+++ b/plugins/network-elements/juniper-contrail/pom.xml
@@ -81,6 +81,17 @@
       <artifactId>cloud-framework-events</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.cloudstack</groupId>
+      <artifactId>cloud-utils</artifactId>
+      <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+           <artifactId>xml-apis</artifactId>
+           <groupId>xml-apis</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-framework-spring-lifecycle</artifactId>
diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/EventUtils.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/EventUtils.java
index faeff1f5bd6..78ec01344ca 100644
--- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/EventUtils.java
+++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/EventUtils.java
@@ -28,8 +28,8 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.stereotype.Component;
 
 import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.framework.messagebus.MessageBus;
-import org.apache.cloudstack.framework.messagebus.MessageBusBase;
+import org.apache.cloudstack.framework.events.EventBus;
+import org.apache.cloudstack.framework.events.EventBusException;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 
@@ -46,7 +46,7 @@ import com.cloud.utils.component.ComponentMethodInterceptor;
 public class EventUtils {
     private static final Logger s_logger = Logger.getLogger(EventUtils.class);
 
-    protected static MessageBus s_messageBus = null;
+    protected static  EventBus s_eventBus = null;
 
     public EventUtils() {
     }
@@ -58,9 +58,9 @@ public class EventUtils {
         }
 
         try {
-            s_messageBus = ComponentContext.getComponent(MessageBusBase.class);
+            s_eventBus = ComponentContext.getComponent(EventBus.class);
         } catch (NoSuchBeanDefinitionException nbe) {
-            return; // no provider is configured to provide events bus, so just return
+             return; // no provider is configured to provide events bus, so just return
         }
 
         org.apache.cloudstack.framework.events.Event event =
@@ -72,9 +72,10 @@ public class EventUtils {
         eventDescription.put("details", details);
         event.setDescription(eventDescription);
         try {
-            s_messageBus.publish(EventTypes.getEntityForEvent(eventType), eventType, null, event);
-        } catch (Exception e) {
-            s_logger.warn("Failed to publish action event on the the event bus.");
+            s_eventBus.publish(event);
+        } catch (EventBusException evx) {
+            String errMsg = "Failed to publish contrail event.";
+            s_logger.warn(errMsg, evx);
         }
 
     }