Renaming deploy term to add and undeploy term to remove
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9628368e Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9628368e Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9628368e Branch: refs/heads/master Commit: 9628368e5c564c52db7e41e918cdb7a02b763ad4 Parents: 44fa137 Author: Imesh Gunaratne <[email protected]> Authored: Fri Dec 19 11:34:55 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Fri Dec 19 11:34:55 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/domain/ServiceGroup.java | 4 - .../services/CloudControllerService.java | 20 +- .../impl/CloudControllerServiceImpl.java | 46 +- .../src/main/resources/META-INF/services.xml | 4 +- .../client/CloudControllerServiceClient.java | 16 +- .../cartridge/DefaultCartridgeDeployer.java | 2 +- .../manager/user/mgt/StratosUserManager.java | 2 +- .../rest/endpoint/api/StratosApiV40Utils.java | 4 +- .../rest/endpoint/api/StratosApiV41.java | 49 +- .../rest/endpoint/api/StratosApiV41Utils.java | 22 +- .../main/resources/CloudControllerService.wsdl | 1372 ++++++++---------- 11 files changed, 690 insertions(+), 851 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/9628368e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ServiceGroup.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ServiceGroup.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ServiceGroup.java index 7d9d986..a7fec55 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ServiceGroup.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ServiceGroup.java @@ -23,15 +23,11 @@ import java.io.Serializable; public class ServiceGroup implements Serializable { - private static final long serialVersionUID = -7413745300105885793L; private String name; - private String [] subGroups; - private String [] cartridges; - private Dependencies dependencies; public String getName() { http://git-wip-us.apache.org/repos/asf/stratos/blob/9628368e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java index d0dd730..32181bd 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java @@ -33,31 +33,31 @@ import org.apache.stratos.messaging.domain.topology.ClusterStatus; public interface CloudControllerService { /** - * Deploys a Cartridge configuration + * Adds a Cartridge configuration * @param cartridgeConfig cartridge configuration to be deployed * @throws InvalidCartridgeDefinitionException if the cartridge configuration is not valid. * @throws InvalidIaasProviderException if the iaas providers configured are not valid. * @throws IllegalArgumentException if the provided argument is not valid. */ - void deployCartridgeDefinition(CartridgeConfig cartridgeConfig) + void addCartridge(CartridgeConfig cartridgeConfig) throws InvalidCartridgeDefinitionException, InvalidIaasProviderException; /** - * Undeploys a Cartridge configuration which is already deployed. + * Removes a cartridge configuration which is already deployed. * @param cartridgeType type of the cartridge to be undeployed. * @throws InvalidCartridgeTypeException if the cartridge type specified is not a deployed cartridge. */ - public void undeployCartridgeDefinition(String cartridgeType) throws InvalidCartridgeTypeException; + public void removeCartridge(String cartridgeType) throws InvalidCartridgeTypeException; - public void deployServiceGroup(ServiceGroup servicegroup) throws InvalidServiceGroupException; + public void addServiceGroup(ServiceGroup servicegroup) throws InvalidServiceGroupException; - public void undeployServiceGroup(String name) throws InvalidServiceGroupException; + public void removeServiceGroup(String name) throws InvalidServiceGroupException; public ServiceGroup getServiceGroup (String name) throws InvalidServiceGroupException; - public String []getServiceGroupSubGroups (String name) throws InvalidServiceGroupException; + public String[] getServiceGroupSubGroups (String name) throws InvalidServiceGroupException; - public String [] getServiceGroupCartridges (String name) throws InvalidServiceGroupException; + public String[] getServiceGroupCartridges (String name) throws InvalidServiceGroupException; public Dependencies getServiceGroupDependencies (String name) throws InvalidServiceGroupException; @@ -263,7 +263,7 @@ public interface CloudControllerService { * Register a Kubernetes cluster. * * @param kubernetesGroup - * @throws org.apache.stratos.autoscaler.exception.kubernetes.InvalidKubernetesGroupException + * @throws org.apache.stratos.cloud.controller.exception.InvalidKubernetesGroupException */ public boolean addKubernetesGroup(KubernetesGroup kubernetesGroup) throws InvalidKubernetesGroupException; @@ -272,7 +272,7 @@ public interface CloudControllerService { * * @param groupId * @param kubernetesHost - * @throws org.apache.stratos.autoscaler.exception.kubernetes.InvalidKubernetesHostException + * @throws org.apache.stratos.cloud.controller.exception.InvalidKubernetesHostException */ public boolean addKubernetesHost(String groupId, KubernetesHost kubernetesHost) throws InvalidKubernetesHostException, NonExistingKubernetesGroupException; http://git-wip-us.apache.org/repos/asf/stratos/blob/9628368e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java index d6b505f..3ac8378 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java @@ -79,7 +79,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { public CloudControllerServiceImpl() { } - public void deployCartridgeDefinition(CartridgeConfig cartridgeConfig) throws InvalidCartridgeDefinitionException, + public void addCartridge(CartridgeConfig cartridgeConfig) throws InvalidCartridgeDefinitionException, InvalidIaasProviderException { handleNullObject(cartridgeConfig, "Cartridge definition is null"); @@ -121,7 +121,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { Cartridge cartridgeToBeRemoved = cloudControllerContext.getCartridge(cartridgeType); // undeploy try { - undeployCartridgeDefinition(cartridgeToBeRemoved.getType()); + removeCartridge(cartridgeToBeRemoved.getType()); } catch (InvalidCartridgeTypeException ignore) { } copyIaasProviders(cartridge, cartridgeToBeRemoved); @@ -164,7 +164,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { } } - public void undeployCartridgeDefinition(String cartridgeType) throws InvalidCartridgeTypeException { + public void removeCartridge(String cartridgeType) throws InvalidCartridgeTypeException { Cartridge cartridge = null; if ((cartridge = CloudControllerContext.getInstance().getCartridge(cartridgeType)) != null) { @@ -184,7 +184,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { TopologyBuilder.handleServiceRemoved(cartridgeList); if (log.isInfoEnabled()) { - log.info("Successfully undeployed the Cartridge definition: " + cartridgeType); + log.info("Successfully removed cartridge: [cartridge-type] " + cartridgeType); } return; } @@ -194,7 +194,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { throw new InvalidCartridgeTypeException(msg); } - public void deployServiceGroup(ServiceGroup servicegroup) throws InvalidServiceGroupException { + public void addServiceGroup(ServiceGroup servicegroup) throws InvalidServiceGroupException { if (servicegroup == null) { String msg = "Invalid ServiceGroup Definition: Definition is null."; @@ -204,18 +204,18 @@ public class CloudControllerServiceImpl implements CloudControllerService { } if (log.isDebugEnabled()) { - log.debug("CloudControllerServiceImpl:deployServiceGroup:" + servicegroup.getName()); + log.debug("CloudControllerServiceImpl:addServiceGroup:" + servicegroup.getName()); } String[] subGroups = servicegroup.getCartridges(); if (log.isDebugEnabled()) { - log.debug("CloudControllerServiceImpl:deployServiceGroup:subGroups" + subGroups); + log.debug("CloudControllerServiceImpl:addServiceGroup:subGroups" + subGroups); if (subGroups != null) { - log.debug("CloudControllerServiceImpl:deployServiceGroup:subGroups:size" + subGroups.length); + log.debug("CloudControllerServiceImpl:addServiceGroup:subGroups:size" + subGroups.length); } else { - log.debug("CloudControllerServiceImpl:deployServiceGroup:subGroups: is null"); + log.debug("CloudControllerServiceImpl:addServiceGroup:subGroups: is null"); } } @@ -223,32 +223,30 @@ public class CloudControllerServiceImpl implements CloudControllerService { Dependencies dependencies = servicegroup.getDependencies(); if (log.isDebugEnabled()) { - log.debug("CloudControllerServiceImpl:deployServiceGroup:dependencies" + dependencies); + log.debug("CloudControllerServiceImpl:addServiceGroup:dependencies" + dependencies); } if (dependencies != null) { String[] startupOrders = dependencies.getStartupOrders(); if (log.isDebugEnabled()) { - log.debug("CloudControllerServiceImpl:deployServiceGroup:startupOrders" + startupOrders); + log.debug("CloudControllerServiceImpl:addServiceGroup:startupOrders" + startupOrders); if (startupOrders != null) { - log.debug("CloudControllerServiceImpl:deployServiceGroup:startupOrder:size" + startupOrders.length); + log.debug("CloudControllerServiceImpl:addServiceGroup:startupOrder:size" + startupOrders.length); } else { - log.debug("CloudControllerServiceImpl:deployServiceGroup:startupOrder: is null"); + log.debug("CloudControllerServiceImpl:addServiceGroup:startupOrder: is null"); } } } CloudControllerContext.getInstance().addServiceGroup(servicegroup); - CloudControllerContext.getInstance().persist(); - } - public void undeployServiceGroup(String name) throws InvalidServiceGroupException { + public void removeServiceGroup(String name) throws InvalidServiceGroupException { if (log.isDebugEnabled()) { - log.debug("CloudControllerServiceImpl:undeployServiceGroup: " + name); + log.debug("CloudControllerServiceImpl:removeServiceGroup: " + name); } ServiceGroup serviceGroup = null; @@ -259,7 +257,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { if (CloudControllerContext.getInstance().getServiceGroups().remove(serviceGroup)) { CloudControllerContext.getInstance().persist(); if (log.isInfoEnabled()) { - log.info("Successfully undeployed the Service Group definition: " + serviceGroup); + log.info("Successfully removed the service group: [group-name] " + serviceGroup); } return; } @@ -281,11 +279,11 @@ public class CloudControllerServiceImpl implements CloudControllerService { ServiceGroup serviceGroup = CloudControllerContext.getInstance().getServiceGroup(name); if (serviceGroup == null) { + String message = "Service group not found: [group-name] " + name; if (log.isDebugEnabled()) { - log.debug("getServiceGroupDefinition: no entry found for service group " + name); + log.debug(message); } - String msg = "Service group not found: [group-name] " + name; - throw new InvalidServiceGroupException(msg); + throw new InvalidServiceGroupException(message); } return serviceGroup; @@ -352,7 +350,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { if (cartridge == null) { String msg = - "Instance start-up failed. No matching Cartridge found [type] " + cartridgeType + ". " + + "Instance start-up failed. No matching Cartridge found [cartridge-type] " + cartridgeType + ". " + memberContext.toString(); log.error(msg); throw new UnregisteredCartridgeException(msg); @@ -499,7 +497,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { } } if (log.isDebugEnabled()) { - log.debug("Persistence payload is" + persistencePayload.toString()); + log.debug("Persistence payload: " + persistencePayload.toString()); } return persistencePayload; } @@ -688,7 +686,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { if ((cartridge = CloudControllerContext.getInstance().getCartridge(cartridgeType)) == null) { String msg = "Registration of cluster: " + clusterId + - " failed. - Unregistered Cartridge type: " + cartridgeType; + " failed. - Unregistered cartridge type: " + cartridgeType; log.error(msg); throw new UnregisteredCartridgeException(msg); } http://git-wip-us.apache.org/repos/asf/stratos/blob/9628368e/components/org.apache.stratos.cloud.controller/src/main/resources/META-INF/services.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/resources/META-INF/services.xml b/components/org.apache.stratos.cloud.controller/src/main/resources/META-INF/services.xml index 3f365e7..b4e02dd 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/resources/META-INF/services.xml +++ b/components/org.apache.stratos.cloud.controller/src/main/resources/META-INF/services.xml @@ -27,10 +27,10 @@ <messageReceiver mep="http://www.w3.org/ns/wsdl/in-only"; class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"/> <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out"; class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/> </messageReceivers> - <operation name="deployCartridgeDefinition"> + <operation name="addCartridge"> <parameter name="AuthorizationAction" locked="true">/permission/admin/manage/add/cartridgeDefinition</parameter> </operation> - <operation name="undeployCartridgeDefinition"> + <operation name="removeCartridge"> <parameter name="AuthorizationAction" locked="true">/permission/admin/manage/add/cartridgeDefinition</parameter> </operation> <operation name="getRegisteredCartridges"> http://git-wip-us.apache.org/repos/asf/stratos/blob/9628368e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java index c02ea8f..7694a37 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java @@ -25,13 +25,7 @@ import org.apache.axis2.transport.http.HTTPConstants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.stub.*; -import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo; -import org.apache.stratos.cloud.controller.stub.domain.ClusterContext; -import org.apache.stratos.cloud.controller.stub.domain.Persistence; -import org.apache.stratos.cloud.controller.stub.domain.CartridgeConfig; -import org.apache.stratos.cloud.controller.stub.domain.Registrant; -import org.apache.stratos.cloud.controller.stub.domain.ServiceGroup; -import org.apache.stratos.cloud.controller.stub.domain.Dependencies; +import org.apache.stratos.cloud.controller.stub.domain.*; import org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesGroup; import org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesHost; import org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesMaster; @@ -82,16 +76,16 @@ public class CloudControllerServiceClient { return serviceClient; } - public void deployCartridgeDefinition (CartridgeConfig cartridgeConfig) + public void addCartridge(CartridgeConfig cartridgeConfig) throws RemoteException, CloudControllerServiceInvalidCartridgeDefinitionExceptionException, CloudControllerServiceInvalidIaasProviderExceptionException { - stub.deployCartridgeDefinition(cartridgeConfig); + stub.addCartridge(cartridgeConfig); } - public void unDeployCartridgeDefinition (String cartridgeType) throws RemoteException, CloudControllerServiceInvalidCartridgeTypeExceptionException { - stub.undeployCartridgeDefinition(cartridgeType); + public void removeCartridge(String cartridgeType) throws RemoteException, CloudControllerServiceInvalidCartridgeTypeExceptionException { + stub.removeCartridge(cartridgeType); } public String [] getServiceGroupSubGroups(String name) throws RemoteException, CloudControllerServiceInvalidServiceGroupExceptionException { http://git-wip-us.apache.org/repos/asf/stratos/blob/9628368e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/DefaultCartridgeDeployer.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/DefaultCartridgeDeployer.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/DefaultCartridgeDeployer.java index 6d3e8a5..a5699f0 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/DefaultCartridgeDeployer.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/DefaultCartridgeDeployer.java @@ -40,7 +40,7 @@ public class DefaultCartridgeDeployer extends CartridgeDeployer { protected void deployCartridge(CartridgeConfig cartridgeConfig) throws ADCException { try { CloudControllerServiceClient cloudControllerServiceClient = CloudControllerServiceClient.getServiceClient(); - cloudControllerServiceClient.deployCartridgeDefinition(cartridgeConfig); + cloudControllerServiceClient.addCartridge(cartridgeConfig); } catch (Exception e) { String msg = "Could not deploy cartridge"; log.error(msg, e); http://git-wip-us.apache.org/repos/asf/stratos/blob/9628368e/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/mgt/StratosUserManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/mgt/StratosUserManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/mgt/StratosUserManager.java index 3178141..398ecb5 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/mgt/StratosUserManager.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/mgt/StratosUserManager.java @@ -83,7 +83,7 @@ public class StratosUserManager { * @param userName UserName * @throws UserManagerException */ - public void deleteUser(UserStoreManager userStoreManager, String userName) + public void removeUser(UserStoreManager userStoreManager, String userName) throws UserManagerException { try { http://git-wip-us.apache.org/repos/asf/stratos/blob/9628368e/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 2eb2444..80449b9 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 @@ -100,7 +100,7 @@ public class StratosApiV40Utils { // call CC try { - cloudControllerServiceClient.deployCartridgeDefinition(cartridgeConfig); + cloudControllerServiceClient.addCartridge(cartridgeConfig); } catch (RemoteException e) { log.error(e.getMessage(), e); throw new RestAPIException(e.getMessage(), e); @@ -149,7 +149,7 @@ public class StratosApiV40Utils { CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient(); if (cloudControllerServiceClient != null) { try { - cloudControllerServiceClient.unDeployCartridgeDefinition(cartridgeType); + cloudControllerServiceClient.removeCartridge(cartridgeType); } catch (RemoteException e) { log.error(e.getMessage(), e); throw new RestAPIException(e.getMessage(), e); http://git-wip-us.apache.org/repos/asf/stratos/blob/9628368e/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 1201792..2a1f2eb 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 @@ -141,9 +141,9 @@ public class StratosApiV41 extends AbstractApi { @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/add/cartridgeDefinition") - public Response createCartridgeDefinition(CartridgeDefinitionBean cartridgeDefinitionBean) + public Response addCartridge(CartridgeDefinitionBean cartridgeDefinitionBean) throws RestAPIException { - StratosApiV41Utils.createCartridgeDefinition(cartridgeDefinitionBean, getConfigContext(), getUsername(), + StratosApiV41Utils.addCartridge(cartridgeDefinitionBean, getConfigContext(), getUsername(), getTenantDomain()); URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeDefinitionBean.getType()).build(); return Response.created(url).build(); @@ -241,8 +241,8 @@ public class StratosApiV41 extends AbstractApi { @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/add/cartridgeDefinition") - public Response deleteCartridgeDefinition(@PathParam("cartridgeType") String cartridgeType) throws RestAPIException { - StratosApiV41Utils.deleteCartridgeDefinition(cartridgeType); + public Response removeCartridge(@PathParam("cartridgeType") String cartridgeType) throws RestAPIException { + StratosApiV41Utils.removeCartridge(cartridgeType); return Response.noContent().build(); } @@ -261,9 +261,9 @@ public class StratosApiV41 extends AbstractApi { @Consumes("application/json") @AuthorizationAction("/permission/protected/manage/monitor/tenants") @SuperTenantService(true) - public Response createServiceGroupDefinition(ServiceGroupDefinition serviceGroupDefinition) + public Response addServiceGroup(ServiceGroupDefinition serviceGroupDefinition) throws RestAPIException { - StratosApiV41Utils.createServiceGroupDefinition(serviceGroupDefinition); + StratosApiV41Utils.addServiceGroup(serviceGroupDefinition); URI url = uriInfo.getAbsolutePathBuilder().path(serviceGroupDefinition.getName()).build(); return Response.created(url).build(); } @@ -329,10 +329,10 @@ public class StratosApiV41 extends AbstractApi { @Consumes("application/json") @AuthorizationAction("/permission/protected/manage/monitor/tenants") @SuperTenantService(true) - public Response deleteServiceGroupDefinition(@PathParam("groupDefinitionName") String groupDefinitionName) + public Response removeServiceGroup(@PathParam("groupDefinitionName") String groupDefinitionName) throws RestAPIException { - StratosApiV41Utils.deleteServiceGroupDefinition(groupDefinitionName); + StratosApiV41Utils.removeServiceGroup(groupDefinitionName); return Response.noContent().build(); } @@ -472,9 +472,9 @@ public class StratosApiV41 extends AbstractApi { @Consumes("application/json") @AuthorizationAction("/permission/protected/manage/monitor/tenants") @SuperTenantService(true) - public Response deleteApplication(@PathParam("applicationId") String applicationId) + public Response removeApplication(@PathParam("applicationId") String applicationId) throws RestAPIException { - StratosApiV41Utils.deleteApplication(applicationId); + StratosApiV41Utils.removeApplication(applicationId); return Response.noContent().build(); } @@ -661,7 +661,7 @@ public class StratosApiV41 extends AbstractApi { @Produces("application/json") @AuthorizationAction("/permission/protected/manage/modify/tenants") @SuperTenantService(true) - public Response createTenant(org.apache.stratos.common.beans.TenantInfoBean tenantInfoBean) throws RestAPIException { + public Response addTenant(org.apache.stratos.common.beans.TenantInfoBean tenantInfoBean) throws RestAPIException { try { CommonUtil.validateEmail(tenantInfoBean.getEmail()); } catch (Exception e) { @@ -973,7 +973,7 @@ public class StratosApiV41 extends AbstractApi { @Produces("application/json") @AuthorizationAction("/permission/protected/manage/monitor/tenants") @SuperTenantService(true) - public Response deleteTenant(@PathParam("tenantDomain") String tenantDomain) throws RestAPIException { + public Response removeTenant(@PathParam("tenantDomain") String tenantDomain) throws RestAPIException { TenantManager tenantManager = ServiceHolder.getTenantManager(); int tenantId = 0; try { @@ -1226,7 +1226,7 @@ public class StratosApiV41 extends AbstractApi { @Consumes("application/json") @Produces("application/json") @AuthorizationAction("/permission/admin/manage/add/users") - public Response createUser(UserInfoBean userInfoBean) throws RestAPIException { + public Response addUser(UserInfoBean userInfoBean) throws RestAPIException { StratosUserManager stratosUserManager = new StratosUserManager(); @@ -1253,17 +1253,16 @@ public class StratosApiV41 extends AbstractApi { @Consumes("application/json") @Produces("application/json") @AuthorizationAction("/permission/admin/manage/add/users") - public Response deleteUser(@PathParam("userName") String userName) throws RestAPIException { + public Response removeUser(@PathParam("userName") String userName) throws RestAPIException { StratosUserManager stratosUserManager = new StratosUserManager(); try { - stratosUserManager.deleteUser(getTenantUserStoreManager(), userName); - + stratosUserManager.removeUser(getTenantUserStoreManager(), userName); } catch (UserManagerException e) { throw new RestAPIException(e.getMessage()); } - log.info("Successfully deleted an user with Username " + userName); + log.info("Successfully removed user: [username] " + userName); return Response.noContent().build(); } @@ -1357,9 +1356,9 @@ public class StratosApiV41 extends AbstractApi { @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/add/kubernetes") - public Response deployKubernetesHostCluster(KubernetesGroup kubernetesGroup) throws RestAPIException { + public Response addKubernetesHostCluster(KubernetesGroup kubernetesGroup) throws RestAPIException { - StratosApiV41Utils.deployKubernetesGroup(kubernetesGroup); + StratosApiV41Utils.addKubernetesGroup(kubernetesGroup); URI url = uriInfo.getAbsolutePathBuilder().path(kubernetesGroup.getGroupId()).build(); return Response.created(url).build(); } @@ -1377,10 +1376,10 @@ public class StratosApiV41 extends AbstractApi { @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/add/kubernetes") - public Response deployKubernetesHost(@PathParam("kubernetesClusterId") String kubernetesClusterId, KubernetesHost kubernetesHost) + public Response addKubernetesHost(@PathParam("kubernetesClusterId") String kubernetesClusterId, KubernetesHost kubernetesHost) throws RestAPIException { - StratosApiV41Utils.deployKubernetesHost(kubernetesClusterId, kubernetesHost); + StratosApiV41Utils.addKubernetesHost(kubernetesClusterId, kubernetesHost); URI url = uriInfo.getAbsolutePathBuilder().path(kubernetesHost.getHostId()).build(); return Response.created(url).build(); } @@ -1510,9 +1509,9 @@ public class StratosApiV41 extends AbstractApi { @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/add/kubernetes") - public Response unDeployKubernetesHostCluster(@PathParam("kubernetesClusterId") String kubernetesClusterId) throws RestAPIException { + public Response removeKubernetesHostCluster(@PathParam("kubernetesClusterId") String kubernetesClusterId) throws RestAPIException { try { - StratosApiV41Utils.undeployKubernetesGroup(kubernetesClusterId); + StratosApiV41Utils.removeKubernetesGroup(kubernetesClusterId); } catch (RestAPIException e) { return Response.status(Response.Status.NOT_FOUND).build(); } @@ -1531,9 +1530,9 @@ public class StratosApiV41 extends AbstractApi { @Produces("application/json") @Consumes("application/json") @AuthorizationAction("/permission/admin/manage/add/kubernetes") - public Response unDeployKubernetesHostOfKubernetesCluster(@PathParam("hostId") String kubernetesHostId) throws RestAPIException { + public Response removeKubernetesHostOfKubernetesCluster(@PathParam("hostId") String kubernetesHostId) throws RestAPIException { try { - StratosApiV41Utils.undeployKubernetesHost(kubernetesHostId); + StratosApiV41Utils.removeKubernetesHost(kubernetesHostId); } catch (RestAPIException e) { return Response.status(Response.Status.NOT_FOUND).build(); } http://git-wip-us.apache.org/repos/asf/stratos/blob/9628368e/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 7822db9..ad7cbff 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 @@ -90,8 +90,8 @@ public class StratosApiV41Utils { private static ServiceDeploymentManager serviceDeploymentManager = new ServiceDeploymentManager(); // Util methods for cartridges - public static void createCartridgeDefinition(CartridgeDefinitionBean cartridgeDefinitionBean, ConfigurationContext ctxt, - String userName, String tenantDomain) throws RestAPIException { + public static void addCartridge(CartridgeDefinitionBean cartridgeDefinitionBean, ConfigurationContext ctxt, + String userName, String tenantDomain) throws RestAPIException { log.info("Starting to add cartridge: [cartridge-type] " + cartridgeDefinitionBean.getType()); @@ -110,7 +110,7 @@ public class StratosApiV41Utils { log.info("Successfully added cartridge: [cartridge-type] " + cartridgeDefinitionBean.getType()); } - public static void deleteCartridgeDefinition(String cartridgeType) throws RestAPIException { + public static void removeCartridge(String cartridgeType) throws RestAPIException { CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient(); if (cloudControllerServiceClient != null) { @@ -174,7 +174,7 @@ public class StratosApiV41Utils { String cartridgeType) throws RestAPIException { try { - cloudControllerServiceClient.unDeployCartridgeDefinition(cartridgeType); + cloudControllerServiceClient.removeCartridge(cartridgeType); } catch (RemoteException e) { log.error(e.getMessage(), e); @@ -849,7 +849,7 @@ public class StratosApiV41Utils { // Util methods for service groups - public static void createServiceGroupDefinition(ServiceGroupDefinition serviceGroupDefinition) throws RestAPIException { + public static void addServiceGroup(ServiceGroupDefinition serviceGroupDefinition) throws RestAPIException { try { serviceGropingManager.deployServiceGroupDefinition(serviceGroupDefinition); @@ -889,7 +889,7 @@ public class StratosApiV41Utils { } } - public static void deleteServiceGroupDefinition(String serviceGroupDefinitionName) throws RestAPIException { + public static void removeServiceGroup(String serviceGroupDefinitionName) throws RestAPIException { try { serviceGropingManager.undeployServiceGroupDefinition(serviceGroupDefinitionName); @@ -1019,7 +1019,7 @@ public class StratosApiV41Utils { } } - public static void deleteApplication(String applicationId) throws RestAPIException { + public static void removeApplication(String applicationId) throws RestAPIException { try { AutoscalerServiceClient.getServiceClient().deleteApplication(applicationId); @@ -1157,7 +1157,7 @@ public class StratosApiV41Utils { // Util methods for Kubernetes clusters - public static boolean deployKubernetesGroup(KubernetesGroup kubernetesGroupBean) throws RestAPIException { + public static boolean addKubernetesGroup(KubernetesGroup kubernetesGroupBean) throws RestAPIException { CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient(); if (cloudControllerServiceClient != null) { @@ -1178,7 +1178,7 @@ public class StratosApiV41Utils { return false; } - public static boolean deployKubernetesHost(String kubernetesGroupId, KubernetesHost kubernetesHostBean) + public static boolean addKubernetesHost(String kubernetesGroupId, KubernetesHost kubernetesHostBean) throws RestAPIException { CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient(); @@ -1267,7 +1267,7 @@ public class StratosApiV41Utils { return null; } - public static boolean undeployKubernetesGroup(String kubernetesGroupId) throws RestAPIException { + public static boolean removeKubernetesGroup(String kubernetesGroupId) throws RestAPIException { CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient(); if (cloudControllerServiceClient != null) { @@ -1286,7 +1286,7 @@ public class StratosApiV41Utils { return false; } - public static boolean undeployKubernetesHost(String kubernetesHostId) throws RestAPIException { + public static boolean removeKubernetesHost(String kubernetesHostId) throws RestAPIException { CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient(); if (cloudControllerServiceClient != null) {
