You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/01/22 07:44:48 UTC
git commit: adding a temp fix to check alias availability in the Rest
API side
Updated Branches:
refs/heads/master f61da05a0 -> 4a207b627
adding a temp fix to check alias availability in the Rest API side
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/4a207b62
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/4a207b62
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/4a207b62
Branch: refs/heads/master
Commit: 4a207b627dc0bc7d04d8e6224fa630af28c8fa5e
Parents: f61da05
Author: Isuru <is...@wso2.com>
Authored: Wed Jan 22 12:14:30 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Wed Jan 22 12:14:30 2014 +0530
----------------------------------------------------------------------
.../org/apache/stratos/rest/endpoint/services/ServiceUtils.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4a207b62/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
index b79a647..ca1e164 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
@@ -31,6 +31,7 @@ import org.apache.stratos.manager.exception.*;
import org.apache.stratos.manager.manager.CartridgeSubscriptionManager;
import org.apache.stratos.manager.subscription.CartridgeSubscription;
import org.apache.stratos.manager.subscription.DataCartridgeSubscription;
+import org.apache.stratos.manager.subscription.utils.CartridgeSubscriptionUtils;
import org.apache.stratos.manager.topology.model.TopologyClusterInformationModel;
import org.apache.stratos.manager.utils.ApplicationManagementUtil;
import org.apache.stratos.manager.utils.CartridgeConstants;
@@ -620,6 +621,10 @@ public class ServiceUtils {
// LB cartridges won't go thru this method.
+ //TODO: this is a temp fix. proper fix is to move this logic to CartridgeSubscriptionManager
+ // validate cartridge alias
+ CartridgeSubscriptionUtils.validateCartridgeAlias(ApplicationManagementUtil.getTenantId(configurationContext), cartridgeType, alias);
+
AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient();
CloudControllerServiceClient cloudControllerServiceClient =
getCloudControllerServiceClient();