Repository: stratos Updated Branches: refs/heads/master 8683ac9e5 -> 6af990114
Refactored a bit more and removed unwanted params and methods Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/023900c4 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/023900c4 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/023900c4 Branch: refs/heads/master Commit: 023900c4fdd7ba9b12a228b5bf619e77885a3f2f Parents: 2242e2f Author: Shiro <[email protected]> Authored: Tue Nov 25 15:33:40 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Nov 27 15:21:59 2014 +0530 ---------------------------------------------------------------------- .../model/TopologyClusterInformationModel.java | 10 -- .../rest/endpoint/api/StratosApiV40Utils.java | 16 +- .../rest/endpoint/api/StratosApiV41.java | 180 ++++--------------- .../rest/endpoint/api/StratosApiV41Utils.java | 35 ++-- 4 files changed, 57 insertions(+), 184 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/023900c4/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/model/TopologyClusterInformationModel.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/model/TopologyClusterInformationModel.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/model/TopologyClusterInformationModel.java index a926ea8..491cc07 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/model/TopologyClusterInformationModel.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/topology/model/TopologyClusterInformationModel.java @@ -77,16 +77,6 @@ public class TopologyClusterInformationModel { clusterIdToClusterMap.put(cluster.getClusterId(), cluster); serviceNameToClusterMap.put(cluster.getServiceName(), cluster); } - - public Cluster getCluster (int tenantId, String cartridgeType, String subscriptionAlias) { - - String clusterId = dataInsertionNRetrievalMgr.getCartridgeSubscription(tenantId, subscriptionAlias).getClusterDomain(); - Cluster cluster = clusterIdToClusterMap.get(clusterId); - if(log.isDebugEnabled()) { - log.debug(" Found cluster ["+cluster+"] with id ["+clusterId+"] "); - } - return cluster; - } public Cluster getCluster (int tenantId, String subscriptionAlias) { http://git-wip-us.apache.org/repos/asf/stratos/blob/023900c4/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java index fec4c1e..4c3e451 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java @@ -750,8 +750,8 @@ public class StratosApiV40Utils { if (cartridge == null) { continue; } - Cluster cluster = TopologyClusterInformationModel.getInstance().getCluster(ApplicationManagementUtil.getTenantId(configurationContext) - ,cartridge.getCartridgeType(), cartridge.getCartridgeAlias()); + Cluster cluster = TopologyClusterInformationModel.getInstance().getCluster(ApplicationManagementUtil.getTenantId(configurationContext), + cartridge.getCartridgeAlias()); String cartridgeStatus = "Inactive"; int activeMemberCount = 0; if (cluster != null) { @@ -812,8 +812,8 @@ public class StratosApiV40Utils { log.error(message); throw new RestAPIException(Response.Status.NOT_FOUND, message); } - Cluster cluster = TopologyClusterInformationModel.getInstance().getCluster(ApplicationManagementUtil.getTenantId(configurationContext) - ,cartridge.getCartridgeType(), cartridge.getCartridgeAlias()); + Cluster cluster = TopologyClusterInformationModel.getInstance().getCluster(ApplicationManagementUtil.getTenantId(configurationContext), + cartridge.getCartridgeAlias()); String cartridgeStatus = "Inactive"; int activeMemberCount = 0; @@ -838,8 +838,8 @@ public class StratosApiV40Utils { static int getActiveInstances(String cartridgeType, String cartridgeAlias, ConfigurationContext configurationContext) throws RestAPIException { int noOfActiveInstances = 0; - Cluster cluster = TopologyClusterInformationModel.getInstance().getCluster(ApplicationManagementUtil.getTenantId(configurationContext) - ,cartridgeType , cartridgeAlias); + Cluster cluster = TopologyClusterInformationModel.getInstance().getCluster(ApplicationManagementUtil.getTenantId(configurationContext), + cartridgeAlias); if(cluster == null) { String message = "No Cluster found for cartridge [type] "+cartridgeType+", [alias] "+cartridgeAlias; @@ -976,8 +976,8 @@ public class StratosApiV40Utils { public static org.apache.stratos.rest.endpoint.bean.topology.Cluster getCluster (String cartridgeType, String subscriptionAlias, ConfigurationContext configurationContext) throws RestAPIException { - Cluster cluster = TopologyClusterInformationModel.getInstance().getCluster(ApplicationManagementUtil.getTenantId(configurationContext) - ,cartridgeType , subscriptionAlias); + Cluster cluster = TopologyClusterInformationModel.getInstance().getCluster(ApplicationManagementUtil.getTenantId(configurationContext), + subscriptionAlias); if(cluster == null) { throw new RestAPIException("No matching cluster found for [cartridge type]: "+cartridgeType+ " [alias] "+subscriptionAlias); } else{ http://git-wip-us.apache.org/repos/asf/stratos/blob/023900c4/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java index e6fe876..122f5d6 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java @@ -339,7 +339,7 @@ public class StratosApiV41 extends AbstractApi { @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/view/partition") - public Response getPartition(@PathParam("partitiotnId") String partitionId) throws RestAPIException { + public Response getPartition(@PathParam("partitionId") String partitionId) throws RestAPIException { return Response.ok().entity(StratosApiV41Utils.getPartition(partitionId)).build(); } @@ -387,7 +387,6 @@ public class StratosApiV41 extends AbstractApi { return Response.ok().entity(StratosApiV41Utils.getDeploymentPolicy(deploymentPolicyId)).build(); } - //TODO : Check usage @GET @Path("/deploymentPolicies/{deploymentPolicyId}/partitionGroup") @Produces("application/json") @@ -398,7 +397,6 @@ public class StratosApiV41 extends AbstractApi { return Response.ok().entity(StratosApiV41Utils.getPartitionGroups(deploymentPolicyId)).build(); } - //TODO : Check usage @GET @Path("/deploymentPolicies/{deploymentPolicyId}/partitionGroup/{partitionGroupId}") @Produces("application/json") @@ -409,7 +407,6 @@ public class StratosApiV41 extends AbstractApi { return Response.ok().entity(StratosApiV41Utils.getPartitionsOfGroup(deploymentPolicyId, partitionGroupId)).build(); } - //TODO : Check usage @GET @Path("/deploymentPolicies/{deploymentPolicyId}/partition") @Produces("application/json") @@ -489,10 +486,10 @@ public class StratosApiV41 extends AbstractApi { */ @GET - @Path("/applications/{appId}") + @Path("/applications/{applicationId}") @Consumes("application/json") @AuthorizationAction("/permission/protected/manage/monitor/tenants") - public Response getApplicationInfo(@PathParam("appId") String applicationId) throws RestAPIException { + public Response getApplicationInfo(@PathParam("applicationId") String applicationId) throws RestAPIException { ApplicationBean application = StratosApiV41Utils.getApplicationInfo(applicationId); if (application == null) { return Response.status(Response.Status.NOT_FOUND).build(); @@ -501,29 +498,12 @@ public class StratosApiV41 extends AbstractApi { } } - - /** - * Commenting this API since it is no longer valid. - * - * @GET - * @Path("/cartridge/list/subscribed") - * @Produces("application/json") - * @Consumes("application/json") - * @AuthorizationAction("/permission/admin/manage/view/cartridge") public Response getSubscribedCartridges() throws RestAPIException { - * List<Cartridge> cartridgeList = StratosApiV41Utils.getSubscriptions(null, null, getConfigContext()); - * // Following is very important when working with axis2 - * ResponseBuilder rb = Response.ok(); - * rb.entity(cartridgeList.isEmpty() ? new Cartridge[0] : cartridgeList.toArray(new Cartridge[cartridgeList.size()])); - * return rb.build(); - * } - */ - @GET - @Path("/subsscriptions/{application_id}") + @Path("/subscriptions/{applicationId}") @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/protected/manage/monitor/tenants") - public Response getSubscriptionsOfApplication(@PathParam("application_id") String applicationId) throws RestAPIException { + public Response getSubscriptionsOfApplication(@PathParam("applicationId") String applicationId) throws RestAPIException { ApplicationSubscription subscriptions = StratosApiV41Utils.getApplicationSubscriptions(applicationId, getConfigContext()); if (subscriptions == null) { return Response.status(Response.Status.NOT_FOUND).build(); @@ -567,7 +547,6 @@ public class StratosApiV41 extends AbstractApi { return rb.build(); } - //TODO : Check usage @PUT @Path("/subscriptions/{subscriptionAlias}/properties") @Consumes("application/json") @@ -584,11 +563,9 @@ public class StratosApiV41 extends AbstractApi { @Path("/subscriptions/{subscriptionAlias}/domains") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/add/domain") - public Response addSubscriptionDomains(@PathParam("cartridgeType") String cartridgeType, - - @PathParam("subscriptionAlias") String subscriptionAlias, + public Response addSubscriptionDomains(@PathParam("subscriptionAlias") String subscriptionAlias, SubscriptionDomainRequest request) throws RestAPIException { - StratosApiV41Utils.addSubscriptionDomains(getConfigContext(), cartridgeType, subscriptionAlias, request); + StratosApiV41Utils.addSubscriptionDomains(getConfigContext(), subscriptionAlias, request); return Response.noContent().build(); } @@ -596,9 +573,9 @@ public class StratosApiV41 extends AbstractApi { @Path("/subscriptions/{subscriptionAlias}/domains") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/view/domain") - public Response getSubscriptionDomains(@PathParam("cartridgeType") String cartridgeType, @PathParam("subscriptionAlias") String subscriptionAlias) throws RestAPIException { + public Response getSubscriptionDomains(@PathParam("subscriptionAlias") String subscriptionAlias) throws RestAPIException { - SubscriptionDomainBean[] subscriptionDomainBean = StratosApiV41Utils.getSubscriptionDomains(getConfigContext(), cartridgeType, subscriptionAlias).toArray(new SubscriptionDomainBean[0]); + SubscriptionDomainBean[] subscriptionDomainBean = StratosApiV41Utils.getSubscriptionDomains(getConfigContext(), subscriptionAlias).toArray(new SubscriptionDomainBean[0]); if (subscriptionDomainBean.length == 0) { return Response.status(Response.Status.NOT_FOUND).build(); @@ -611,9 +588,9 @@ public class StratosApiV41 extends AbstractApi { @Path("/subscriptions/{subscriptionAlias}/domains/{domainName}") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/view/domain") - public Response getSubscriptionDomain(@PathParam("cartridgeType") String cartridgeType, @PathParam("subscriptionAlias") String subscriptionAlias, @PathParam("domainName") String domainName) throws RestAPIException { + public Response getSubscriptionDomain(@PathParam("subscriptionAlias") String subscriptionAlias, @PathParam("domainName") String domainName) throws RestAPIException { - SubscriptionDomainBean subscriptionDomainBean = StratosApiV41Utils.getSubscriptionDomain(getConfigContext(), cartridgeType, subscriptionAlias, domainName); + SubscriptionDomainBean subscriptionDomainBean = StratosApiV41Utils.getSubscriptionDomain(getConfigContext(), subscriptionAlias, domainName); if (subscriptionDomainBean.domainName == null) { return Response.status(Response.Status.NOT_FOUND).build(); } else { @@ -625,31 +602,16 @@ public class StratosApiV41 extends AbstractApi { @Path("/subscriptions/{subscriptionAlias}/domains/{domainName}") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/add/domain") - public Response removeSubscriptionDomain(@PathParam("cartridgeType") String cartridgeType, - @PathParam("subscriptionAlias") String subscriptionAlias, + public Response removeSubscriptionDomain(@PathParam("subscriptionAlias") String subscriptionAlias, @PathParam("domainName") String domainName) throws RestAPIException { try { - StratosApiV41Utils.removeSubscriptionDomain(getConfigContext(), cartridgeType, subscriptionAlias, domainName); + StratosApiV41Utils.removeSubscriptionDomain(getConfigContext(), subscriptionAlias, domainName); } catch (DomainMappingExistsException e) { return Response.status(Response.Status.NOT_FOUND).build(); } return Response.noContent().build(); } -// @POST -// @Path("/cartridge/subscribe") -// @Produces("application/json") -// @Consumes("application/json") -// @AuthorizationAction("/permission/admin/manage/add/subscription") -// public Response subscribe(CartridgeInfoBean cartridgeInfoBean) throws RestAPIException { -// -// SubscriptionInfo subscriptionInfo = ServiceUtils.subscribe(cartridgeInfoBean, -// getConfigContext(), -// getUsername(), -// getTenantDomain()); -// return Response.ok(subscriptionInfo).build(); -// } - @GET @Path("/clusters") @Produces("application/json") @@ -689,10 +651,9 @@ public class StratosApiV41 extends AbstractApi { @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/view/cluster") - public Response getClusterOfSubscription(@PathParam("cartridgeType") String cartridgeType, - @PathParam("subscriptionAlias") String subscriptionAlias) throws RestAPIException { + public Response getClusterOfSubscription(@PathParam("subscriptionAlias") String subscriptionAlias) throws RestAPIException { ResponseBuilder rb = Response.ok(); - rb.entity(StratosApiV41Utils.getCluster(cartridgeType, subscriptionAlias, getConfigContext())); + rb.entity(StratosApiV41Utils.getCluster(subscriptionAlias, getConfigContext())); return rb.build(); } @@ -722,15 +683,13 @@ public class StratosApiV41 extends AbstractApi { return Response.ok().entity(cluster).build(); } - @GET @Path("/clusters/{subscriptionAlias}/loadBalancer") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/view/cluster") - public Response getLoadBalancerCluster(@PathParam("cartridgeType") String cartridgeType, - @PathParam("subscriptionAlias") String subscriptionAlias) throws RestAPIException { + public Response getLoadBalancerCluster(@PathParam("subscriptionAlias") String subscriptionAlias) throws RestAPIException { if (log.isDebugEnabled()) { - log.debug(String.format("GET /cartridge/%s/subscription/%s/load-balancer-cluster", cartridgeType, subscriptionAlias)); + log.debug(String.format("GET /subscription/%s/load-balancer-cluster", subscriptionAlias)); } Cartridge subscription = StratosApiV41Utils.getSubscription(subscriptionAlias, getConfigContext()); String lbClusterId = subscription.getLbClusterId(); @@ -1195,83 +1154,8 @@ public class StratosApiV41 extends AbstractApi { return Response.noContent().build(); } - /* - @POST - @Path("/services") - @Produces("application/json") - @Consumes("application/json") - @AuthorizationAction("/permission/admin/manage/add/service") - public Response deployService(ServiceDefinitionBean serviceDefinitionBean) - throws RestAPIException { - - log.info("Service definition request.. : " + serviceDefinitionBean.getServiceName()); - // super tenant Deploying service (MT) - // here an alias is generated - StratosApiV41Utils.deployService(serviceDefinitionBean.getCartridgeType(), UUID.randomUUID().toString(), serviceDefinitionBean.getAutoscalingPolicyName(), - serviceDefinitionBean.getDeploymentPolicyName(), getTenantDomain(), getUsername(), getTenantId(), - serviceDefinitionBean.getClusterDomain(), serviceDefinitionBean.getClusterSubDomain(), - serviceDefinitionBean.getTenantRange(), serviceDefinitionBean.getIsPublic()); - - URI url = uriInfo.getAbsolutePathBuilder().path(serviceDefinitionBean.getServiceName()).build(); - return Response.created(url).build(); - } - - @GET - @Path("/services") - @Produces("application/json") - @Consumes("application/json") - @AuthorizationAction("/permission/admin/manage/view/service") - public ServiceDefinitionBean[] getServices() throws RestAPIException { - List<ServiceDefinitionBean> serviceDefinitionBeans = StratosApiV41Utils.getdeployedServiceInformation(); - return serviceDefinitionBeans == null || serviceDefinitionBeans.isEmpty() ? new ServiceDefinitionBean[0] : - serviceDefinitionBeans.toArray(new ServiceDefinitionBean[serviceDefinitionBeans.size()]); - } - - @GET - @Path("/services/{serviceType}") - @Produces("application/json") - @Consumes("application/json") - @AuthorizationAction("/permission/admin/manage/view/service") - public Response getService(@PathParam("serviceType") String serviceType) throws RestAPIException { - ResponseBuilder rb; - ServiceDefinitionBean serviceDefinitionBean = StratosApiV41Utils.getDeployedServiceInformation(serviceType); - if (serviceDefinitionBean == null) { - rb = Response.status(Response.Status.NOT_FOUND); - } else { - rb = Response.ok(serviceDefinitionBean); - } - return rb.build(); - } - - - @GET - @Path("/service/active") - @Produces("application/json") - @Consumes("application/json") - @AuthorizationAction("/permission/admin/manage/view/service") - public List<Cartridge> getActiveService() throws RestAPIException { - - return StratosApiV41Utils.getActiveDeployedServiceInformation(getConfigContext()); - } - - @DELETE - @Path("/service/definition/{serviceType}") - @Produces("application/json") - @Consumes("application/json") - @AuthorizationAction("/permission/admin/manage/add/service") - public Response unDeployService(@PathParam("serviceType") String serviceType) throws RestAPIException { - try { - StratosApiV41Utils.undeployService(serviceType); - } catch (ServiceDoesNotExistException e) { - return Response.status(Response.Status.NOT_FOUND).build(); - } - return Response.noContent().build(); - } - - */ - @POST - @Path("/reponotification") + @Path("/repo/notify") @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/add/sync") @@ -1282,10 +1166,10 @@ public class StratosApiV41 extends AbstractApi { } @POST - @Path("/cartridge/sync") + @Path("/repo/synchronize/{subscriptionAlias}") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/add/sync") - public Response synchronizeRepository(String alias) throws RestAPIException { + public Response synchronizeRepository(@PathParam("subscriptionAlias") String alias) throws RestAPIException { if (log.isDebugEnabled()) { log.debug(String.format("Synchronizing Git repository for alias '%s'", alias)); } @@ -1456,10 +1340,10 @@ public class StratosApiV41 extends AbstractApi { @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/add/kubernetes") - public Response deployKubernetesHost(@PathParam("kubernetesGroupId") String kubernetesGroupId, KubernetesHost kubernetesHost) + public Response deployKubernetesHost(@PathParam("kubernetesClusterId") String kubernetesClusterId, KubernetesHost kubernetesHost) throws RestAPIException { - StratosApiV41Utils.deployKubernetesHost(kubernetesGroupId, kubernetesHost); + StratosApiV41Utils.deployKubernetesHost(kubernetesClusterId, kubernetesHost); URI url = uriInfo.getAbsolutePathBuilder().path(kubernetesHost.getHostId()).build(); return Response.created(url).build(); } @@ -1479,6 +1363,7 @@ public class StratosApiV41 extends AbstractApi { } } + //TODO: Check need for this method @PUT @Path("/kubernetes/update/host") @Produces("application/json") @@ -1503,15 +1388,14 @@ public class StratosApiV41 extends AbstractApi { return Response.ok().entity(StratosApiV41Utils.getAvailableKubernetesGroups()).build(); } - @GET @Path("/kubernetesCluster/{kubernetesClusterId}") @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/view/kubernetes") - public Response getKubernetesHostCluster(@PathParam("kubernetesGroupId") String kubernetesGroupId) throws RestAPIException { + public Response getKubernetesHostCluster(@PathParam("kubernetesClusterId") String kubernetesClusterId) throws RestAPIException { try { - return Response.ok().entity(StratosApiV41Utils.getKubernetesGroup(kubernetesGroupId)).build(); + return Response.ok().entity(StratosApiV41Utils.getKubernetesGroup(kubernetesClusterId)).build(); } catch (RestAPIException e) { return Response.status(Response.Status.NOT_FOUND).build(); } @@ -1522,9 +1406,9 @@ public class StratosApiV41 extends AbstractApi { @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/view/kubernetes") - public Response getKubernetesHostsOfKubernetesCluster(@PathParam("kubernetesGroupId") String kubernetesGroupId) throws RestAPIException { + public Response getKubernetesHostsOfKubernetesCluster(@PathParam("kubernetesClusterId") String kubernetesClusterId) throws RestAPIException { try { - return Response.ok().entity(StratosApiV41Utils.getKubernetesHosts(kubernetesGroupId)).build(); + return Response.ok().entity(StratosApiV41Utils.getKubernetesHosts(kubernetesClusterId)).build(); } catch (RestAPIException e) { return Response.status(Response.Status.NOT_FOUND).build(); } @@ -1535,9 +1419,9 @@ public class StratosApiV41 extends AbstractApi { @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/view/kubernetes") - public Response getKubernetesMasterOfKubernetesCluster(@PathParam("kubernetesGroupId") String kubernetesGroupId) throws RestAPIException { + public Response getKubernetesMasterOfKubernetesCluster(@PathParam("kubernetesClusterId") String kubernetesClusterId) throws RestAPIException { try { - return Response.ok().entity(StratosApiV41Utils.getKubernetesMaster(kubernetesGroupId)).build(); + return Response.ok().entity(StratosApiV41Utils.getKubernetesMaster(kubernetesClusterId)).build(); } catch (RestAPIException e) { return Response.status(Response.Status.NOT_FOUND).build(); } @@ -1548,9 +1432,9 @@ public class StratosApiV41 extends AbstractApi { @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/add/kubernetes") - public Response unDeployKubernetesHostCluster(@PathParam("kubernetesGroupId") String kubernetesGroupId) throws RestAPIException { + public Response unDeployKubernetesHostCluster(@PathParam("kubernetesClusterId") String kubernetesClusterId) throws RestAPIException { try { - StratosApiV41Utils.undeployKubernetesGroup(kubernetesGroupId); + StratosApiV41Utils.undeployKubernetesGroup(kubernetesClusterId); } catch (RestAPIException e) { return Response.status(Response.Status.NOT_FOUND).build(); } @@ -1562,7 +1446,7 @@ public class StratosApiV41 extends AbstractApi { @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/add/kubernetes") - public Response unDeployKubernetesHostOfKubernetesCluster(@PathParam("kubernetesHostId") String kubernetesHostId) throws RestAPIException { + public Response unDeployKubernetesHostOfKubernetesCluster(@PathParam("hostId") String kubernetesHostId) throws RestAPIException { try { StratosApiV41Utils.undeployKubernetesHost(kubernetesHostId); } catch (RestAPIException e) { http://git-wip-us.apache.org/repos/asf/stratos/blob/023900c4/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index ee6f08c..850faa0 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java @@ -899,8 +899,8 @@ public class StratosApiV41Utils { if (cartridge == null) { continue; } - Cluster cluster = TopologyClusterInformationModel.getInstance().getCluster(ApplicationManagementUtil.getTenantId(configurationContext) - , cartridge.getCartridgeType(), cartridge.getCartridgeAlias()); + Cluster cluster = TopologyClusterInformationModel.getInstance().getCluster(ApplicationManagementUtil.getTenantId(configurationContext), + cartridge.getCartridgeAlias()); String cartridgeStatus = "Inactive"; int activeMemberCount = 0; if (cluster != null) { @@ -963,8 +963,8 @@ public class StratosApiV41Utils { log.error(message); throw new RestAPIException(Response.Status.NOT_FOUND, message); } - Cluster cluster = TopologyClusterInformationModel.getInstance().getCluster(ApplicationManagementUtil.getTenantId(configurationContext) - , cartridge.getCartridgeType(), cartridge.getCartridgeAlias()); + Cluster cluster = TopologyClusterInformationModel.getInstance().getCluster(ApplicationManagementUtil.getTenantId(configurationContext), + cartridge.getCartridgeAlias()); String cartridgeStatus = "Inactive"; int activeMemberCount = 0; @@ -989,8 +989,8 @@ public class StratosApiV41Utils { static int getActiveInstances(String cartridgeType, String cartridgeAlias, ConfigurationContext configurationContext) throws RestAPIException { int noOfActiveInstances = 0; - Cluster cluster = TopologyClusterInformationModel.getInstance().getCluster(ApplicationManagementUtil.getTenantId(configurationContext) - , cartridgeType, cartridgeAlias); + Cluster cluster = TopologyClusterInformationModel.getInstance().getCluster(ApplicationManagementUtil.getTenantId(configurationContext), + cartridgeAlias); if (cluster == null) { String message = "No Cluster found for cartridge [type] " + cartridgeType + ", [alias] " + cartridgeAlias; @@ -1177,12 +1177,12 @@ public class StratosApiV41Utils { return subscriptionInfo; } - public static org.apache.stratos.rest.endpoint.bean.topology.Cluster getCluster(String cartridgeType, String subscriptionAlias, ConfigurationContext configurationContext) throws RestAPIException { + public static org.apache.stratos.rest.endpoint.bean.topology.Cluster getCluster(String subscriptionAlias, ConfigurationContext configurationContext) throws RestAPIException { - Cluster cluster = TopologyClusterInformationModel.getInstance().getCluster(ApplicationManagementUtil.getTenantId(configurationContext) - , cartridgeType, subscriptionAlias); + Cluster cluster = TopologyClusterInformationModel.getInstance().getCluster(ApplicationManagementUtil.getTenantId(configurationContext), + subscriptionAlias); if (cluster == null) { - throw new RestAPIException("No matching cluster found for [cartridge type]: " + cartridgeType + " [alias] " + subscriptionAlias); + throw new RestAPIException("No matching cluster found for [alias] " + subscriptionAlias); } else { return PojoConverter.populateClusterPojos(cluster, null); } @@ -1357,7 +1357,7 @@ public class StratosApiV41Utils { } } - public static void addSubscriptionDomains(ConfigurationContext configurationContext, String cartridgeType, + public static void addSubscriptionDomains(ConfigurationContext configurationContext, String subscriptionAlias, SubscriptionDomainRequest request) throws RestAPIException { @@ -1365,7 +1365,7 @@ public class StratosApiV41Utils { int tenantId = ApplicationManagementUtil.getTenantId(configurationContext); for (org.apache.stratos.rest.endpoint.bean.subscription.domain.SubscriptionDomainBean subscriptionDomain : request.domains) { - boolean isDomainExists = isSubscriptionDomainExists(configurationContext, cartridgeType, subscriptionAlias, subscriptionDomain.domainName); + boolean isDomainExists = isSubscriptionDomainExists(configurationContext, subscriptionAlias, subscriptionDomain.domainName); if (isDomainExists) { String message = "Subscription domain " + subscriptionDomain.domainName + " exists"; throw new RestAPIException(Status.INTERNAL_SERVER_ERROR, message); @@ -1383,7 +1383,7 @@ public class StratosApiV41Utils { } } - public static boolean isSubscriptionDomainExists(ConfigurationContext configurationContext, String cartridgeType, + public static boolean isSubscriptionDomainExists(ConfigurationContext configurationContext, String subscriptionAlias, String domain) throws RestAPIException { try { int tenantId = ApplicationManagementUtil.getTenantId(configurationContext); @@ -1402,7 +1402,7 @@ public class StratosApiV41Utils { } - public static List<SubscriptionDomainBean> getSubscriptionDomains(ConfigurationContext configurationContext, String cartridgeType, + public static List<SubscriptionDomainBean> getSubscriptionDomains(ConfigurationContext configurationContext, String subscriptionAlias) throws RestAPIException { try { int tenantId = ApplicationManagementUtil.getTenantId(configurationContext); @@ -1413,7 +1413,7 @@ public class StratosApiV41Utils { } } - public static SubscriptionDomainBean getSubscriptionDomain(ConfigurationContext configurationContext, String cartridgeType, + public static SubscriptionDomainBean getSubscriptionDomain(ConfigurationContext configurationContext, String subscriptionAlias, String domain) throws RestAPIException { try { int tenantId = ApplicationManagementUtil @@ -1422,8 +1422,7 @@ public class StratosApiV41Utils { subscriptionAlias, domain)); if (subscriptionDomain == null) { - String message = "Could not find a subscription [domain] " + domain + " for Cartridge [type] " - + cartridgeType + " and [alias] " + subscriptionAlias; + String message = "Could not find a subscription for [domain] " + domain + " and [alias] " + subscriptionAlias; log.error(message); throw new RestAPIException(Status.NOT_FOUND, message); } @@ -1436,7 +1435,7 @@ public class StratosApiV41Utils { } } - public static void removeSubscriptionDomain(ConfigurationContext configurationContext, String cartridgeType, + public static void removeSubscriptionDomain(ConfigurationContext configurationContext, String subscriptionAlias, String domain) throws RestAPIException, DomainMappingExistsException { try { int tenantId = ApplicationManagementUtil.getTenantId(configurationContext);
