Adding missing code from patch apply in STRATOS-517
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8a1df535 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8a1df535 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8a1df535 Branch: refs/heads/master Commit: 8a1df535d9a4c60a5300546af04ede770f90d61e Parents: 4a8adf3 Author: Sajith Kariyawasam <[email protected]> Authored: Thu Apr 3 17:40:58 2014 +0530 Committer: Sajith Kariyawasam <[email protected]> Committed: Thu Apr 3 17:40:58 2014 +0530 ---------------------------------------------------------------------- .../manager/CartridgeSubscriptionManager.java | 27 ++++++++++++++++++++ 1 file changed, 27 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8a1df535/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java index 14761b6..1bedda5 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java @@ -313,6 +313,20 @@ public class CartridgeSubscriptionManager { cartridgeSubscription.createSubscription(subscriber, subscriptionData.getCartridgeAlias(), subscriptionData.getAutoscalingPolicyName(), subscriptionData.getDeploymentPolicyName(), repository); + // publishing to bam + CartridgeSubscriptionDataPublisher.publish( + subscriptionData.getTenantId(), + subscriptionData.getTenantAdminUsername(), + subscriptionData.getCartridgeAlias(), + subscriptionData.getCartridgeType(), + subscriptionData.getRepositoryURL(), + cartridgeInfo.getMultiTenant(), + subscriptionData.getAutoscalingPolicyName(), + subscriptionData.getDeploymentPolicyName(), + cartridgeSubscription.getCluster().getClusterDomain(), + cartridgeSubscription.getHostName(), + cartridgeSubscription.getMappedDomain(), "Subscribed"); + // Add whether the subscription is enabled upstream git commits if(cartridgeSubscription.getPayloadData() != null) { cartridgeSubscription.getPayloadData().add(CartridgeConstants.COMMIT_ENABLED, String.valueOf(subscriptionData.isCommitsEnabled())); @@ -414,6 +428,19 @@ public class CartridgeSubscriptionManager { // Publish tenant un-subscribed event to message broker CartridgeSubscriptionUtils.publishTenantUnSubscribedEvent(cartridgeSubscription.getSubscriber().getTenantId(), cartridgeSubscription.getCartridgeInfo().getType()); + + // publishing to the unsubscribed event details to bam + CartridgeSubscriptionDataPublisher.publish(cartridgeSubscription + .getSubscriber().getTenantId(), cartridgeSubscription + .getSubscriber().getAdminUserName(), cartridgeSubscription + .getAlias(), cartridgeSubscription.getType(), + cartridgeSubscription.getRepository().getUrl(), + cartridgeSubscription.getCartridgeInfo().getMultiTenant(), + cartridgeSubscription.getAutoscalingPolicyName(), + cartridgeSubscription.getDeploymentPolicyName(), + cartridgeSubscription.getCluster().getClusterDomain(), + cartridgeSubscription.getHostName(), cartridgeSubscription + .getMappedDomain(), "unsubscribed"); } else { String errorMsg = "No cartridge subscription found with [alias] " + alias + " for [tenant] " + tenantDomain;
