Merge PR 383
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0293c847 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0293c847 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0293c847 Branch: refs/heads/tenantisolation Commit: 0293c847ab13d4da5bd2cd40e6499f0e73a5a264 Parents: e5d003d 3402fba Author: Gayan Gunarathne <[email protected]> Authored: Mon Jul 6 14:02:43 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Mon Jul 6 14:02:43 2015 +0530 ---------------------------------------------------------------------- .../OneAfterAnotherAlgorithm.java | 4 +- .../applications/dependency/DependencyTree.java | 12 +- .../context/cluster/ClusterContext.java | 8 +- .../AutoscalerTopologyEventReceiver.java | 28 +- .../autoscaler/monitor/MonitorFactory.java | 6 +- .../monitor/component/GroupMonitor.java | 18 +- .../component/ParentComponentMonitor.java | 22 + .../builder/MonitorStatusEventBuilder.java | 37 - .../autoscaler/pojo/policy/PolicyManager.java | 149 +-- .../pojo/policy/autoscale/AutoscalePolicy.java | 24 +- .../policy/deployment/ApplicationPolicy.java | 18 + .../policy/deployment/DeploymentPolicy.java | 33 +- .../autoscaler/registry/RegistryManager.java | 20 +- .../services/impl/AutoscalerServiceImpl.java | 233 +++-- .../stratos/autoscaler/util/AutoscalerUtil.java | 20 +- .../stratos/cli/RestCommandLineService.java | 3 +- .../context/CloudControllerContext.java | 10 +- .../controller/domain/NetworkPartition.java | 36 +- .../application/ApplicationEventReceiver.java | 23 +- .../messaging/topology/TopologyBuilder.java | 9 +- .../impl/CloudControllerServiceImpl.java | 88 +- .../axiom/CloudControllerContextTest.java | 2 +- .../stratos/common/beans/UserInfoBean.java | 3 + .../beans/partition/NetworkPartitionBean.java | 18 + .../NetworkPartitionReferenceBean.java | 9 + .../policy/autoscale/AutoscalePolicyBean.java | 18 + .../deployment/ApplicationPolicyBean.java | 18 + .../policy/deployment/DeploymentPolicyBean.java | 18 + .../common/client/AutoscalerServiceClient.java | 8 +- .../common/partition/NetworkPartitionRef.java | 9 + .../schema/configure/application-policies.json | 4 +- .../schema/configure/autoscaling-policies.json | 2 +- .../schema/configure/deployment-policies.json | 2 +- .../schema/configure/network-partitions.json | 2 +- .../controllers/forms/schema/users/users.json | 1 - .../themes/theme0/partials/configure_form.hbs | 4 + .../management/StratosUserManagerUtils.java | 10 +- .../persistence/MockPersistenceManager.java | 28 +- .../iaas/persistence/PersistenceManager.java | 21 +- .../persistence/PersistenceManagerFactory.java | 8 +- .../mock/iaas/persistence/RegistryManager.java | 12 +- .../cartridge.agent/plugins/README.md | 4 +- .../rest/endpoint/api/StratosApiV41.java | 71 +- .../rest/endpoint/api/StratosApiV41Utils.java | 229 +++-- .../util/converter/ObjectConverter.java | 27 +- .../src/main/webapp/api/WEB-INF/cxf-servlet.xml | 2 + .../src/main/resources/AutoscalerService.wsdl | 504 +++++----- .../main/resources/CloudControllerService.wsdl | 914 +++++++++---------- 48 files changed, 1653 insertions(+), 1096 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/0293c847/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index 16f70cd,466dfb1..fbcad1c --- 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 @@@ -107,64 -109,65 +109,67 @@@ public class StratosApiV41Utils private static final Log log = LogFactory.getLog(StratosApiV41Utils.class); - /** - * Add New Cartridge - * - * @param cartridgeBean Cartridge definition - * @throws RestAPIException - */ - // Util methods for cartridges - public static void addCartridge(CartridgeBean cartridgeBean) throws RestAPIException { + - try { - if (log.isDebugEnabled()) { - log.debug(String.format("Adding cartridge: [cartridge-type] %s ", cartridgeBean.getType())); - } + /** + * Add new cartridge util method + * + * @param cartridgeBean Cartridge definition + * @throws RestAPIException + */ + public static void addCartridge(CartridgeBean cartridgeBean) throws RestAPIException { + + try { + if (log.isDebugEnabled()) { + log.debug(String.format("Adding cartridge: [cartridge-type] %s ", cartridgeBean.getType())); + } + + List<IaasProviderBean> iaasProviders = cartridgeBean.getIaasProvider(); + if ((iaasProviders == null) || iaasProviders.size() == 0) { + throw new RestAPIException(String.format("IaaS providers not found in cartridge: %s", + cartridgeBean.getType())); + } + + for (PortMappingBean portMapping : cartridgeBean.getPortMapping()) { + if (StringUtils.isBlank(portMapping.getName())) { + portMapping.setName(portMapping.getProtocol() + "-" + portMapping.getPort()); + if (log.isInfoEnabled()) { + log.info(String.format("Port mapping name not found, default value generated: " + + "[cartridge-type] %s [port-mapping-name] %s", + cartridgeBean.getType(), portMapping.getName())); + } + } + } - List<IaasProviderBean> iaasProviders = cartridgeBean.getIaasProvider(); - if ((iaasProviders == null) || iaasProviders.size() == 0) { - throw new RestAPIException(String.format("IaaS providers not found in cartridge: %s", - cartridgeBean.getType())); - } + Cartridge cartridgeConfig = createCartridgeConfig(cartridgeBean); + CloudControllerServiceClient cloudControllerServiceClient = CloudControllerServiceClient.getInstance(); + cloudControllerServiceClient.addCartridge(cartridgeConfig); - for (PortMappingBean portMapping : cartridgeBean.getPortMapping()) { - if (StringUtils.isBlank(portMapping.getName())) { - portMapping.setName(portMapping.getProtocol() + "-" + portMapping.getPort()); - if (log.isInfoEnabled()) { - log.info(String.format("Port mapping name not found, default value generated: " + - "[cartridge-type] %s [port-mapping-name] %s", - cartridgeBean.getType(), portMapping.getName())); - } - } - } + if (log.isDebugEnabled()) { + log.debug(String.format( + "Successfully added cartridge: [cartridge-type] %s ", + cartridgeBean.getType())); + } + } catch (CloudControllerServiceCartridgeAlreadyExistsExceptionException e) { + String msg = "Could not add cartridge"; + log.error(msg, e); + throw new RestAPIException(msg); + } catch (CloudControllerServiceInvalidCartridgeDefinitionExceptionException e) { + String msg = "Could not add cartridge"; + log.error(msg, e); + throw new RestAPIException(msg); + } catch (RemoteException e) { + String msg = "Could not add cartridge"; + log.error(msg, e); + throw new RestAPIException(msg); + } catch (CloudControllerServiceInvalidIaasProviderExceptionException e) { + String msg = "Could not add cartridge"; + log.error(msg, e); + throw new RestAPIException(msg); + } + } - Cartridge cartridgeConfig = createCartridgeConfig(cartridgeBean); - CloudControllerServiceClient cloudControllerServiceClient = CloudControllerServiceClient.getInstance(); - cloudControllerServiceClient.addCartridge(cartridgeConfig); + - if (log.isDebugEnabled()) { - log.debug(String.format( - "Successfully added cartridge: [cartridge-type] %s ", - cartridgeBean.getType())); - } - } catch (CloudControllerServiceCartridgeAlreadyExistsExceptionException e) { - String msg = "Could not add cartridge"; - log.error(msg, e); - throw new RestAPIException(msg); - } catch (CloudControllerServiceInvalidCartridgeDefinitionExceptionException e) { - String msg = "Could not add cartridge"; - log.error(msg, e); - throw new RestAPIException(msg); - } catch (RemoteException e) { - String msg = "Could not add cartridge"; - log.error(msg, e); - throw new RestAPIException(msg); - } catch (CloudControllerServiceInvalidIaasProviderExceptionException e) { - String msg = "Could not add cartridge"; - log.error(msg, e); - throw new RestAPIException(msg); - } - } + /** * Update Cartridge *
