You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/12/07 18:21:43 UTC
git commit: Updated cloud controller topology event sender with
service type property
Updated Branches:
refs/heads/master 07a3fa648 -> 2ef7a0025
Updated cloud controller topology event sender with service type property
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/2ef7a002
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2ef7a002
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2ef7a002
Branch: refs/heads/master
Commit: 2ef7a00258704f780e2e7efc68dc1b7b4cd1155c
Parents: 07a3fa6
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sat Dec 7 22:51:34 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sat Dec 7 22:51:34 2013 +0530
----------------------------------------------------------------------
.../stratos/cloud/controller/topology/TopologyEventSender.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2ef7a002/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java
index b1f9f00..b0ac12f 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java
@@ -27,6 +27,7 @@ import org.apache.stratos.cloud.controller.runtime.FasterLookUpDataHolder;
import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
import org.apache.stratos.messaging.broker.publish.EventPublisher;
import org.apache.stratos.messaging.domain.topology.Port;
+import org.apache.stratos.messaging.domain.topology.ServiceType;
import org.apache.stratos.messaging.domain.topology.Topology;
import org.apache.stratos.messaging.event.Event;
import org.apache.stratos.messaging.event.topology.*;
@@ -44,7 +45,7 @@ public class TopologyEventSender {
public static void sendServiceCreateEvent(List<Cartridge> cartridgeList) {
ServiceCreatedEvent serviceCreatedEvent;
for(Cartridge cartridge : cartridgeList) {
- serviceCreatedEvent = new ServiceCreatedEvent(cartridge.getType());
+ serviceCreatedEvent = new ServiceCreatedEvent(cartridge.getType(), (cartridge.isMultiTenant() ? ServiceType.MultiTenant : ServiceType.SingleTenant));
// Add ports to the event
Port port;
@@ -127,7 +128,7 @@ public class TopologyEventSender {
}
public static void sendClusterRemovedEvent(ClusterContext ctxt) {
- ClusterRemovedEvent clusterRemovedEvent = new ClusterRemovedEvent(ctxt.getCartridgeType(), ctxt.getClusterId(), ctxt.getHostName());
+ ClusterRemovedEvent clusterRemovedEvent = new ClusterRemovedEvent(ctxt.getCartridgeType(), ctxt.getClusterId());
if(log.isInfoEnabled()) {
log.info(String.format("Publishing cluster removed event: [service] %s [cluster] %s", ctxt.getCartridgeType(), ctxt.getClusterId()));