You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/09/23 11:53:29 UTC
[1/7] git commit: Adding in tenant isolation into the mock rest
endpoint
Repository: stratos
Updated Branches:
refs/heads/origin [created] 275680932
Adding in tenant isolation into the mock rest endpoint
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/dc025ed9
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/dc025ed9
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/dc025ed9
Branch: refs/heads/origin
Commit: dc025ed9c6d8753300cfc98b9848e280f0b528f0
Parents: c6ff95f
Author: Shiro <sh...@wso2.com>
Authored: Wed Sep 10 07:10:39 2014 +0530
Committer: Shiro <sh...@wso2.com>
Committed: Wed Sep 10 07:10:39 2014 +0530
----------------------------------------------------------------------
.../org.apache.stratos.rest.endpoint/as.json | 26 --
.../endpoint/handlers/StratosMockHandler.java | 146 +++++++
.../stratos/rest/endpoint/mock/MockContext.java | 402 +++++++++++++------
.../rest/endpoint/mock/StratosTestAdmin.java | 28 +-
.../webapp/stratos-test/WEB-INF/cxf-servlet.xml | 2 +
5 files changed, 456 insertions(+), 148 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/dc025ed9/components/org.apache.stratos.rest.endpoint/as.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/as.json b/components/org.apache.stratos.rest.endpoint/as.json
deleted file mode 100644
index 5aaae67..0000000
--- a/components/org.apache.stratos.rest.endpoint/as.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "id": "simpleAutoscalePolicy2",
- "loadThresholds": {
- "requestsInFlight": {
- "average": "20",
- "gradient": "0",
- "secondDerivative": "0",
- "scaleDownMarginOfGradient": "1.0",
- "scaleDownMarginOfSecondDerivative": "0.2"
- },
- "memoryConsumption": {
- "average": "1000",
- "gradient": "0",
- "secondDerivative": "0",
- "scaleDownMarginOfGradient": "1.0",
- "scaleDownMarginOfSecondDerivative": "0.2"
- },
- "loadAverage": {
- "average": "1000",
- "gradient": "0",
- "secondDerivative": "0",
- "scaleDownMarginOfGradient": "1.0",
- "scaleDownMarginOfSecondDerivative": "0.2"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/dc025ed9/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java
new file mode 100644
index 0000000..6c04de1
--- /dev/null
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/StratosMockHandler.java
@@ -0,0 +1,146 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.stratos.rest.endpoint.handlers;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.cxf.configuration.security.AuthorizationPolicy;
+import org.apache.cxf.jaxrs.ext.RequestHandler;
+import org.apache.cxf.jaxrs.model.ClassResourceInfo;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.security.SecurityContext;
+import org.apache.stratos.rest.endpoint.ServiceHolder;
+import org.apache.stratos.rest.endpoint.Utils;
+import org.apache.stratos.rest.endpoint.context.AuthenticationContext;
+import org.apache.stratos.rest.endpoint.exception.RestAPIException;
+import org.apache.stratos.rest.endpoint.security.StratosSecurityContext;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.core.common.AuthenticationException;
+import org.wso2.carbon.core.util.AnonymousSessionUtil;
+import org.wso2.carbon.registry.core.service.RegistryService;
+import org.wso2.carbon.user.api.UserRealm;
+import org.wso2.carbon.user.core.service.RealmService;
+import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
+
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.List;
+
+/**
+ * Here we are doing the request authentication within a {@link RequestHandler}. The request handlers
+ * are get invoked just before the actual method invocation. This authentication handler make use
+ * of HTTP basic auth headers as the authentication mechanism.
+ */
+public class StratosMockHandler extends AbstractAuthenticationAuthorizationHandler {
+ private static Log log = LogFactory.getLog(StratosAuthenticationHandler.class);
+ private static String SUPPORTED_AUTHENTICATION_TYPE = "Basic";
+
+ public boolean canHandle(String authHeaderPrefix){
+ return SUPPORTED_AUTHENTICATION_TYPE.equals(authHeaderPrefix);
+ }
+
+ /**
+ * Authenticate the user against the user store. Once authenticate, populate the {@link org.wso2.carbon.context.CarbonContext}
+ * to be used by the downstream code.
+ * @param message
+ * @param classResourceInfo
+ * @return
+ */
+ public Response handle(Message message, ClassResourceInfo classResourceInfo) {
+ // If Mutual SSL is enabled
+ HttpServletRequest request = (HttpServletRequest) message.get("HTTP.REQUEST");
+ Object certObject = request.getAttribute("javax.servlet.request.X509Certificate");
+
+ AuthorizationPolicy policy = (AuthorizationPolicy) message.get(AuthorizationPolicy.class);
+ String username = policy.getUserName().trim();
+ String password = policy.getPassword().trim();
+
+ //sanity check
+ if ((username == null) || username.equals("")) {
+ log.error("username is seen as null/empty values.");
+ return Response.status(Response.Status.UNAUTHORIZED)
+ .header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON)
+ .entity(Utils.buildMessage("Username cannot be null")).build();
+ } else if (certObject == null && ((password == null) || password.equals(""))) {
+ log.error("password is seen as null/empty values.");
+ return Response.status(Response.Status.UNAUTHORIZED)
+ .header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON)
+ .entity(Utils.buildMessage("password cannot be null")).build();
+ }
+
+ try {
+ // setting the correct tenant info for downstream code..
+ PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+ carbonContext.setUsername(username);
+
+ return null;
+ /*RealmService realmService = ServiceHolder.getRealmService();
+ RegistryService registryService = ServiceHolder.getRegistryService();
+ String tenantDomain = MultitenantUtils.getTenantDomain(username);
+ int tenantId = realmService.getTenantManager().getTenantId(tenantDomain);
+
+ UserRealm userRealm = null;
+ if (certObject == null) {
+ userRealm = AnonymousSessionUtil.getRealmByTenantDomain(registryService, realmService, tenantDomain);
+ if (userRealm == null) {
+ log .error("Invalid domain or unactivated tenant login");
+ // is this the correct HTTP code for this scenario ? (401)
+ return Response.status(Response.Status.UNAUTHORIZED).header("WWW-Authenticate", "Basic").
+ type(MediaType.APPLICATION_JSON).entity(Utils.buildMessage("Tenant not found")).build();
+ }
+ }
+ username = MultitenantUtils.getTenantAwareUsername(username);
+ if (certObject != null || userRealm.getUserStoreManager().authenticate(username, password)) { // if authenticated
+
+ // setting the correct tenant info for downstream code..
+ PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+ carbonContext.setTenantDomain(tenantDomain);
+ carbonContext.setTenantId(tenantId);
+ carbonContext.setUsername(username);
+ //populate the secuirtyContext of authenticated user
+ SecurityContext securityContext = new StratosSecurityContext(username);
+ message.put(SecurityContext.class, securityContext);
+
+ // set the authenticated flag and let the request to continue
+ AuthenticationContext.setAuthenticated(true);
+ if (log.isDebugEnabled()) {
+ log.debug("authenticated using the " + CookieBasedAuthenticationHandler.class.getName() + "for username :" +
+ username + "tenantDomain : " + tenantDomain + " tenantId : " + tenantId);
+ }
+ return null;
+ } else {
+ log.warn("unable to authenticate the request");
+ // authentication failed, request the authetication, add the realm name if needed to the value of WWW-Authenticate
+ return Response.status(Response.Status.UNAUTHORIZED).header("WWW-Authenticate", "Basic").
+ type(MediaType.APPLICATION_JSON).entity(Utils.buildMessage("Authentication failed. Please " +
+ "check your username/password")).build();
+ }*/
+ } catch (Exception exception) {
+ log.error("Authentication failed",exception);
+ // server error in the eyes of the client. Hence 5xx HTTP code.
+ return Response.status(Response.Status.INTERNAL_SERVER_ERROR).type(MediaType.APPLICATION_JSON).
+ entity(Utils.buildMessage("Unexpected error. Please contact the system admin")).build();
+ }
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/dc025ed9/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
index 7046f70..84f8931 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
@@ -35,27 +35,29 @@ import org.apache.stratos.rest.endpoint.bean.subscription.domain.SubscriptionDom
import org.apache.stratos.rest.endpoint.bean.topology.Cluster;
import org.apache.stratos.rest.endpoint.bean.util.converter.PojoConverter;
import org.apache.stratos.rest.endpoint.exception.RestAPIException;
-
+import org.wso2.carbon.context.CarbonContext;
import java.util.*;
import javax.ws.rs.core.Response.Status;
public class MockContext {
private static MockContext mockContext = new MockContext(); // singleton
+
private Map<String, List<SubscriptionDomain>> subscriptionAliasToDomainMap = new HashMap<String, List<SubscriptionDomain>>();
private Map<Integer, List<String>> tenantIdToAliasesMap = new HashMap<Integer, List<String>>();
- private List<CartridgeDefinitionBean> cartridgeDefinitionBeanList = new LinkedList<CartridgeDefinitionBean>();
- private Map<String,Cartridge> availableSingleTenantCartridges = new HashMap<String,Cartridge>();
- private Map<String,Cartridge> availableMultiTenantCartridges = new HashMap<String,Cartridge>();
- private Map<String,Cartridge> subscribedCartridges = new HashMap<String,Cartridge>();
+ private Map<Integer, List<CartridgeDefinitionBean>> cartridgeDefinitionBeanList = new HashMap<Integer, List<CartridgeDefinitionBean>>();
+ private Map<Integer, Map<String,Cartridge>> availableSingleTenantCartridges = new HashMap<Integer, Map<String,Cartridge>>();
+ private Map<Integer, Map<String,Cartridge>> availableMultiTenantCartridges = new HashMap<Integer, Map<String,Cartridge>>();
+ private Map<Integer, Map<String,Cartridge>> subscribedCartridges = new HashMap<Integer, Map<String,Cartridge>>();
private Map<String,TenantInfoBean> tenantMap = new HashMap<String, TenantInfoBean>();
- private Map<String,Partition> partitionMap = new HashMap<String, Partition>();
- private Map<String,AutoscalePolicy> autoscalePolicyMap = new HashMap<String, AutoscalePolicy>();
- private Map<String,DeploymentPolicy> deploymentPolicyMap = new HashMap<String, DeploymentPolicy>();
- private Map<String,ServiceDefinitionBean> serviceDefinitionMap = new HashMap<String, ServiceDefinitionBean>();
+ private Map<String, Integer> tenantIdMap = new HashMap<String, Integer>();
+ private Map<Integer, Map<String,Partition>> partitionMap = new HashMap<Integer, Map<String, Partition>>();
+ private Map<Integer, Map<String,AutoscalePolicy>> autoscalePolicyMap = new HashMap<Integer, Map<String, AutoscalePolicy>>();
+ private Map<Integer, Map<String,DeploymentPolicy>> deploymentPolicyMap = new HashMap<Integer, Map<String, DeploymentPolicy>>();
+ private Map<Integer, Map<String,ServiceDefinitionBean>> serviceDefinitionMap = new HashMap<Integer, Map<String, ServiceDefinitionBean>>();
private Map<String,Cluster> clusterMap = new HashMap<String, Cluster>();
-
- private Set<Cartridge> temp = new HashSet<Cartridge>();
+
+ private int tenantIdCount=1;
private MockContext(){} // do not allow to initialize
@@ -64,10 +66,19 @@ public class MockContext {
return mockContext;
}
-
public StratosAdminResponse addCartirdgeDefinition(CartridgeDefinitionBean cartridgeDefinitionBean){
- this.cartridgeDefinitionBeanList.add(cartridgeDefinitionBean);
- Cartridge cartridge = new Cartridge();
+ int tenantId = getTenantId();
+ List<CartridgeDefinitionBean> tenantCartridges;
+ if(this.cartridgeDefinitionBeanList.containsKey(tenantId)){
+ tenantCartridges = this.cartridgeDefinitionBeanList.get(tenantId);
+ }
+ else{
+ tenantCartridges = new LinkedList<CartridgeDefinitionBean>();
+ this.cartridgeDefinitionBeanList.put(tenantId, tenantCartridges);
+ }
+ tenantCartridges.add(cartridgeDefinitionBean);
+
+ Cartridge cartridge = new Cartridge();
cartridge.setCartridgeType(cartridgeDefinitionBean.type);
cartridge.setDescription(cartridgeDefinitionBean.description);
cartridge.setDisplayName(cartridgeDefinitionBean.displayName);
@@ -75,30 +86,51 @@ public class MockContext {
cartridge.setProvider(cartridgeDefinitionBean.provider);
cartridge.setVersion(cartridgeDefinitionBean.version);
+ Map<String,Cartridge> cartridges;
if(cartridge.isMultiTenant()){
- availableMultiTenantCartridges.put(cartridge.getCartridgeType(), cartridge);
+ if(this.availableMultiTenantCartridges.containsKey(tenantId)){
+ cartridges = availableMultiTenantCartridges.get(tenantId);
+ }
+ else{
+ cartridges = new HashMap<String,Cartridge>();
+ this.availableMultiTenantCartridges.put(tenantId, cartridges);
+ }
+ cartridges.put(cartridge.getCartridgeType(), cartridge);
+ System.out.println(cartridges.size());
}else{
- availableSingleTenantCartridges.put(cartridge.getCartridgeType(), cartridge);
+ if(this.availableSingleTenantCartridges.containsKey(tenantId)){
+ cartridges = availableMultiTenantCartridges.get(tenantId);
+ }
+ else{
+ cartridges = new HashMap<String,Cartridge>();
+ this.availableSingleTenantCartridges.put(tenantId, cartridges);
+ }
+ cartridges.put(cartridge.getCartridgeType(), cartridge);
+ System.out.println(cartridges.size());
}
- System.out.println(availableMultiTenantCartridges.size());
- System.out.println(availableSingleTenantCartridges.size());
+
StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
- stratosAdminResponse.setMessage("Successfully deployed deployment policy definition with type ");
+ stratosAdminResponse.setMessage("Successfully deployed cartridge definition with type ");
return stratosAdminResponse;
}
public Cartridge[] getAvailableMultiTenantCartridges() throws RestAPIException{
- return availableMultiTenantCartridges.values().toArray(new Cartridge[0]);
+ if(!this.availableMultiTenantCartridges.containsKey(getTenantId())){
+ return new HashMap<String, Cartridge>().values().toArray(new Cartridge[0]);
+ }
+ return this.availableMultiTenantCartridges.get(getTenantId()).values().toArray(new Cartridge[0]);
}
public Cartridge[] getAvailableSingleTenantCartridges() throws RestAPIException{
- return availableSingleTenantCartridges.values().toArray(new Cartridge[0]);
+ if(!this.availableSingleTenantCartridges.containsKey(getTenantId())){
+ return new HashMap<String, Cartridge>().values().toArray(new Cartridge[0]);
+ }
+ return this.availableSingleTenantCartridges.get(getTenantId()).values().toArray(new Cartridge[0]);
}
-
public Cartridge[] getAvailableLbCartridges() throws RestAPIException{
/*Map<String,Cartridge> availableLbCartridges = new HashMap<String,Cartridge>();
Iterator it = availableSingleTenantCartridges.entrySet().iterator();
@@ -121,7 +153,8 @@ public class MockContext {
it.remove();
}
return availableLbCartridges.values().toArray(new Cartridge[0]);*/
- return availableSingleTenantCartridges.values().toArray(new Cartridge[0]);
+ //return availableSingleTenantCartridges.values().toArray(new Cartridge[0]);
+ return getAvailableSingleTenantCartridges();
}
public Cartridge[] getAvailableCartridges() throws RestAPIException{
@@ -147,65 +180,131 @@ public class MockContext {
}
System.out.println(availableCartridges.size());
return availableCartridges.values().toArray(new Cartridge[0]);*/
- return availableSingleTenantCartridges.values().toArray(new Cartridge[0]);
+ //return availableSingleTenantCartridges.values().toArray(new Cartridge[0]);
+ return getAvailableSingleTenantCartridges();
}
public Cartridge[] getSubscribedCartridges() throws RestAPIException{
- return subscribedCartridges.values().toArray(new Cartridge[0]);
+ if(!this.subscribedCartridges.containsKey(getTenantId())){
+ return new HashMap<String, Cartridge>().values().toArray(new Cartridge[0]);
+ }
+ return (subscribedCartridges.get(getTenantId())).values().toArray(new Cartridge[0]);
}
public SubscriptionInfo subscribeToCartridge(CartridgeInfoBean cartridgeInfoBean) throws RestAPIException{
- String cartridgeType = cartridgeInfoBean.getCartridgeType();
- String alias = cartridgeInfoBean.getAlias();
- Cartridge subscribedCartridge;
- // retrieve the cartridge from available ones
- if(availableSingleTenantCartridges.containsKey(cartridgeType)){
- subscribedCartridge = availableSingleTenantCartridges.get(cartridgeType);
-
- }else if(availableMultiTenantCartridges.containsKey(cartridgeType)){
- subscribedCartridge = availableMultiTenantCartridges.get(cartridgeType);
- }else {
- String msg = "Wrong programme sequence";
- throw new RestAPIException(msg);
- }
- //Proper way is copy construrctor
- Cartridge copy = new Cartridge();
- copy.setCartridgeType(subscribedCartridge.getCartridgeType());
- copy.setDescription(subscribedCartridge.getDescription());
- copy.setDisplayName(subscribedCartridge.getDisplayName());
- copy.setMultiTenant(subscribedCartridge.isMultiTenant());
- copy.setProvider(subscribedCartridge.getProvider());
- copy.setVersion(subscribedCartridge.getVersion());
- copy.setCartridgeAlias(alias);
- copy.setHostName("dummy.stratos.com");
- copy.setRepoURL("http://dummy.stratos.com/myrepo.git");
-
- subscribedCartridges.put(alias,copy);
+ int tenantId = this.getTenantId();
+ String cartridgeType = cartridgeInfoBean.getCartridgeType();
+ String alias = cartridgeInfoBean.getAlias();
+ Cartridge subscribedCartridge=null;
+ // retrieve the cartridge from available ones for specific tenant
+ if(availableMultiTenantCartridges.containsKey(tenantId)){
+ if((availableMultiTenantCartridges.get(tenantId)).containsKey(cartridgeType)){
+ subscribedCartridge = (availableMultiTenantCartridges.get(tenantId)).get(cartridgeType);
+ }
+ }
+ else if(availableSingleTenantCartridges.containsKey(tenantId)){
+ if((availableSingleTenantCartridges.get(tenantId)).containsKey(cartridgeType)){
+ subscribedCartridge = (availableSingleTenantCartridges.get(tenantId)).get(cartridgeType);
+ }
+ }else{
+ throw new RestAPIException(Status.NO_CONTENT,"Cartridge not defined");
+ }
+
+ if(subscribedCartridge!=null){
+ //Proper way is copy constructor
+ Cartridge copy = new Cartridge();
+ copy.setCartridgeType(subscribedCartridge.getCartridgeType());
+ copy.setDescription(subscribedCartridge.getDescription());
+ copy.setDisplayName(subscribedCartridge.getDisplayName());
+ copy.setMultiTenant(subscribedCartridge.isMultiTenant());
+ copy.setProvider(subscribedCartridge.getProvider());
+ copy.setVersion(subscribedCartridge.getVersion());
+ copy.setCartridgeAlias(alias);
+ copy.setHostName("dummy.stratos.com");
+ copy.setRepoURL("http://dummy.stratos.com/myrepo.git");
+
+ Map<String,Cartridge> subscriptions;
+ if(subscribedCartridges.containsKey(tenantId)){
+ (subscribedCartridges.get(tenantId)).put(alias,copy);
+ }
+ else{
+ subscriptions = new HashMap<String,Cartridge>();
+ subscriptions.put(alias, copy);
+ subscribedCartridges.put(tenantId, subscriptions);
+ }
+
+ SubscriptionInfo subscriptionInfo = new SubscriptionInfo();
+ subscriptionInfo.setHostname(copy.getHostName());
+ subscriptionInfo.setRepositoryURL(copy.getRepoURL());
- SubscriptionInfo subscriptionInfo = new SubscriptionInfo();
- subscriptionInfo.setHostname(copy.getHostName());
- subscriptionInfo.setRepositoryURL(copy.getRepoURL());
+ return subscriptionInfo;
+ }
+
+ return new SubscriptionInfo();
- return subscriptionInfo;
}
public StratosAdminResponse unsubscribe(String alias) throws RestAPIException{
- if(subscribedCartridges.containsKey(alias)){
- subscribedCartridges.remove(alias);
+ if(subscribedCartridges.containsKey(getTenantId())){
+ if((subscribedCartridges.get(getTenantId())).containsKey(alias)){
+ (subscribedCartridges.get(getTenantId())).remove(alias);
+ }
}else{
- throw new RestAPIException("Unable to un-subscribe");
+ throw new RestAPIException(Status.NO_CONTENT,"Unable to un-subscribe");
}
StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
stratosAdminResponse.setMessage("Successfully un-subscribed");
return stratosAdminResponse;
}
+ public Cartridge getCartridgeInfo(String alias) throws RestAPIException{
+ if(!subscribedCartridges.containsKey(getTenantId()))
+ throw new RestAPIException(Status.NO_CONTENT, "No cartridges subscribed for current tenant.");
+
+ if(!(subscribedCartridges.get(getTenantId())).containsKey(alias))
+ throw new RestAPIException(Status.NO_CONTENT,"Cartridge information is not available.");
+
+ return (subscribedCartridges.get(getTenantId())).get(alias);
+ }
+
+ public Cartridge getAvailableSingleTenantCartridgeInfo(String cartridgeType) throws RestAPIException{
+ if(!availableSingleTenantCartridges.containsKey(getTenantId()))
+ throw new RestAPIException(Status.NO_CONTENT,"No cartridges defined for current tenant");
+
+ if(!(availableSingleTenantCartridges.get(getTenantId())).containsKey(cartridgeType))
+ throw new RestAPIException(Status.NO_CONTENT,"Cartridge is not available.");
+
+ return (availableSingleTenantCartridges.get(getTenantId())).get(cartridgeType);
+ }
+
+ public StratosAdminResponse deleteCartridgeDefinition(String cartridgeType) throws RestAPIException{
+ if((!availableSingleTenantCartridges.containsKey(getTenantId())) && (!availableMultiTenantCartridges.containsKey(getTenantId())))
+ throw new RestAPIException(Status.NO_CONTENT,"No cartridges defined for tenant");
+
+ if(availableSingleTenantCartridges.containsKey(getTenantId())){
+ if((availableSingleTenantCartridges.get(getTenantId())).containsKey(cartridgeType)){
+ (availableSingleTenantCartridges.get(getTenantId())).remove(cartridgeType);
+ }
+ } else if(availableMultiTenantCartridges.containsKey(getTenantId())){
+ if((availableMultiTenantCartridges.get(getTenantId())).containsKey(cartridgeType)){
+ (availableMultiTenantCartridges.get(getTenantId())).remove(cartridgeType);
+ }
+ } else{
+ throw new RestAPIException(Status.BAD_REQUEST,"invalid cartridge type");
+ }
+ StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
+ stratosAdminResponse.setMessage("Successfully delete cartridge definition");
+ return stratosAdminResponse;
+ }
+
public StratosAdminResponse addTenant(TenantInfoBean tenantInfoBean) throws RestAPIException{
try{
tenantMap.put(tenantInfoBean.getTenantDomain(),tenantInfoBean);
+ tenantInfoBean.setTenantId(tenantIdCount);
+ tenantIdMap.put(tenantInfoBean.getAdmin(), tenantIdCount++);
}catch (Exception e){
- throw new RestAPIException(e.getMessage());
+ throw new RestAPIException(Status.INTERNAL_SERVER_ERROR,e.getMessage());
}
StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
stratosAdminResponse.setMessage("Successfully added new Tenant");
@@ -214,34 +313,25 @@ public class MockContext {
public TenantInfoBean getTenant(String tenantDomain) throws RestAPIException{
if(!tenantMap.containsKey(tenantDomain)){
- throw new RestAPIException("Information for tenant: " + tenantDomain + " is not available");
+ throw new RestAPIException(Status.NO_CONTENT,"Information for tenant: " + tenantDomain + " is not available");
}
return tenantMap.get(tenantDomain);
}
-
- public Cartridge getCartridgeInfo(String alias) throws RestAPIException{
- if(!subscribedCartridges.containsKey(alias)){
- throw new RestAPIException("Cartridge information is not available.");
- }
- return subscribedCartridges.get(alias);
- }
-
- public Cartridge getAvailableSingleTenantCartridgeInfo(String cartridgeType) throws RestAPIException{
- if(!availableSingleTenantCartridges.containsKey(cartridgeType)){
- throw new RestAPIException("Cartridge is not available.");
- }
- return availableSingleTenantCartridges.get(cartridgeType);
- }
-
+
public StratosAdminResponse deleteTenant(String tenantDomain) {
- tenantMap.remove(tenantDomain);
+ if(tenantMap.containsKey(tenantDomain)){
+ TenantInfoBean tenant=tenantMap.get(tenantDomain);
+ tenantMap.remove(tenantDomain);
+ tenantIdMap.remove(tenant.getTenantId());
+ }
+
StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
stratosAdminResponse.setMessage("Successfully deleted tenant");
return stratosAdminResponse;
}
public TenantInfoBean[] getTenants() throws RestAPIException{
- return tenantMap.values().toArray(new TenantInfoBean[0]);
+ return tenantMap.values().toArray(new TenantInfoBean[0]);
}
public TenantInfoBean[] retrievePartialSearchTenants(String searchDomain) throws RestAPIException{
@@ -258,7 +348,7 @@ public class MockContext {
if(tenantMap.containsKey(tenantDomain)){
tenantMap.get(tenantDomain).setActive(true);
} else{
- throw new RestAPIException("Invalid tenant domain");
+ throw new RestAPIException(Status.BAD_REQUEST,"Invalid tenant domain");
}
StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
stratosAdminResponse.setMessage("Successfully activated Tenant");
@@ -269,130 +359,193 @@ public class MockContext {
if(tenantMap.containsKey(tenantDomain)){
tenantMap.get(tenantDomain).setActive(false);
} else{
- throw new RestAPIException("Invalid tenant domain");
+ throw new RestAPIException(Status.BAD_REQUEST,"Invalid tenant domain");
}
StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
stratosAdminResponse.setMessage("Successfully deactivated Tenant");
return stratosAdminResponse;
}
- public StratosAdminResponse deleteCartridgeDefinition(String cartridgeType) throws RestAPIException{
- if(availableSingleTenantCartridges.containsKey(cartridgeType)){
- availableSingleTenantCartridges.remove(cartridgeType);
- } else if(availableMultiTenantCartridges.containsKey(cartridgeType)){
- availableMultiTenantCartridges.remove(cartridgeType);
- } else{
- throw new RestAPIException("invalid cartridge type");
- }
- StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
- stratosAdminResponse.setMessage("Successfully delete cartridge definition");
- return stratosAdminResponse;
- }
-
public StratosAdminResponse addPartition(Partition partition) {
- partitionMap.put(partition.id, partition);
+ Map<String,Partition> partitions;
+ if (partitionMap.containsKey(getTenantId())){
+ partitions = partitionMap.get(getTenantId());
+ }
+ else{
+ partitions = new HashMap<String, Partition>();
+ partitionMap.put(getTenantId(), partitions);
+ }
+ partitions.put(partition.id, partition);
StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
stratosAdminResponse.setMessage("Successfully deployed partition");
return stratosAdminResponse;
}
public StratosAdminResponse addAutoScalingPolicyDefinition(AutoscalePolicy autoscalePolicy) {
- autoscalePolicyMap.put(autoscalePolicy.getId(), autoscalePolicy);
+ Map<String,AutoscalePolicy> policies;
+ if (autoscalePolicyMap.containsKey(getTenantId())){
+ policies = autoscalePolicyMap.get(getTenantId());
+ }
+ else{
+ policies = new HashMap<String, AutoscalePolicy>();
+ autoscalePolicyMap.put(getTenantId(), policies);
+ }
+ policies.put(autoscalePolicy.getId(), autoscalePolicy);
StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
stratosAdminResponse.setMessage("Successfully deployed auto scaling policy definition");
return stratosAdminResponse;
}
public StratosAdminResponse addDeploymentPolicyDefinition(DeploymentPolicy deploymentPolicy) {
- deploymentPolicyMap.put(deploymentPolicy.id,deploymentPolicy);
+ Map<String,DeploymentPolicy> policies;
+ if (deploymentPolicyMap.containsKey(getTenantId())){
+ policies = deploymentPolicyMap.get(getTenantId());
+ }
+ else{
+ policies = new HashMap<String, DeploymentPolicy>();
+ deploymentPolicyMap.put(getTenantId(), policies);
+ }
+ policies.put(deploymentPolicy.id,deploymentPolicy);
StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
stratosAdminResponse.setMessage("Successfully deployed deployment policy definition");
return stratosAdminResponse;
}
public Partition[] getPartitions() throws RestAPIException{
- return partitionMap.values().toArray(new Partition[0]);
+ if(!partitionMap.containsKey(getTenantId())){
+ return new HashMap<String,Partition>().values().toArray(new Partition[0]);
+ }
+ return (partitionMap.get(getTenantId())).values().toArray(new Partition[0]);
}
public Partition getPartition(String partitionId) throws RestAPIException{
- if(!partitionMap.containsKey(partitionId)){
+ if(!partitionMap.containsKey(getTenantId()))
+ throw new RestAPIException(Status.NO_CONTENT,"No partitions have been defined for the tenant");
+
+ if(!(partitionMap.get(getTenantId())).containsKey(partitionId)){
throw new RestAPIException("There is no partition with the id: " + partitionId);
}
- return partitionMap.get(partitionId);
+ return (partitionMap.get(getTenantId())).get(partitionId);
}
public Partition[] getPartitionsOfPolicy(String deploymentPolicyId) throws RestAPIException{
- if(!deploymentPolicyMap.containsKey(deploymentPolicyId)){
- throw new RestAPIException("There is no deployment policy with id: " + deploymentPolicyId);
+ if(!deploymentPolicyMap.containsKey(getTenantId()))
+ throw new RestAPIException(Status.NO_CONTENT,"No deployment policies have been defined for tenant");
+
+ if(!(deploymentPolicyMap.get(getTenantId())).containsKey(deploymentPolicyId)){
+ throw new RestAPIException(Status.NO_CONTENT,"There is no deployment policy with id: " + deploymentPolicyId);
}
- return deploymentPolicyMap.get(deploymentPolicyId).partition.toArray(new Partition[0]);
+ return (deploymentPolicyMap.get(getTenantId())).get(deploymentPolicyId).partition.toArray(new Partition[0]);
}
public PartitionGroup[] getPartitionGroups(String deploymentPolicyId) throws RestAPIException{
- if(!deploymentPolicyMap.containsKey(deploymentPolicyId)){
- throw new RestAPIException("There is no policy with id: " + deploymentPolicyId);
+ if(!deploymentPolicyMap.containsKey(getTenantId()))
+ throw new RestAPIException(Status.NO_CONTENT,"No deployment policies have been defined for tenant");
+
+ if(!(deploymentPolicyMap.get(getTenantId())).containsKey(deploymentPolicyId)){
+ throw new RestAPIException(Status.NO_CONTENT,"There is no policy with id: " + deploymentPolicyId);
}
- return deploymentPolicyMap.get(deploymentPolicyId).partitionGroup.toArray(new PartitionGroup[0]);
+ return (deploymentPolicyMap.get(getTenantId())).get(deploymentPolicyId).partitionGroup.toArray(new PartitionGroup[0]);
}
public AutoscalePolicy[] getAutoscalePolicies() throws RestAPIException{
- return autoscalePolicyMap.values().toArray(new AutoscalePolicy[0]);
+ if(!autoscalePolicyMap.containsKey(getTenantId())){
+ return new HashMap<String,AutoscalePolicy>().values().toArray(new AutoscalePolicy[0]);
+ }
+ return (autoscalePolicyMap.get(getTenantId())).values().toArray(new AutoscalePolicy[0]);
}
public AutoscalePolicy getAutoscalePolicies(String autoscalePolicyId) throws RestAPIException{
- if(!autoscalePolicyMap.containsKey(autoscalePolicyId)){
+ if(!autoscalePolicyMap.containsKey(getTenantId()))
+ throw new RestAPIException(Status.NO_CONTENT,"No autoscaling policies have been defined for tenant");
+
+ if(!(autoscalePolicyMap.get(getTenantId())).containsKey(autoscalePolicyId)){
throw new RestAPIException("There is no auto scale policy with id: " + autoscalePolicyId);
}
- return autoscalePolicyMap.get(autoscalePolicyId);
+ return (autoscalePolicyMap.get(getTenantId())).get(autoscalePolicyId);
}
public DeploymentPolicy[] getDeploymentPolicies() throws RestAPIException{
- return deploymentPolicyMap.values().toArray(new DeploymentPolicy[0]);
+ if(!deploymentPolicyMap.containsKey(getTenantId())){
+ return new HashMap<String,DeploymentPolicy>().values().toArray(new DeploymentPolicy[0]);
+ }
+
+ return (deploymentPolicyMap.get(getTenantId())).values().toArray(new DeploymentPolicy[0]);
}
public DeploymentPolicy getDeploymentPolicies(String deploymentPolicyId) throws RestAPIException{
- if(!deploymentPolicyMap.containsKey(deploymentPolicyId)){
+ if(!deploymentPolicyMap.containsKey(getTenantId()))
+ throw new RestAPIException("No deployment policies have been defined for tenant");
+
+ if(!(deploymentPolicyMap.get(getTenantId())).containsKey(deploymentPolicyId)){
throw new RestAPIException("There is no deployment policy with id: " + deploymentPolicyId);
}
- return deploymentPolicyMap.get(deploymentPolicyId);
+ return (deploymentPolicyMap.get(getTenantId())).get(deploymentPolicyId);
}
+
public StratosAdminResponse deployService(ServiceDefinitionBean serviceDefinitionBean) {
- serviceDefinitionMap.put(serviceDefinitionBean.getCartridgeType(),serviceDefinitionBean);
+ Map<String,ServiceDefinitionBean> serviceDefinitions;
+
+ if(!serviceDefinitionMap.containsKey(getTenantId())){
+ serviceDefinitions = new HashMap<String,ServiceDefinitionBean>();
+ serviceDefinitionMap.put(getTenantId(), serviceDefinitions);
+ }
+ else{
+ serviceDefinitions = serviceDefinitionMap.get(getTenantId());
+ }
+
+ serviceDefinitions.put(serviceDefinitionBean.getCartridgeType(),serviceDefinitionBean);
StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
stratosAdminResponse.setMessage("Successfully deployed service");
return stratosAdminResponse;
}
+
public ServiceDefinitionBean[] getServices() throws RestAPIException{
- return serviceDefinitionMap.values().toArray(new ServiceDefinitionBean[0]);
+ if(!serviceDefinitionMap.containsKey(getTenantId())){
+ return new HashMap<String,ServiceDefinitionBean>().values().toArray(new ServiceDefinitionBean[0]);
+ }
+ return (serviceDefinitionMap.get(getTenantId())).values().toArray(new ServiceDefinitionBean[0]);
}
public ServiceDefinitionBean getServiceType(String serviceType) throws RestAPIException{
- return serviceDefinitionMap.get(serviceType);
+ if(!serviceDefinitionMap.containsKey(getTenantId()))
+ throw new RestAPIException(Status.NO_CONTENT,"No services have been defined for tenant");
+
+ return (serviceDefinitionMap.get(getTenantId())).get(serviceType);
}
public Partition[] getPartitions(String deploymentPolicyId, String partitionGroupId) throws RestAPIException{
- if(!deploymentPolicyMap.containsKey(deploymentPolicyId)){
- throw new RestAPIException("There is no deployment policy with id: " + deploymentPolicyId);
+ if(!deploymentPolicyMap.containsKey(getTenantId()))
+ throw new RestAPIException(Status.NO_CONTENT,"No deployment policies have been defined for tenant");
+
+ if(!(deploymentPolicyMap.get(getTenantId())).containsKey(deploymentPolicyId)){
+ throw new RestAPIException(Status.NO_CONTENT,"There is no deployment policy with id: " + deploymentPolicyId);
}
+
Partition[] partitions = null;
- DeploymentPolicy deploymentPolicy = deploymentPolicyMap.get(deploymentPolicyId);
+ DeploymentPolicy deploymentPolicy = (deploymentPolicyMap.get(getTenantId())).get(deploymentPolicyId);
for(PartitionGroup partitionGroup : deploymentPolicy.partitionGroup){
if(partitionGroup.id.equals(partitionGroupId)){
partitions = partitionGroup.partition.toArray(new Partition[0]);
}
}
if(partitions == null){
- throw new RestAPIException("Partition not found");
+ throw new RestAPIException(Status.NO_CONTENT,"Partition not found");
}
return partitions;
}
+
public Cluster[] getClusters() throws RestAPIException{
return clusterMap.values().toArray(new Cluster[0]);
}
+
public DeploymentPolicy[] getDeploymentPoliciesForCartridgeType(String cartridgeType) throws RestAPIException{
- return deploymentPolicyMap.values().toArray(new DeploymentPolicy[0]);
+ if(!deploymentPolicyMap.containsKey(getTenantId())){
+ return new HashMap<String,DeploymentPolicy>().values().toArray(new DeploymentPolicy[0]);
+ }
+ return (deploymentPolicyMap.get(getTenantId())).values().toArray(new DeploymentPolicy[0]);
}
public StratosAdminResponse addSubscriptionDomains(int tenantId, String alias, SubscriptionDomainRequest request) {
@@ -467,12 +620,21 @@ public class MockContext {
stratosAdminResponse.setMessage("Successfully removed the subscription domain: "+domainName);
}
}
- } else {
-
+ } else {
stratosAdminResponse.setMessage("Failed to remove the subscription domain: "+domainName);
}
return stratosAdminResponse;
}
+
+ private int getTenantId() {
+ String userName = CarbonContext.getThreadLocalCarbonContext().getUsername();
+ if (tenantIdMap.containsKey(userName)){
+ return tenantIdMap.get(userName);
+ }
+ else {
+ return -1;
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/dc025ed9/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java
index d766ebd..5e878e1 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java
@@ -19,13 +19,20 @@
package org.apache.stratos.rest.endpoint.mock;
+import java.net.URI;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.common.beans.TenantInfoBean;
+import org.apache.stratos.common.exception.StratosException;
+import org.apache.stratos.common.util.CommonUtil;
import org.apache.stratos.manager.dto.Cartridge;
import org.apache.stratos.manager.dto.SubscriptionInfo;
import org.apache.stratos.manager.exception.ADCException;
+import org.apache.stratos.manager.exception.ServiceDoesNotExistException;
+import org.apache.stratos.manager.subscription.CartridgeSubscription;
import org.apache.stratos.manager.subscription.SubscriptionDomain;
+import org.apache.stratos.rest.endpoint.ServiceHolder;
import org.apache.stratos.rest.endpoint.Utils;
import org.apache.stratos.rest.endpoint.annotation.AuthorizationAction;
import org.apache.stratos.rest.endpoint.annotation.SuperTenantService;
@@ -42,6 +49,14 @@ import org.apache.stratos.rest.endpoint.bean.subscription.domain.SubscriptionDom
import org.apache.stratos.rest.endpoint.bean.topology.Cluster;
import org.apache.stratos.rest.endpoint.exception.RestAPIException;
import org.apache.stratos.rest.endpoint.services.ServiceUtils;
+import org.apache.stratos.tenant.mgt.core.TenantPersistor;
+import org.apache.stratos.tenant.mgt.util.TenantMgtUtil;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.context.RegistryType;
+import org.wso2.carbon.registry.core.exceptions.RegistryException;
+import org.wso2.carbon.registry.core.session.UserRegistry;
+import org.wso2.carbon.user.core.tenant.Tenant;
+import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -49,6 +64,7 @@ import javax.ws.rs.*;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
@Path("/admin/")
public class StratosTestAdmin {
@@ -151,7 +167,7 @@ public class StratosTestAdmin {
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
public StratosAdminResponse addTenant(TenantInfoBean tenantInfoBean) throws RestAPIException {
- return MockContext.getInstance().addTenant(tenantInfoBean);
+ return MockContext.getInstance().addTenant(tenantInfoBean);
}
@@ -191,7 +207,7 @@ public class StratosTestAdmin {
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@SuperTenantService(true)
public TenantInfoBean[] retrieveTenants() throws RestAPIException {
- return MockContext.getInstance().getTenants();
+ return MockContext.getInstance().getTenants();
}
@GET
@@ -518,5 +534,13 @@ public class StratosTestAdmin {
return MockContext.getInstance().removeSubscriptionDomain(2, subscriptionAlias, domainName);
}
+
+ @POST
+ @Path("/cartridge/sync")
+ @Consumes("application/json")
+ @AuthorizationAction("/permission/protected/manage/monitor/tenants")
+ public Response synchronizeRepository(String alias) throws RestAPIException {
+ return Response.noContent().build();
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/dc025ed9/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/cxf-servlet.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/cxf-servlet.xml b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/cxf-servlet.xml
index 7c9e7fd..7f326ab 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/cxf-servlet.xml
+++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/cxf-servlet.xml
@@ -38,6 +38,7 @@
<ref bean="badRequestExceptionHandler"/>
<ref bean="jsonProvider"/>
<ref bean="throwableExceptionHandler"/>
+ <ref bean="basicAuthenticationFilter"/>
<bean class="org.apache.cxf.jaxrs.provider.json.JSONProvider">
<property name="dropRootElement" value="true"/>
<property name="supportUnwrapped" value="true"/>
@@ -47,6 +48,7 @@
</jaxrs:server>
<bean id="stratosRestEndpointTestBean" class="org.apache.stratos.rest.endpoint.mock.StratosTestAdmin"/>
+ <bean id="basicAuthenticationFilter" class="org.apache.stratos.rest.endpoint.handlers.StratosMockHandler"/>
<bean id="exceptionHandler" class="org.apache.stratos.rest.endpoint.handlers.CustomExceptionMapper"/>
<bean id="badRequestExceptionHandler" class="org.apache.stratos.rest.endpoint.handlers.BadRequestExceptionMapper"/>
<bean id="genericExceptionHandler" class="org.apache.stratos.rest.endpoint.handlers.GenericExceptionMapper"/>
[4/7] git commit: Merge remote-tracking branch 'upstream/master'
Posted by ni...@apache.org.
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/db95d88e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/db95d88e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/db95d88e
Branch: refs/heads/origin
Commit: db95d88e5cbf56357096c1fca00f716332dc4b2d
Parents: 673b17a 374e3fd
Author: Shiro <sh...@wso2.com>
Authored: Mon Sep 15 10:33:58 2014 +0530
Committer: Shiro <sh...@wso2.com>
Committed: Mon Sep 15 10:33:58 2014 +0530
----------------------------------------------------------------------
----------------------------------------------------------------------
[7/7] git commit: Policy and partition definition isolation in
Autoscalar - minus tenant migration
Posted by ni...@apache.org.
Policy and partition definition isolation in Autoscalar - minus tenant migration
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/27568093
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/27568093
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/27568093
Branch: refs/heads/origin
Commit: 27568093258e68274c6a84f89aec7aa69e7d88f2
Parents: 6fae635
Author: Shiro <sh...@wso2.com>
Authored: Fri Sep 19 16:07:01 2014 +0530
Committer: Shiro <sh...@wso2.com>
Committed: Fri Sep 19 16:07:01 2014 +0530
----------------------------------------------------------------------
.../internal/AutoscalerServerComponent.java | 41 +-
.../internal/TenantArtifactLoader.java | 76 ++++
.../autoscaler/partition/PartitionManager.java | 107 ++++-
.../autoscaler/policy/PolicyManager.java | 389 +++++++++++++++----
4 files changed, 495 insertions(+), 118 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/27568093/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java
index 4823057..6b139c8 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java
@@ -31,9 +31,11 @@ import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy;
import org.apache.stratos.autoscaler.registry.RegistryManager;
import org.apache.stratos.autoscaler.util.ServiceReferenceHolder;
import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition;
+import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
import org.wso2.carbon.registry.api.RegistryException;
import org.wso2.carbon.registry.core.service.RegistryService;
+import org.wso2.carbon.utils.Axis2ConfigurationContextObserver;
import java.util.Iterator;
import java.util.List;
@@ -80,36 +82,25 @@ public class AutoscalerServerComponent {
if (log.isDebugEnabled()) {
log.debug("Health message processor thread started");
}
+
+ // Register tenantLoadListener
+ BundleContext bundleContext = componentContext.getBundleContext();
+ TenantArtifactLoader listener = new TenantArtifactLoader();
+ bundleContext.registerService(
+ Axis2ConfigurationContextObserver.class.getName(), listener, null);
+
// Adding the registry stored partitions to the information model
- List<Partition> partitions = RegistryManager.getInstance().retrievePartitions();
- Iterator<Partition> partitionIterator = partitions.iterator();
- while (partitionIterator.hasNext()) {
- Partition partition = partitionIterator.next();
- PartitionManager.getInstance().addPartitionToInformationModel(partition);
- }
+ PartitionManager.getInstance().loadPartitionsToInformationModel();
// Adding the network partitions stored in registry to the information model
- List<NetworkPartitionLbHolder> nwPartitionHolders = RegistryManager.getInstance().retrieveNetworkPartitionLbHolders();
- Iterator<NetworkPartitionLbHolder> nwPartitionIterator = nwPartitionHolders.iterator();
- while (nwPartitionIterator.hasNext()) {
- NetworkPartitionLbHolder nwPartition = nwPartitionIterator.next();
- PartitionManager.getInstance().addNetworkPartitionLbHolder(nwPartition);
- }
+ PartitionManager.getInstance().loadNetworkPartitionsToInformationModel();
- List<AutoscalePolicy> asPolicies = RegistryManager.getInstance().retrieveASPolicies();
- Iterator<AutoscalePolicy> asPolicyIterator = asPolicies.iterator();
- while (asPolicyIterator.hasNext()) {
- AutoscalePolicy asPolicy = asPolicyIterator.next();
- PolicyManager.getInstance().addASPolicyToInformationModel(asPolicy);
- }
-
- List<DeploymentPolicy> depPolicies = RegistryManager.getInstance().retrieveDeploymentPolicies();
- Iterator<DeploymentPolicy> depPolicyIterator = depPolicies.iterator();
- while (depPolicyIterator.hasNext()) {
- DeploymentPolicy depPolicy = depPolicyIterator.next();
- PolicyManager.getInstance().addDeploymentPolicyToInformationModel(depPolicy);
- }
+ // Adding the registry stored autoscaling policies to the information model
+ PolicyManager.getInstance().loadASPoliciesToInformationModel();
+
+ // Adding the registry stored deployment policies to the information model
+ PolicyManager.getInstance().loadDeploymentPoliciesToInformationModel();
if (log.isInfoEnabled()) {
log.info("Autoscaler Server Component activated");
http://git-wip-us.apache.org/repos/asf/stratos/blob/27568093/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/TenantArtifactLoader.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/TenantArtifactLoader.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/TenantArtifactLoader.java
new file mode 100644
index 0000000..e85c753
--- /dev/null
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/TenantArtifactLoader.java
@@ -0,0 +1,76 @@
+package org.apache.stratos.autoscaler.internal;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.stratos.autoscaler.partition.PartitionManager;
+import org.apache.stratos.autoscaler.policy.PolicyManager;
+import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy;
+import org.apache.stratos.autoscaler.registry.RegistryManager;
+import org.wso2.carbon.context.CarbonContext;
+import org.wso2.carbon.utils.AbstractAxis2ConfigurationContextObserver;
+
+
+public class TenantArtifactLoader extends AbstractAxis2ConfigurationContextObserver
+{
+ public void creatingConfigurationContext(int tenantId) {
+ System.out.println("Just before creating");
+ }
+
+ public void createdConfigurationContext(ConfigurationContext configContext) {
+ System.out.println("Just after creating");
+ if(!checkIfArtifactsAreInSync()){
+ updateArtifacts();
+ }
+ }
+
+ public void terminatingConfigurationContext(ConfigurationContext configCtx) {
+ System.out.println("Just before removing");
+ clearArtifacts();
+ }
+
+ public void terminatedConfigurationContext(ConfigurationContext configCtx) {
+ System.out.println("Just after removing");
+ }
+
+ private boolean checkIfArtifactsAreInSync()
+ {
+ int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
+ System.out.println("************** Tenant ID : " + tenantId + "**************");
+
+ // check whether tenant Id is present in inMemModels
+ return (PolicyManager.getInstance().isTenantPolicyDetailsInInformationModel(tenantId) &&
+ PartitionManager.getInstance().isTenantPolicyDetailsInInformationModel(tenantId));
+ }
+
+ private void updateArtifacts()
+ {
+ // Adding the registry stored partitions to the information model
+ PartitionManager.getInstance().loadPartitionsToInformationModel();
+
+ // Adding the network partitions stored in registry to the information model
+ PartitionManager.getInstance().loadNetworkPartitionsToInformationModel();
+
+ // Adding the registry stored autoscaling policies to the information model
+ PolicyManager.getInstance().loadASPoliciesToInformationModel();
+
+ // Adding the registry stored deployment policies to the information model
+ PolicyManager.getInstance().loadDeploymentPoliciesToInformationModel();
+ }
+
+ private void clearArtifacts()
+ {
+ int currentTenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
+ System.out.println("************** Tenant ID : " + currentTenantId + "**************");
+
+ // Adding the registry stored partitions to the information model
+ PartitionManager.getInstance().removePartitionsFromInformationModel(currentTenantId);
+
+ // Adding the registry stored autoscaling policies to the information model
+ PolicyManager.getInstance().removeASPoliciesFromInformationModel(currentTenantId);
+
+ // Adding the registry stored deployment policies to the information model
+ PolicyManager.getInstance().removeDeploymentPoliciesFromInformationModel(currentTenantId);
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/27568093/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java
index 66aa501..cacc5a3 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java
@@ -27,12 +27,17 @@ import org.apache.stratos.autoscaler.client.cloud.controller.CloudControllerClie
import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy;
import org.apache.stratos.autoscaler.exception.AutoScalerException;
import org.apache.stratos.autoscaler.exception.InvalidPartitionException;
+import org.apache.stratos.autoscaler.exception.InvalidPolicyException;
import org.apache.stratos.autoscaler.exception.PartitionValidationException;
import org.apache.stratos.autoscaler.registry.RegistryManager;
import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition;
+import org.apache.stratos.common.constants.StratosConstants;
+import org.wso2.carbon.context.CarbonContext;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -44,7 +49,7 @@ public class PartitionManager {
private static final Log log = LogFactory.getLog(PartitionManager.class);
// Partitions against partitionID
- private static Map<String,Partition> partitions = new HashMap<String, Partition>();
+ private static Map<Integer, Map<String,Partition>> partitions = new HashMap<Integer, Map<String, Partition>>();
/*
* Key - network partition id
@@ -64,9 +69,20 @@ private static final Log log = LogFactory.getLog(PartitionManager.class);
networkPartitionLbHolders = new HashMap<String, NetworkPartitionLbHolder>();
}
+ // Checks whether a given tenant's policies have been added to memory model
+ public boolean isTenantPolicyDetailsInInformationModel(int containerId){
+ return (partitions.containsKey(containerId));
+ }
public boolean partitionExist(String partitionId){
- return partitions.containsKey(partitionId);
+ int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
+ if(partitions.containsKey(tenantId)){
+ return (partitions.get(tenantId)).containsKey(partitionId);
+ }
+ else if(partitions.containsKey(StratosConstants.PUBLIC_DEFINITION)){
+ return (partitions.get(StratosConstants.PUBLIC_DEFINITION)).containsKey(partitionId);
+ }
+ return false;
}
/*
@@ -95,25 +111,96 @@ private static final Log log = LogFactory.getLog(PartitionManager.class);
}
}
+ public void loadPartitionsToInformationModel(){
+ List<Partition> partitions = RegistryManager.getInstance().retrievePartitions();
+ Iterator<Partition> partitionIterator = partitions.iterator();
+ while (partitionIterator.hasNext()) {
+ Partition partition = partitionIterator.next();
+ try{
+ addPartitionToInformationModel(partition);
+ }
+ catch(InvalidPolicyException e){
+ // ignore and move on
+ }
+ }
+ }
+
+ public void removePartitionsFromInformationModel(int tenantId){
+ partitions.remove(tenantId);
+ }
+
+ public void loadNetworkPartitionsToInformationModel(){
+ List<NetworkPartitionLbHolder> nwPartitionHolders = RegistryManager.getInstance().retrieveNetworkPartitionLbHolders();
+ Iterator<NetworkPartitionLbHolder> nwPartitionIterator = nwPartitionHolders.iterator();
+ while (nwPartitionIterator.hasNext()) {
+ NetworkPartitionLbHolder nwPartition = nwPartitionIterator.next();
+ PartitionManager.getInstance().addNetworkPartitionLbHolder(nwPartition);
+ }
+ }
- public void addPartitionToInformationModel(Partition partition) {
- partitions.put(partition.getId(), partition);
+ public void addPartitionToInformationModel(Partition partition) throws InvalidPolicyException {
+ int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
+
+ if(partition.getIsPublic()){
+ addPartitionToSpecificContainer(partition, StratosConstants.PUBLIC_DEFINITION);
+ }
+ else{
+ addPartitionToSpecificContainer(partition, tenantId);
+ }
}
+
+ private void addPartitionToSpecificContainer(Partition partition, int containerId) throws InvalidPolicyException {
+
+ Map<String, Partition> partitionDefinitions;
+ if(!partitions.containsKey(containerId))
+ {
+ partitionDefinitions = new HashMap<String, Partition>();
+ partitions.put(containerId, partitionDefinitions);
+ }
+ else {
+ partitionDefinitions = partitions.get(containerId);
+ }
+
+ if (!partitionDefinitions.containsKey(partition.getId())) {
+ if (log.isDebugEnabled()) {
+ log.debug("Adding policy :" + partition.getId());
+ }
+ partitionDefinitions.put(partition.getId(), partition);
+ } else {
+ String errMsg = "Specified policy [" + partition.getId() + "] already exists";
+ log.error(errMsg);
+ throw new InvalidPolicyException(errMsg);
+ }
+ }
public NetworkPartitionLbHolder getNetworkPartitionLbHolder(String networkPartitionId) {
return this.networkPartitionLbHolders.get(networkPartitionId);
}
public Partition getPartitionById(String partitionId){
- if(partitionExist(partitionId))
- return partitions.get(partitionId);
- else
- return null;
+ int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
+ if(partitions.containsKey(tenantId)){
+ return (partitions.get(tenantId)).get(partitionId);
+ }
+ else if(partitions.containsKey(StratosConstants.PUBLIC_DEFINITION)){
+ return (partitions.get(StratosConstants.PUBLIC_DEFINITION)).get(partitionId);
+ }
+
+ return null;
}
public Partition[] getAllPartitions(){
- return partitions.values().toArray(new Partition[0]);
+ System.out.println("Tenant ID from PartitionManager-getAllAvailablePartitions: "+ CarbonContext.getThreadLocalCarbonContext().getTenantId());
+ List<Partition> policyList = new ArrayList<Partition>();
+ int t = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
+
+ if(partitions.containsKey(t))
+ policyList.addAll(partitions.get(CarbonContext.getThreadLocalCarbonContext().getTenantId()).values());
+ if(partitions.containsKey(StratosConstants.PUBLIC_DEFINITION))
+ policyList.addAll(partitions.get(StratosConstants.PUBLIC_DEFINITION).values());
+
+ return policyList.toArray(new Partition[0]);
}
public boolean validatePartitionViaCloudController(Partition partition) throws PartitionValidationException {
@@ -144,7 +231,6 @@ private static final Log log = LogFactory.getLog(PartitionManager.class);
addNetworkPartitionLbHolder(networkPartitionLbHolder);
RegistryManager.getInstance().persistNetworkPartitionIbHolder(networkPartitionLbHolder);
}
-
}
}
@@ -162,7 +248,6 @@ private static final Log log = LogFactory.getLog(PartitionManager.class);
log.error(errMsg);
throw new AutoScalerException(errMsg);
}
-
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/27568093/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java
index 3c3521a..48b1dd4 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java
@@ -19,9 +19,13 @@
package org.apache.stratos.autoscaler.policy;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map;
+import org.apache.stratos.common.constants.StratosConstants;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -33,6 +37,7 @@ import org.apache.stratos.autoscaler.partition.PartitionManager;
import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy;
import org.apache.stratos.autoscaler.registry.RegistryManager;
import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition;
+import org.wso2.carbon.context.CarbonContext;
/**
* Manager class for the purpose of managing Autoscale/Deployment policy definitions.
@@ -41,9 +46,10 @@ public class PolicyManager {
private static final Log log = LogFactory.getLog(PolicyManager.class);
- private static Map<String, AutoscalePolicy> autoscalePolicyListMap = new HashMap<String, AutoscalePolicy>();
+ private static Map<Integer, Map<String, AutoscalePolicy>> autoscalePolicyListMap = new HashMap<Integer, Map<String, AutoscalePolicy>>();
- private static Map<String, DeploymentPolicy> deploymentPolicyListMap = new HashMap<String, DeploymentPolicy>();
+ private static Map<Integer, Map<String, DeploymentPolicy>> deploymentPolicyListMap = new HashMap<Integer, Map<String, DeploymentPolicy>>();
+
/* An instance of a PolicyManager is created when the class is loaded.
* Since the class is loaded only once, it is guaranteed that an object of
@@ -60,8 +66,59 @@ public class PolicyManager {
private PolicyManager() {
}
+
+ /**
+ * Checks and returns whether policies for tenant exist in information model
+ *
+ *@param tenantId
+ *@return
+ */
+ public boolean isTenantPolicyDetailsInInformationModel(int tenantId){
+ return (autoscalePolicyListMap.containsKey(tenantId) && deploymentPolicyListMap.containsKey(tenantId));
+ }
+
+ /**
+ * Loads Autoscaling policies to information model
+ *
+ */
+ public void loadASPoliciesToInformationModel() {
+ List<AutoscalePolicy> asPolicies = RegistryManager.getInstance().retrieveASPolicies();
+ Iterator<AutoscalePolicy> asPolicyIterator = asPolicies.iterator();
+ while (asPolicyIterator.hasNext()) {
+ AutoscalePolicy asPolicy = asPolicyIterator.next();
+ try{
+ addASPolicyToInformationModel(asPolicy);
+ }
+ catch (InvalidPolicyException e){
+ // ignore and move onto next
+ }
+ }
+ }
+
+ /**
+ * Loads Deployment policies to information model
+ *
+ */
+ public void loadDeploymentPoliciesToInformationModel() {
+ List<DeploymentPolicy> depPolicies = RegistryManager.getInstance().retrieveDeploymentPolicies();
+ Iterator<DeploymentPolicy> depPolicyIterator = depPolicies.iterator();
+ while (depPolicyIterator.hasNext()) {
+ DeploymentPolicy depPolicy = depPolicyIterator.next();
+ try{
+ addDeploymentPolicyToInformationModel(depPolicy);
+ }
+ catch (InvalidPolicyException e){
+ // ignore and move onto next
+ }
+ }
+ }
- // Add the policy to information model and persist.
+ /**
+ * Deploys the specified Autoscaling policy - Adds to information model and persists
+ *
+ * @param policy
+ * @throws InvalidPolicyException
+ */
public boolean deployAutoscalePolicy(AutoscalePolicy policy) throws InvalidPolicyException {
if(StringUtils.isEmpty(policy.getId())){
throw new AutoScalerException("AutoScaling policy id can not be empty");
@@ -73,8 +130,146 @@ public class PolicyManager {
}
return true;
}
+
+ /**
+ * Adds the specified Autoscaling policy to Information model
+ *
+ * @param policy
+ * @throws InvalidPolicyException
+ */
+ public void addASPolicyToInformationModel(AutoscalePolicy asPolicy) throws InvalidPolicyException {
+
+ int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
+ asPolicy.setTenantId(tenantId);
+
+ if(asPolicy.getIsPublic()){
+ addASPolicyToSpecificContainer(asPolicy, StratosConstants.PUBLIC_DEFINITION);
+ }
+ else{
+ addASPolicyToSpecificContainer(asPolicy, tenantId);
+ }
+ }
+
+ private void addASPolicyToSpecificContainer(AutoscalePolicy asPolicy, int containerId) throws InvalidPolicyException {
+
+ Map<String, AutoscalePolicy> policies;
+ if(!autoscalePolicyListMap.containsKey(containerId))
+ {
+ policies = new HashMap<String, AutoscalePolicy>();
+ autoscalePolicyListMap.put(containerId, policies);
+ }
+ else {
+ policies = autoscalePolicyListMap.get(containerId);
+ }
+
+ if (!policies.containsKey(asPolicy.getId())) {
+ if (log.isDebugEnabled()) {
+ log.debug("Adding policy :" + asPolicy.getId());
+ }
+ policies.put(asPolicy.getId(), asPolicy);
+ } else {
+ String errMsg = "Specified policy [" + asPolicy.getId() + "] already exists";
+ log.error(errMsg);
+ throw new InvalidPolicyException(errMsg);
+ }
+ }
+
+ /**
+ * Removes the specified Autoscaling policy
+ *
+ * @param policy
+ * @throws InvalidPolicyException
+ */
+ public void undeployAutoscalePolicy(String policy) throws InvalidPolicyException {
+ int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
+ AutoscalePolicy policyToDelete;
+
+ // check in public definitions and remove if ownership is correct
+ if(autoscalePolicyListMap.containsKey(StratosConstants.PUBLIC_DEFINITION)){
+ if ((autoscalePolicyListMap.get(StratosConstants.PUBLIC_DEFINITION)).containsKey(policy)){
+ policyToDelete = (autoscalePolicyListMap.get(StratosConstants.PUBLIC_DEFINITION)).get(policy);
+ if(policyToDelete.getTenantId() == tenantId){
+ if (log.isDebugEnabled()) {
+ log.debug("Removing policy :" + policy);
+ }
+ RegistryManager.getInstance().removeAutoscalerPolicy(policyToDelete);
+ (autoscalePolicyListMap.get(StratosConstants.PUBLIC_DEFINITION)).remove(policy);
+ return;
+ }
+ }
+ }
+
+ // check in tenant collection and remove
+ if(autoscalePolicyListMap.containsKey(tenantId)){
+ if ((autoscalePolicyListMap.get(tenantId)).containsKey(policy)){
+ policyToDelete = (autoscalePolicyListMap.get(tenantId)).get(policy);
+ if (log.isDebugEnabled()) {
+ log.debug("Removing policy :" + policy);
+ }
+ RegistryManager.getInstance().removeAutoscalerPolicy(policyToDelete);
+ (autoscalePolicyListMap.get(tenantId)).remove(policy);
+ }
+ else {
+ throw new InvalidPolicyException("No such policy [" + policy + "] exists");
+ }
+ }
+ else {
+ throw new InvalidPolicyException("No such policy [" + policy + "] exists");
+ }
+ }
+
+ /**
+ * Returns an array of the Autoscaling policies contained in this manager.
+ *
+ * @return
+ */
+ public AutoscalePolicy[] getAutoscalePolicyList() {
+ List<AutoscalePolicy> policyList = new ArrayList<AutoscalePolicy>();
+ int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
+
+ if(autoscalePolicyListMap.containsKey(tenantId))
+ policyList.addAll(autoscalePolicyListMap.get(tenantId).values());
+
+ if(autoscalePolicyListMap.containsKey(StratosConstants.PUBLIC_DEFINITION))
+ policyList.addAll(autoscalePolicyListMap.get(StratosConstants.PUBLIC_DEFINITION).values());
+
+ return policyList.toArray(new AutoscalePolicy[0]);
+ }
- // Add the deployment policy to information model and persist.
+ /**
+ * Returns the Autoscaling policy to which the specified id is mapped or null
+ *
+ * @param id
+ * @return
+ */
+ public AutoscalePolicy getAutoscalePolicy(String id) {
+ int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
+ if(autoscalePolicyListMap.containsKey(tenantId)){
+ return (autoscalePolicyListMap.get(tenantId)).get(id);
+ }
+ else if(autoscalePolicyListMap.containsKey(StratosConstants.PUBLIC_DEFINITION)){
+ return (autoscalePolicyListMap.get(StratosConstants.PUBLIC_DEFINITION)).get(id);
+ }
+
+ return null;
+ }
+
+ /**
+ * Deletes the Autoscaling policies for specified tenantId or null
+ *
+ * @param tenantId
+ * @return
+ */
+ public void removeASPoliciesFromInformationModel(int tenantId){
+ autoscalePolicyListMap.remove(tenantId);
+ }
+
+ /**
+ * Deploys the specified Deployment policy - Adds to information model and persists
+ *
+ * @param policy
+ * @throws InvalidPolicyException
+ */
public boolean deployDeploymentPolicy(DeploymentPolicy policy) throws InvalidPolicyException {
if(StringUtils.isEmpty(policy.getId())){
throw new AutoScalerException("Deploying policy id can not be empty");
@@ -97,6 +292,49 @@ public class PolicyManager {
}
return true;
}
+
+ /**
+ * Adds the specified Deployment policy to Information model
+ *
+ * @param policy
+ * @throws InvalidPolicyException
+ */
+ public void addDeploymentPolicyToInformationModel(DeploymentPolicy policy) throws InvalidPolicyException {
+ int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
+ policy.setTenantId(tenantId);
+
+ if(policy.getIsPublic()){
+ addDeploymentPolicyToSpecificContainer(policy, StratosConstants.PUBLIC_DEFINITION);
+ }
+ else{
+ addDeploymentPolicyToSpecificContainer(policy, tenantId);
+ }
+ }
+
+ private void addDeploymentPolicyToSpecificContainer(DeploymentPolicy deploymentPolicy, int containerId) throws InvalidPolicyException {
+
+ Map<String, DeploymentPolicy> policies;
+ if(!deploymentPolicyListMap.containsKey(containerId))
+ {
+ policies = new HashMap<String, DeploymentPolicy>();
+ deploymentPolicyListMap.put(containerId, policies);
+ }
+ else {
+ policies = deploymentPolicyListMap.get(containerId);
+ }
+
+ if (!policies.containsKey(deploymentPolicy.getId())) {
+ if (log.isDebugEnabled()) {
+ log.debug("Adding policy :" + deploymentPolicy.getId());
+ }
+ policies.put(deploymentPolicy.getId(), deploymentPolicy);
+ } else {
+ String errMsg = "Specified policy [" + deploymentPolicy.getId() + "] already exists";
+ log.error(errMsg);
+ throw new InvalidPolicyException(errMsg);
+ }
+ }
+
private void fillPartitions(DeploymentPolicy deploymentPolicy) throws InvalidPartitionException {
PartitionManager partitionMgr = PartitionManager.getInstance();
@@ -127,111 +365,98 @@ public class PolicyManager {
destPartition.setProperties(srcPartition.getProperties());
}
- public void addASPolicyToInformationModel(AutoscalePolicy asPolicy) throws InvalidPolicyException {
- if (!autoscalePolicyListMap.containsKey(asPolicy.getId())) {
- if (log.isDebugEnabled()) {
- log.debug("Adding policy :" + asPolicy.getId());
- }
- autoscalePolicyListMap.put(asPolicy.getId(), asPolicy);
- } else {
- String errMsg = "Specified policy [" + asPolicy.getId() + "] already exists";
- log.error(errMsg);
- throw new InvalidPolicyException(errMsg);
- }
- }
-
/**
- * Removes the specified policy
+ * Removes the specified Deployment policy
*
* @param policy
* @throws InvalidPolicyException
*/
- public void undeployAutoscalePolicy(String policy) throws InvalidPolicyException {
- if (autoscalePolicyListMap.containsKey(policy)) {
- if (log.isDebugEnabled()) {
- log.debug("Removing policy :" + policy);
- }
- autoscalePolicyListMap.remove(policy);
- RegistryManager.getInstance().removeAutoscalerPolicy(this.getAutoscalePolicy(policy));
- } else {
+ public void undeployDeploymentPolicy(String policy) throws InvalidPolicyException {
+ int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
+ DeploymentPolicy policyToDelete;
+
+ // check in public definitions and remove if ownership is correct
+ if(deploymentPolicyListMap.containsKey(StratosConstants.PUBLIC_DEFINITION)){
+ if ((deploymentPolicyListMap.get(StratosConstants.PUBLIC_DEFINITION)).containsKey(policy)){
+ policyToDelete = (deploymentPolicyListMap.get(StratosConstants.PUBLIC_DEFINITION)).get(policy);
+ if(policyToDelete.getTenantId() == tenantId){
+ if (log.isDebugEnabled()) {
+ log.debug("Removing policy :" + policy);
+ }
+ // undeploy network partitions this deployment policy.
+ PartitionManager.getInstance().undeployNetworkPartitions(policyToDelete);
+ RegistryManager.getInstance().removeDeploymentPolicy(policyToDelete);
+ (deploymentPolicyListMap.get(StratosConstants.PUBLIC_DEFINITION)).remove(policy);
+ return;
+ }
+ }
+ }
+
+ // check in tenant collection and remove
+ if(deploymentPolicyListMap.containsKey(tenantId)){
+ if ((deploymentPolicyListMap.get(tenantId)).containsKey(policy)){
+ policyToDelete = (deploymentPolicyListMap.get(tenantId)).get(policy);
+ if (log.isDebugEnabled()) {
+ log.debug("Removing policy :" + policy);
+ }
+ // undeploy network partitions this deployment policy.
+ PartitionManager.getInstance().undeployNetworkPartitions(policyToDelete);
+ RegistryManager.getInstance().removeDeploymentPolicy(policyToDelete);
+ (deploymentPolicyListMap.get(tenantId)).remove(policy);
+ }
+ else {
+ throw new InvalidPolicyException("No such policy [" + policy + "] exists");
+ }
+ }
+ else {
throw new InvalidPolicyException("No such policy [" + policy + "] exists");
}
}
/**
- * Returns an array of the Autoscale policies contained in this manager.
+ * Returns an array of the Deployment policies contained in this manager.
*
* @return
*/
- public AutoscalePolicy[] getAutoscalePolicyList() {
- return autoscalePolicyListMap.values().toArray(new AutoscalePolicy[0]);
+ public DeploymentPolicy[] getDeploymentPolicyList() {
+ List<DeploymentPolicy> policyList = new ArrayList<DeploymentPolicy>();
+ int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
+
+ if(deploymentPolicyListMap.containsKey(tenantId))
+ policyList.addAll(deploymentPolicyListMap.get(CarbonContext.getThreadLocalCarbonContext().getTenantId()).values());
+
+ if(deploymentPolicyListMap.containsKey(StratosConstants.PUBLIC_DEFINITION))
+ policyList.addAll(deploymentPolicyListMap.get(StratosConstants.PUBLIC_DEFINITION).values());
+
+ return policyList.toArray(new DeploymentPolicy[0]);
}
/**
- * Returns the autoscale policy to which the specified id is mapped or null
+ * Returns the deployment policy to which the specified id is mapped or null
*
* @param id
* @return
*/
- public AutoscalePolicy getAutoscalePolicy(String id) {
- return autoscalePolicyListMap.get(id);
- }
-
- // Add the deployment policy to As in memmory information model. Does not persist.
- public void addDeploymentPolicyToInformationModel(DeploymentPolicy policy) throws InvalidPolicyException {
- if (!deploymentPolicyListMap.containsKey(policy.getId())) {
- if (log.isDebugEnabled()) {
- log.debug("Adding policy :" + policy.getId());
- }
- PartitionManager.getInstance().deployNewNetworkPartitions(policy);
- deploymentPolicyListMap.put(policy.getId(), policy);
- } else {
- String errMsg = "Specified policy [" + policy.getId()+ "] already exists";
- log.error(errMsg);
- throw new InvalidPolicyException(errMsg);
+ public DeploymentPolicy getDeploymentPolicy(String id) {
+ int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
+ if(deploymentPolicyListMap.containsKey(tenantId)){
+ return (deploymentPolicyListMap.get(tenantId)).get(id);
}
- }
-
- /**
- * Removes the specified policy
- *
- * @param policy
- * @throws InvalidPolicyException
- */
- public void undeployDeploymentPolicy(String policy) throws InvalidPolicyException {
- if (deploymentPolicyListMap.containsKey(policy)) {
- if (log.isDebugEnabled()) {
- log.debug("Removing deployment policy :" + policy);
- }
- DeploymentPolicy depPolicy = this.getDeploymentPolicy(policy);
- // undeploy network partitions this deployment policy.
- PartitionManager.getInstance().undeployNetworkPartitions(depPolicy);
- // undeploy the deployment policy.
- RegistryManager.getInstance().removeDeploymentPolicy(depPolicy);
- // remove from the infromation model.
- deploymentPolicyListMap.remove(policy);
- } else {
- throw new InvalidPolicyException("No such policy [" + policy + "] exists");
+ else if(deploymentPolicyListMap.containsKey(StratosConstants.PUBLIC_DEFINITION)){
+ return (deploymentPolicyListMap.get(StratosConstants.PUBLIC_DEFINITION)).get(id);
}
+
+ return null;
}
-
- /**
- * Returns an array of the Deployment policies contained in this manager.
- *
- * @return
- */
- public DeploymentPolicy[] getDeploymentPolicyList() {
- return deploymentPolicyListMap.values().toArray(new DeploymentPolicy[0]);
- }
-
+
/**
- * Returns the deployment policy to which the specified id is mapped or null
+ * Deletes the policies for specified tenantId or null
*
- * @param id
+ * @param tenantId
* @return
*/
- public DeploymentPolicy getDeploymentPolicy(String id) {
- return deploymentPolicyListMap.get(id);
+ public void removeDeploymentPoliciesFromInformationModel(int tenantId){
+ deploymentPolicyListMap.remove(tenantId);
}
}
[2/7] git commit: Adding in tenant isolation for definitions and
public definitions for mock
Posted by ni...@apache.org.
Adding in tenant isolation for definitions and public definitions for mock
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d0b0c634
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d0b0c634
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d0b0c634
Branch: refs/heads/origin
Commit: d0b0c6346f1761908e3abfebe80442ded61dfa08
Parents: dc025ed
Author: Shiro <sh...@wso2.com>
Authored: Thu Sep 11 14:10:59 2014 +0530
Committer: Shiro <sh...@wso2.com>
Committed: Thu Sep 11 14:10:59 2014 +0530
----------------------------------------------------------------------
.../apache/stratos/manager/dto/Cartridge.java | 9 +
.../bean/autoscaler/partition/Partition.java | 2 +
.../policy/autoscale/AutoscalePolicy.java | 11 +
.../policy/deployment/DeploymentPolicy.java | 2 +
.../definition/CartridgeDefinitionBean.java | 4 +-
.../definition/ServiceDefinitionBean.java | 7 +
.../stratos/rest/endpoint/mock/MockContext.java | 570 ++++++++++++++-----
.../stratos-test/WEB-INF/schemas/schema.xsd | 5 +
8 files changed, 469 insertions(+), 141 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d0b0c634/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/Cartridge.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/Cartridge.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/Cartridge.java
index 18090c6..8cf1f38 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/Cartridge.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/Cartridge.java
@@ -30,6 +30,7 @@ public class Cartridge implements Comparable<Cartridge> {
private String displayName;
private String description;
+ private boolean isPublic;
private String cartridgeAlias;
private String cartridgeType;
private int activeInstances;
@@ -81,6 +82,14 @@ public class Cartridge implements Comparable<Cartridge> {
public void setDescription(String description) {
this.description = description;
}
+
+ public boolean getIsPublic() {
+ return isPublic;
+ }
+
+ public void setIsPublic(boolean isPublic) {
+ this.isPublic = isPublic;
+ }
public String getCartridgeAlias() {
return cartridgeAlias;
http://git-wip-us.apache.org/repos/asf/stratos/blob/d0b0c634/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/Partition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/Partition.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/Partition.java
index 60a5478..744b261 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/Partition.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/Partition.java
@@ -30,6 +30,8 @@ public class Partition {
public String id;
public String description;
+
+ public boolean isPublic;
public int partitionMin;
http://git-wip-us.apache.org/repos/asf/stratos/blob/d0b0c634/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/AutoscalePolicy.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/AutoscalePolicy.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/AutoscalePolicy.java
index 0683682..5f7e371 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/AutoscalePolicy.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/autoscale/AutoscalePolicy.java
@@ -31,6 +31,8 @@ public class AutoscalePolicy {
private String description;
private LoadThresholds loadThresholds;
+
+ private boolean isPublic;
public String getId() {
return id;
@@ -56,6 +58,15 @@ public class AutoscalePolicy {
this.description = description;
}
+ public boolean getIsPublic() {
+ return isPublic;
+ }
+
+ public void setIsPublic(boolean isPublic) {
+ this.isPublic = isPublic;
+ }
+
+
public LoadThresholds getLoadThresholds() {
return loadThresholds;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/d0b0c634/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/deployment/DeploymentPolicy.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/deployment/DeploymentPolicy.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/deployment/DeploymentPolicy.java
index df5f0b9..d9bde05 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/deployment/DeploymentPolicy.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/policy/deployment/DeploymentPolicy.java
@@ -32,6 +32,8 @@ public class DeploymentPolicy {
public String id;
public String description;
+
+ public boolean isPublic;
//partition groups
public List<PartitionGroup> partitionGroup;
http://git-wip-us.apache.org/repos/asf/stratos/blob/d0b0c634/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/CartridgeDefinitionBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/CartridgeDefinitionBean.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/CartridgeDefinitionBean.java
index 87c6aac..64cf68a 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/CartridgeDefinitionBean.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/CartridgeDefinitionBean.java
@@ -39,6 +39,8 @@ public class CartridgeDefinitionBean {
public String version;
public boolean multiTenant;
+
+ public boolean isPublic;
public DeploymentBean deployment;
@@ -61,7 +63,7 @@ public class CartridgeDefinitionBean {
public String toString () {
return "Type: " + type + ", Provider: " + provider + ", Host: " + host + ", Display Name: " + displayName +
- ", Description: " + description + ", Version: " + version + ", Multitenant " + multiTenant + "\n" +
+ ", Description: " + description + ", Version: " + version + ", Multitenant " + multiTenant +", Public " + isPublic + "\n" +
getDeploymentDetails() + "\n PortMapping: " + getPortMappings() + "\n IaaS: " + getIaasProviders() +
"\n LoadBalancer: " + getLoadBalancerInfo() + "\n Properties: " + getProperties() +"\n VolumeBean mappings "+ persistence.toString();
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/d0b0c634/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/ServiceDefinitionBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/ServiceDefinitionBean.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/ServiceDefinitionBean.java
index 3766b3c..d31e75d 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/ServiceDefinitionBean.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/ServiceDefinitionBean.java
@@ -31,6 +31,7 @@ public class ServiceDefinitionBean {
private String clusterDomain;
private String clusterSubDomain;
private String tenantRange;
+ private boolean isPublic;
public String getServiceName() {
return serviceName;
@@ -74,5 +75,11 @@ public class ServiceDefinitionBean {
public void setTenantRange(String tenantRange) {
this.tenantRange = tenantRange;
}
+ public boolean getIsPublic() {
+ return isPublic;
+ }
+ public void setIsPublic(boolean isPublic) {
+ this.isPublic = isPublic;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/d0b0c634/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
index 84f8931..c6d355f 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
@@ -58,7 +58,7 @@ public class MockContext {
private Map<String,Cluster> clusterMap = new HashMap<String, Cluster>();
private int tenantIdCount=1;
-
+ public static final int PUBLIC_DEFINITION = 0;
private MockContext(){} // do not allow to initialize
@@ -69,13 +69,26 @@ public class MockContext {
public StratosAdminResponse addCartirdgeDefinition(CartridgeDefinitionBean cartridgeDefinitionBean){
int tenantId = getTenantId();
List<CartridgeDefinitionBean> tenantCartridges;
- if(this.cartridgeDefinitionBeanList.containsKey(tenantId)){
- tenantCartridges = this.cartridgeDefinitionBeanList.get(tenantId);
+
+ if(!cartridgeDefinitionBean.isPublic){
+ if(this.cartridgeDefinitionBeanList.containsKey(tenantId)){
+ tenantCartridges = this.cartridgeDefinitionBeanList.get(tenantId);
+ }
+ else{
+ tenantCartridges = new LinkedList<CartridgeDefinitionBean>();
+ this.cartridgeDefinitionBeanList.put(tenantId, tenantCartridges);
+ }
}
else{
- tenantCartridges = new LinkedList<CartridgeDefinitionBean>();
- this.cartridgeDefinitionBeanList.put(tenantId, tenantCartridges);
+ if(this.cartridgeDefinitionBeanList.containsKey(PUBLIC_DEFINITION)){
+ tenantCartridges = this.cartridgeDefinitionBeanList.get(PUBLIC_DEFINITION);
+ }
+ else{
+ tenantCartridges = new LinkedList<CartridgeDefinitionBean>();
+ this.cartridgeDefinitionBeanList.put(PUBLIC_DEFINITION, tenantCartridges);
+ }
}
+
tenantCartridges.add(cartridgeDefinitionBean);
Cartridge cartridge = new Cartridge();
@@ -85,26 +98,49 @@ public class MockContext {
cartridge.setMultiTenant(cartridgeDefinitionBean.multiTenant);
cartridge.setProvider(cartridgeDefinitionBean.provider);
cartridge.setVersion(cartridgeDefinitionBean.version);
+ cartridge.setIsPublic(cartridgeDefinitionBean.isPublic);
Map<String,Cartridge> cartridges;
if(cartridge.isMultiTenant()){
- if(this.availableMultiTenantCartridges.containsKey(tenantId)){
- cartridges = availableMultiTenantCartridges.get(tenantId);
- }
- else{
- cartridges = new HashMap<String,Cartridge>();
- this.availableMultiTenantCartridges.put(tenantId, cartridges);
+ if(!cartridge.getIsPublic()){
+ if(this.availableMultiTenantCartridges.containsKey(tenantId)){
+ cartridges = availableMultiTenantCartridges.get(tenantId);
+ }
+ else{
+ cartridges = new HashMap<String,Cartridge>();
+ this.availableMultiTenantCartridges.put(tenantId, cartridges);
+ }
+ }else{
+ if(this.availableMultiTenantCartridges.containsKey(PUBLIC_DEFINITION)){
+ cartridges = availableMultiTenantCartridges.get(PUBLIC_DEFINITION);
+ }
+ else{
+ cartridges = new HashMap<String,Cartridge>();
+ this.availableMultiTenantCartridges.put(PUBLIC_DEFINITION, cartridges);
+ }
}
+
cartridges.put(cartridge.getCartridgeType(), cartridge);
System.out.println(cartridges.size());
}else{
- if(this.availableSingleTenantCartridges.containsKey(tenantId)){
- cartridges = availableMultiTenantCartridges.get(tenantId);
- }
- else{
- cartridges = new HashMap<String,Cartridge>();
- this.availableSingleTenantCartridges.put(tenantId, cartridges);
+ if(!cartridge.getIsPublic()){
+ if(this.availableSingleTenantCartridges.containsKey(tenantId)){
+ cartridges = availableSingleTenantCartridges.get(tenantId);
+ }
+ else{
+ cartridges = new HashMap<String,Cartridge>();
+ this.availableSingleTenantCartridges.put(tenantId, cartridges);
+ }
+ }else{
+ if(this.availableSingleTenantCartridges.containsKey(PUBLIC_DEFINITION)){
+ cartridges = availableSingleTenantCartridges.get(PUBLIC_DEFINITION);
+ }
+ else{
+ cartridges = new HashMap<String,Cartridge>();
+ this.availableSingleTenantCartridges.put(PUBLIC_DEFINITION, cartridges);
+ }
}
+
cartridges.put(cartridge.getCartridgeType(), cartridge);
System.out.println(cartridges.size());
}
@@ -114,21 +150,39 @@ public class MockContext {
return stratosAdminResponse;
}
-
-
public Cartridge[] getAvailableMultiTenantCartridges() throws RestAPIException{
- if(!this.availableMultiTenantCartridges.containsKey(getTenantId())){
+ int tenantId = getTenantId();
+ if(!availableMultiTenantCartridges.containsKey(tenantId) && !availableMultiTenantCartridges.containsKey(PUBLIC_DEFINITION)){
return new HashMap<String, Cartridge>().values().toArray(new Cartridge[0]);
}
- return this.availableMultiTenantCartridges.get(getTenantId()).values().toArray(new Cartridge[0]);
+
+ List<Cartridge> p = new ArrayList<Cartridge>();
+
+ if(availableMultiTenantCartridges.get(tenantId) != null)
+ p.addAll(availableMultiTenantCartridges.get(tenantId).values());
+
+ if(availableMultiTenantCartridges.get(PUBLIC_DEFINITION) != null)
+ p.addAll(availableMultiTenantCartridges.get(PUBLIC_DEFINITION).values());
+
+ return p.toArray(new Cartridge[0]);
}
public Cartridge[] getAvailableSingleTenantCartridges() throws RestAPIException{
- if(!this.availableSingleTenantCartridges.containsKey(getTenantId())){
+ int tenantId = getTenantId();
+ if(!availableSingleTenantCartridges.containsKey(tenantId) && !availableSingleTenantCartridges.containsKey(PUBLIC_DEFINITION)){
return new HashMap<String, Cartridge>().values().toArray(new Cartridge[0]);
- }
- return this.availableSingleTenantCartridges.get(getTenantId()).values().toArray(new Cartridge[0]);
+ }
+
+ List<Cartridge> p = new ArrayList<Cartridge>();
+
+ if(availableSingleTenantCartridges.get(tenantId) != null)
+ p.addAll(availableSingleTenantCartridges.get(tenantId).values());
+
+ if(availableSingleTenantCartridges.get(PUBLIC_DEFINITION) != null)
+ p.addAll(availableSingleTenantCartridges.get(PUBLIC_DEFINITION).values());
+
+ return p.toArray(new Cartridge[0]);
}
public Cartridge[] getAvailableLbCartridges() throws RestAPIException{
@@ -186,10 +240,19 @@ public class MockContext {
public Cartridge[] getSubscribedCartridges() throws RestAPIException{
- if(!this.subscribedCartridges.containsKey(getTenantId())){
+ int tenantId = getTenantId();
+ if(!subscribedCartridges.containsKey(tenantId) && !subscribedCartridges.containsKey(PUBLIC_DEFINITION)){
return new HashMap<String, Cartridge>().values().toArray(new Cartridge[0]);
}
- return (subscribedCartridges.get(getTenantId())).values().toArray(new Cartridge[0]);
+ List<Cartridge> p = new ArrayList<Cartridge>();
+
+ if(subscribedCartridges.get(tenantId) != null)
+ p.addAll(subscribedCartridges.get(tenantId).values());
+
+ if(subscribedCartridges.get(PUBLIC_DEFINITION) != null)
+ p.addAll(subscribedCartridges.get(PUBLIC_DEFINITION).values());
+
+ return p.toArray(new Cartridge[0]);
}
public SubscriptionInfo subscribeToCartridge(CartridgeInfoBean cartridgeInfoBean) throws RestAPIException{
@@ -197,20 +260,25 @@ public class MockContext {
String cartridgeType = cartridgeInfoBean.getCartridgeType();
String alias = cartridgeInfoBean.getAlias();
Cartridge subscribedCartridge=null;
- // retrieve the cartridge from available ones for specific tenant
- if(availableMultiTenantCartridges.containsKey(tenantId)){
- if((availableMultiTenantCartridges.get(tenantId)).containsKey(cartridgeType)){
- subscribedCartridge = (availableMultiTenantCartridges.get(tenantId)).get(cartridgeType);
- }
+
+ // retrieve the cartridge from single tenant cartridges
+ try{
+ subscribedCartridge=getAvailableSingleTenantCartridgeInfo(cartridgeType);
}
- else if(availableSingleTenantCartridges.containsKey(tenantId)){
- if((availableSingleTenantCartridges.get(tenantId)).containsKey(cartridgeType)){
- subscribedCartridge = (availableSingleTenantCartridges.get(tenantId)).get(cartridgeType);
- }
- }else{
- throw new RestAPIException(Status.NO_CONTENT,"Cartridge not defined");
+ catch(RestAPIException e){
+ //ignore once
+ }
+
+ // retrieve the cartridge from multitenant cartridges if not found
+ if(subscribedCartridge==null){
+ try{
+ subscribedCartridge=getAvailableMultiTenantCartridgeInfo(cartridgeType);
+ }
+ catch(RestAPIException e){
+ throw new RestAPIException(Status.NO_CONTENT,"Cartridge not defined");
+ }
}
-
+
if(subscribedCartridge!=null){
//Proper way is copy constructor
Cartridge copy = new Cartridge();
@@ -246,9 +314,10 @@ public class MockContext {
}
public StratosAdminResponse unsubscribe(String alias) throws RestAPIException{
- if(subscribedCartridges.containsKey(getTenantId())){
- if((subscribedCartridges.get(getTenantId())).containsKey(alias)){
- (subscribedCartridges.get(getTenantId())).remove(alias);
+ int tenantId = getTenantId();
+ if(subscribedCartridges.containsKey(tenantId)){
+ if((subscribedCartridges.get(tenantId)).containsKey(alias)){
+ (subscribedCartridges.get(tenantId)).remove(alias);
}
}else{
throw new RestAPIException(Status.NO_CONTENT,"Unable to un-subscribe");
@@ -259,44 +328,96 @@ public class MockContext {
}
public Cartridge getCartridgeInfo(String alias) throws RestAPIException{
- if(!subscribedCartridges.containsKey(getTenantId()))
+ int tenantId = getTenantId();
+ if(!subscribedCartridges.containsKey(tenantId))
throw new RestAPIException(Status.NO_CONTENT, "No cartridges subscribed for current tenant.");
- if(!(subscribedCartridges.get(getTenantId())).containsKey(alias))
+ if(!(subscribedCartridges.get(tenantId)).containsKey(alias))
throw new RestAPIException(Status.NO_CONTENT,"Cartridge information is not available.");
- return (subscribedCartridges.get(getTenantId())).get(alias);
+ return (subscribedCartridges.get(tenantId)).get(alias);
}
public Cartridge getAvailableSingleTenantCartridgeInfo(String cartridgeType) throws RestAPIException{
- if(!availableSingleTenantCartridges.containsKey(getTenantId()))
- throw new RestAPIException(Status.NO_CONTENT,"No cartridges defined for current tenant");
-
- if(!(availableSingleTenantCartridges.get(getTenantId())).containsKey(cartridgeType))
+ int tenantId = getTenantId();
+ if(!availableSingleTenantCartridges.containsKey(tenantId)){
+ if(!availableSingleTenantCartridges.containsKey(PUBLIC_DEFINITION)){
+ throw new RestAPIException(Status.NO_CONTENT,"No cartridges defined for current tenant");
+ }
+ if(!(availableSingleTenantCartridges.get(PUBLIC_DEFINITION)).containsKey(cartridgeType))
+ throw new RestAPIException(Status.NO_CONTENT,"Cartridge is not available.");
+
+ return (availableSingleTenantCartridges.get(PUBLIC_DEFINITION)).get(cartridgeType);
+ }
+ if(!(availableSingleTenantCartridges.get(tenantId)).containsKey(cartridgeType))
throw new RestAPIException(Status.NO_CONTENT,"Cartridge is not available.");
- return (availableSingleTenantCartridges.get(getTenantId())).get(cartridgeType);
+ return (availableSingleTenantCartridges.get(tenantId)).get(cartridgeType);
}
- public StratosAdminResponse deleteCartridgeDefinition(String cartridgeType) throws RestAPIException{
- if((!availableSingleTenantCartridges.containsKey(getTenantId())) && (!availableMultiTenantCartridges.containsKey(getTenantId())))
- throw new RestAPIException(Status.NO_CONTENT,"No cartridges defined for tenant");
+ public Cartridge getAvailableMultiTenantCartridgeInfo(String cartridgeType) throws RestAPIException{
+ int tenantId = getTenantId();
+ if(!availableMultiTenantCartridges.containsKey(tenantId)){
+ if(!availableMultiTenantCartridges.containsKey(PUBLIC_DEFINITION)){
+ throw new RestAPIException(Status.NO_CONTENT,"No cartridges defined for current tenant");
+ }
+ if(!(availableMultiTenantCartridges.get(PUBLIC_DEFINITION)).containsKey(cartridgeType))
+ throw new RestAPIException(Status.NO_CONTENT,"Cartridge is not available.");
+
+ return (availableMultiTenantCartridges.get(PUBLIC_DEFINITION)).get(cartridgeType);
+ }
+ if(!(availableMultiTenantCartridges.get(tenantId)).containsKey(cartridgeType))
+ throw new RestAPIException(Status.NO_CONTENT,"Cartridge is not available.");
- if(availableSingleTenantCartridges.containsKey(getTenantId())){
- if((availableSingleTenantCartridges.get(getTenantId())).containsKey(cartridgeType)){
- (availableSingleTenantCartridges.get(getTenantId())).remove(cartridgeType);
- }
- } else if(availableMultiTenantCartridges.containsKey(getTenantId())){
- if((availableMultiTenantCartridges.get(getTenantId())).containsKey(cartridgeType)){
- (availableMultiTenantCartridges.get(getTenantId())).remove(cartridgeType);
- }
- } else{
- throw new RestAPIException(Status.BAD_REQUEST,"invalid cartridge type");
- }
+ return (availableMultiTenantCartridges.get(tenantId)).get(cartridgeType);
+ }
+
+ public StratosAdminResponse deleteCartridgeDefinition(String cartridgeType) throws RestAPIException{
+ if(!deleteFromAvailableSingleTenantCartridgeDefinitions(cartridgeType) && !deleteFromAvailableMultiTenantCartridgeDefinitions(cartridgeType)){
+ throw new RestAPIException(Status.NO_CONTENT,"No cartridges defined for tenant");
+ }
StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
stratosAdminResponse.setMessage("Successfully delete cartridge definition");
return stratosAdminResponse;
}
+
+ private boolean deleteFromAvailableSingleTenantCartridgeDefinitions(String cartridgeType){
+ int tenantId = getTenantId();
+ if(!availableSingleTenantCartridges.containsKey(tenantId)){
+ if(!availableSingleTenantCartridges.containsKey(PUBLIC_DEFINITION)){
+ return false;
+ }
+ if(!(availableSingleTenantCartridges.get(PUBLIC_DEFINITION)).containsKey(cartridgeType))
+ return false;
+
+ (availableSingleTenantCartridges.get(PUBLIC_DEFINITION)).remove(cartridgeType);
+ return true;
+ }
+ if(!(availableSingleTenantCartridges.get(tenantId)).containsKey(cartridgeType))
+ return false;
+
+ (availableSingleTenantCartridges.get(tenantId)).remove(cartridgeType);
+ return true;
+ }
+
+ private boolean deleteFromAvailableMultiTenantCartridgeDefinitions(String cartridgeType){
+ int tenantId = getTenantId();
+ if(!availableMultiTenantCartridges.containsKey(tenantId)){
+ if(!availableMultiTenantCartridges.containsKey(PUBLIC_DEFINITION)){
+ return false;
+ }
+ if(!(availableMultiTenantCartridges.get(PUBLIC_DEFINITION)).containsKey(cartridgeType))
+ return false;
+
+ (availableMultiTenantCartridges.get(PUBLIC_DEFINITION)).remove(cartridgeType);
+ return true;
+ }
+ if(!(availableMultiTenantCartridges.get(tenantId)).containsKey(cartridgeType))
+ return false;
+
+ (availableMultiTenantCartridges.get(tenantId)).remove(cartridgeType);
+ return true;
+ }
public StratosAdminResponse addTenant(TenantInfoBean tenantInfoBean) throws RestAPIException{
try{
@@ -367,14 +488,28 @@ public class MockContext {
}
public StratosAdminResponse addPartition(Partition partition) {
+ int tenantId = getTenantId();
Map<String,Partition> partitions;
- if (partitionMap.containsKey(getTenantId())){
- partitions = partitionMap.get(getTenantId());
- }
- else{
- partitions = new HashMap<String, Partition>();
- partitionMap.put(getTenantId(), partitions);
+
+ if(!partition.isPublic){
+ if (partitionMap.containsKey(tenantId)){
+ partitions = partitionMap.get(tenantId);
+ }
+ else{
+ partitions = new HashMap<String, Partition>();
+ partitionMap.put(tenantId, partitions);
+ }
}
+ else {
+ if (partitionMap.containsKey(PUBLIC_DEFINITION)){
+ partitions = partitionMap.get(PUBLIC_DEFINITION);
+ }
+ else{
+ partitions = new HashMap<String, Partition>();
+ partitionMap.put(PUBLIC_DEFINITION, partitions);
+ }
+ }
+
partitions.put(partition.id, partition);
StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
stratosAdminResponse.setMessage("Successfully deployed partition");
@@ -382,14 +517,28 @@ public class MockContext {
}
public StratosAdminResponse addAutoScalingPolicyDefinition(AutoscalePolicy autoscalePolicy) {
+ int tenantId = getTenantId();
Map<String,AutoscalePolicy> policies;
- if (autoscalePolicyMap.containsKey(getTenantId())){
- policies = autoscalePolicyMap.get(getTenantId());
+
+ if(!autoscalePolicy.getIsPublic()){
+ if (autoscalePolicyMap.containsKey(tenantId)){
+ policies = autoscalePolicyMap.get(tenantId);
+ }
+ else{
+ policies = new HashMap<String, AutoscalePolicy>();
+ autoscalePolicyMap.put(tenantId, policies);
+ }
}
else{
- policies = new HashMap<String, AutoscalePolicy>();
- autoscalePolicyMap.put(getTenantId(), policies);
+ if (autoscalePolicyMap.containsKey(PUBLIC_DEFINITION)){
+ policies = autoscalePolicyMap.get(PUBLIC_DEFINITION);
+ }
+ else{
+ policies = new HashMap<String, AutoscalePolicy>();
+ autoscalePolicyMap.put(PUBLIC_DEFINITION, policies);
+ }
}
+
policies.put(autoscalePolicy.getId(), autoscalePolicy);
StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
stratosAdminResponse.setMessage("Successfully deployed auto scaling policy definition");
@@ -397,14 +546,28 @@ public class MockContext {
}
public StratosAdminResponse addDeploymentPolicyDefinition(DeploymentPolicy deploymentPolicy) {
+ int tenantId = getTenantId();
Map<String,DeploymentPolicy> policies;
- if (deploymentPolicyMap.containsKey(getTenantId())){
- policies = deploymentPolicyMap.get(getTenantId());
+
+ if(!deploymentPolicy.isPublic){
+ if (deploymentPolicyMap.containsKey(tenantId)){
+ policies = deploymentPolicyMap.get(tenantId);
+ }
+ else{
+ policies = new HashMap<String, DeploymentPolicy>();
+ deploymentPolicyMap.put(tenantId, policies);
+ }
}
else{
- policies = new HashMap<String, DeploymentPolicy>();
- deploymentPolicyMap.put(getTenantId(), policies);
+ if (deploymentPolicyMap.containsKey(PUBLIC_DEFINITION)){
+ policies = deploymentPolicyMap.get(PUBLIC_DEFINITION);
+ }
+ else{
+ policies = new HashMap<String, DeploymentPolicy>();
+ deploymentPolicyMap.put(PUBLIC_DEFINITION, policies);
+ }
}
+
policies.put(deploymentPolicy.id,deploymentPolicy);
StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
stratosAdminResponse.setMessage("Successfully deployed deployment policy definition");
@@ -412,87 +575,176 @@ public class MockContext {
}
public Partition[] getPartitions() throws RestAPIException{
- if(!partitionMap.containsKey(getTenantId())){
+ int tenantId = getTenantId();
+ if(!partitionMap.containsKey(tenantId) && !partitionMap.containsKey(PUBLIC_DEFINITION)){
return new HashMap<String,Partition>().values().toArray(new Partition[0]);
}
- return (partitionMap.get(getTenantId())).values().toArray(new Partition[0]);
+
+ List<Partition> p = new ArrayList<Partition>();
+
+ if(partitionMap.get(tenantId) != null)
+ p.addAll(partitionMap.get(tenantId).values());
+
+ if(partitionMap.get(PUBLIC_DEFINITION) != null)
+ p.addAll(partitionMap.get(PUBLIC_DEFINITION).values());
+
+ return p.toArray(new Partition[0]);
}
public Partition getPartition(String partitionId) throws RestAPIException{
- if(!partitionMap.containsKey(getTenantId()))
- throw new RestAPIException(Status.NO_CONTENT,"No partitions have been defined for the tenant");
-
- if(!(partitionMap.get(getTenantId())).containsKey(partitionId)){
- throw new RestAPIException("There is no partition with the id: " + partitionId);
+ int tenantId = getTenantId();
+ if(!partitionMap.containsKey(tenantId)){
+ if(!partitionMap.containsKey(PUBLIC_DEFINITION)){
+ throw new RestAPIException(Status.NO_CONTENT,"No partitions have been defined for the tenant");
+ }
+ if(!(partitionMap.get(PUBLIC_DEFINITION)).containsKey(partitionId)){
+ throw new RestAPIException("There is no partition with the id: " + partitionId);
+ }
+ return (partitionMap.get(PUBLIC_DEFINITION)).get(partitionId);
+ }
+ else{
+ if(!(partitionMap.get(tenantId)).containsKey(partitionId)){
+ throw new RestAPIException("There is no partition with the id: " + partitionId);
+ }
+ return (partitionMap.get(tenantId)).get(partitionId);
}
- return (partitionMap.get(getTenantId())).get(partitionId);
}
-
public Partition[] getPartitionsOfPolicy(String deploymentPolicyId) throws RestAPIException{
- if(!deploymentPolicyMap.containsKey(getTenantId()))
- throw new RestAPIException(Status.NO_CONTENT,"No deployment policies have been defined for tenant");
-
- if(!(deploymentPolicyMap.get(getTenantId())).containsKey(deploymentPolicyId)){
- throw new RestAPIException(Status.NO_CONTENT,"There is no deployment policy with id: " + deploymentPolicyId);
+ int tenantId = getTenantId();
+ if(!deploymentPolicyMap.containsKey(tenantId)){
+ if(!deploymentPolicyMap.containsKey(PUBLIC_DEFINITION)){
+ throw new RestAPIException(Status.NO_CONTENT,"No deployment policies have been defined for tenant");
+ }
+ else{
+ if(!(deploymentPolicyMap.get(PUBLIC_DEFINITION)).containsKey(deploymentPolicyId)){
+ throw new RestAPIException(Status.NO_CONTENT,"There is no deployment policy with id: " + deploymentPolicyId);
+ }
+ return (deploymentPolicyMap.get(PUBLIC_DEFINITION)).get(deploymentPolicyId).partition.toArray(new Partition[0]);
+ }
+ }
+
+ if(!(deploymentPolicyMap.get(tenantId)).containsKey(deploymentPolicyId)){
+ throw new RestAPIException(Status.NO_CONTENT,"There is no deployment policy with id: " + deploymentPolicyId);
}
- return (deploymentPolicyMap.get(getTenantId())).get(deploymentPolicyId).partition.toArray(new Partition[0]);
+ return (deploymentPolicyMap.get(tenantId)).get(deploymentPolicyId).partition.toArray(new Partition[0]);
}
public PartitionGroup[] getPartitionGroups(String deploymentPolicyId) throws RestAPIException{
- if(!deploymentPolicyMap.containsKey(getTenantId()))
- throw new RestAPIException(Status.NO_CONTENT,"No deployment policies have been defined for tenant");
-
- if(!(deploymentPolicyMap.get(getTenantId())).containsKey(deploymentPolicyId)){
- throw new RestAPIException(Status.NO_CONTENT,"There is no policy with id: " + deploymentPolicyId);
+ int tenantId = getTenantId();
+ if(!deploymentPolicyMap.containsKey(tenantId)){
+ if(!deploymentPolicyMap.containsKey(PUBLIC_DEFINITION)){
+ throw new RestAPIException(Status.NO_CONTENT,"No deployment policies have been defined for tenant");
+ }
+ else{
+ if(!(deploymentPolicyMap.get(PUBLIC_DEFINITION)).containsKey(deploymentPolicyId)){
+ throw new RestAPIException(Status.NO_CONTENT,"There is no deployment policy with id: " + deploymentPolicyId);
+ }
+ return (deploymentPolicyMap.get(PUBLIC_DEFINITION)).get(deploymentPolicyId).partitionGroup.toArray(new PartitionGroup[0]);
+ }
+ }
+
+ if(!(deploymentPolicyMap.get(tenantId)).containsKey(deploymentPolicyId)){
+ throw new RestAPIException(Status.NO_CONTENT,"There is no deployment policy with id: " + deploymentPolicyId);
}
- return (deploymentPolicyMap.get(getTenantId())).get(deploymentPolicyId).partitionGroup.toArray(new PartitionGroup[0]);
+ return (deploymentPolicyMap.get(tenantId)).get(deploymentPolicyId).partitionGroup.toArray(new PartitionGroup[0]);
}
public AutoscalePolicy[] getAutoscalePolicies() throws RestAPIException{
- if(!autoscalePolicyMap.containsKey(getTenantId())){
- return new HashMap<String,AutoscalePolicy>().values().toArray(new AutoscalePolicy[0]);
+ int tenantId = getTenantId();
+ if(!autoscalePolicyMap.containsKey(tenantId) && !autoscalePolicyMap.containsKey(PUBLIC_DEFINITION)){
+ return new HashMap<String,AutoscalePolicy>().values().toArray(new AutoscalePolicy[0]);
}
- return (autoscalePolicyMap.get(getTenantId())).values().toArray(new AutoscalePolicy[0]);
+
+ List<AutoscalePolicy> p = new ArrayList<AutoscalePolicy>();
+
+ if(autoscalePolicyMap.get(tenantId) != null)
+ p.addAll(autoscalePolicyMap.get(tenantId).values());
+
+ if(autoscalePolicyMap.get(PUBLIC_DEFINITION) != null)
+ p.addAll(autoscalePolicyMap.get(PUBLIC_DEFINITION).values());
+
+ return p.toArray(new AutoscalePolicy[0]);
}
public AutoscalePolicy getAutoscalePolicies(String autoscalePolicyId) throws RestAPIException{
- if(!autoscalePolicyMap.containsKey(getTenantId()))
- throw new RestAPIException(Status.NO_CONTENT,"No autoscaling policies have been defined for tenant");
-
- if(!(autoscalePolicyMap.get(getTenantId())).containsKey(autoscalePolicyId)){
- throw new RestAPIException("There is no auto scale policy with id: " + autoscalePolicyId);
- }
- return (autoscalePolicyMap.get(getTenantId())).get(autoscalePolicyId);
+ int tenantId = getTenantId();
+ if(!autoscalePolicyMap.containsKey(tenantId)){
+ if(!autoscalePolicyMap.containsKey(PUBLIC_DEFINITION)){
+ throw new RestAPIException(Status.NO_CONTENT,"No autoscaling policies have been defined for tenant");
+ }
+ if(!(autoscalePolicyMap.get(PUBLIC_DEFINITION)).containsKey(autoscalePolicyId)){
+ throw new RestAPIException("There is no auto scale policy with id: " + autoscalePolicyId);
+ }
+ return (autoscalePolicyMap.get(PUBLIC_DEFINITION)).get(autoscalePolicyId);
+ }
+ else{
+ if(!(autoscalePolicyMap.get(tenantId)).containsKey(autoscalePolicyId)){
+ throw new RestAPIException("There is no auto scale policy with id: " + autoscalePolicyId);
+ }
+ return (autoscalePolicyMap.get(tenantId)).get(autoscalePolicyId);
+ }
}
public DeploymentPolicy[] getDeploymentPolicies() throws RestAPIException{
- if(!deploymentPolicyMap.containsKey(getTenantId())){
- return new HashMap<String,DeploymentPolicy>().values().toArray(new DeploymentPolicy[0]);
+ int tenantId = getTenantId();
+ if(!deploymentPolicyMap.containsKey(tenantId) && !deploymentPolicyMap.containsKey(PUBLIC_DEFINITION)){
+ return new HashMap<String,DeploymentPolicy>().values().toArray(new DeploymentPolicy[0]);
}
+
+ List<DeploymentPolicy> p = new ArrayList<DeploymentPolicy>();
+
+ if(deploymentPolicyMap.get(tenantId) != null)
+ p.addAll(deploymentPolicyMap.get(tenantId).values());
- return (deploymentPolicyMap.get(getTenantId())).values().toArray(new DeploymentPolicy[0]);
+ if(deploymentPolicyMap.get(PUBLIC_DEFINITION) != null)
+ p.addAll(deploymentPolicyMap.get(PUBLIC_DEFINITION).values());
+
+ return p.toArray(new DeploymentPolicy[0]);
}
public DeploymentPolicy getDeploymentPolicies(String deploymentPolicyId) throws RestAPIException{
- if(!deploymentPolicyMap.containsKey(getTenantId()))
- throw new RestAPIException("No deployment policies have been defined for tenant");
-
- if(!(deploymentPolicyMap.get(getTenantId())).containsKey(deploymentPolicyId)){
- throw new RestAPIException("There is no deployment policy with id: " + deploymentPolicyId);
- }
- return (deploymentPolicyMap.get(getTenantId())).get(deploymentPolicyId);
+ int tenantId = getTenantId();
+ if(!deploymentPolicyMap.containsKey(tenantId)){
+ if(!deploymentPolicyMap.containsKey(PUBLIC_DEFINITION)){
+ throw new RestAPIException("No deployment policies have been defined for tenant");
+ }
+ else{
+ if(!(deploymentPolicyMap.get(PUBLIC_DEFINITION)).containsKey(deploymentPolicyId)){
+ throw new RestAPIException("There is no deployment policy with id: " + deploymentPolicyId);
+ }
+ return (deploymentPolicyMap.get(PUBLIC_DEFINITION)).get(deploymentPolicyId);
+ }
+ }
+ else{
+ if(!(deploymentPolicyMap.get(tenantId)).containsKey(deploymentPolicyId)){
+ throw new RestAPIException("There is no deployment policy with id: " + deploymentPolicyId);
+ }
+ return (deploymentPolicyMap.get(tenantId)).get(deploymentPolicyId);
+ }
}
public StratosAdminResponse deployService(ServiceDefinitionBean serviceDefinitionBean) {
+ int tenantId = getTenantId();
Map<String,ServiceDefinitionBean> serviceDefinitions;
- if(!serviceDefinitionMap.containsKey(getTenantId())){
- serviceDefinitions = new HashMap<String,ServiceDefinitionBean>();
- serviceDefinitionMap.put(getTenantId(), serviceDefinitions);
+ if(!serviceDefinitionBean.getIsPublic()){
+ if(!serviceDefinitionMap.containsKey(tenantId)){
+ serviceDefinitions = new HashMap<String,ServiceDefinitionBean>();
+ serviceDefinitionMap.put(tenantId, serviceDefinitions);
+ }
+ else{
+ serviceDefinitions = serviceDefinitionMap.get(tenantId);
+ }
}
else{
- serviceDefinitions = serviceDefinitionMap.get(getTenantId());
+ if(!serviceDefinitionMap.containsKey(PUBLIC_DEFINITION)){
+ serviceDefinitions = new HashMap<String,ServiceDefinitionBean>();
+ serviceDefinitionMap.put(PUBLIC_DEFINITION, serviceDefinitions);
+ }
+ else{
+ serviceDefinitions = serviceDefinitionMap.get(PUBLIC_DEFINITION);
+ }
}
serviceDefinitions.put(serviceDefinitionBean.getCartridgeType(),serviceDefinitionBean);
@@ -503,29 +755,60 @@ public class MockContext {
}
public ServiceDefinitionBean[] getServices() throws RestAPIException{
- if(!serviceDefinitionMap.containsKey(getTenantId())){
- return new HashMap<String,ServiceDefinitionBean>().values().toArray(new ServiceDefinitionBean[0]);
+ int tenantId = getTenantId();
+ if(!serviceDefinitionMap.containsKey(tenantId) && !serviceDefinitionMap.containsKey(PUBLIC_DEFINITION)){
+ return new HashMap<String,ServiceDefinitionBean>().values().toArray(new ServiceDefinitionBean[0]);
}
- return (serviceDefinitionMap.get(getTenantId())).values().toArray(new ServiceDefinitionBean[0]);
+
+ List<ServiceDefinitionBean> p = new ArrayList<ServiceDefinitionBean>();
+
+ if(serviceDefinitionMap.get(tenantId) != null)
+ p.addAll(serviceDefinitionMap.get(tenantId).values());
+
+ if(serviceDefinitionMap.get(PUBLIC_DEFINITION) != null)
+ p.addAll(serviceDefinitionMap.get(PUBLIC_DEFINITION).values());
+
+ return p.toArray(new ServiceDefinitionBean[0]);
}
public ServiceDefinitionBean getServiceType(String serviceType) throws RestAPIException{
- if(!serviceDefinitionMap.containsKey(getTenantId()))
- throw new RestAPIException(Status.NO_CONTENT,"No services have been defined for tenant");
-
- return (serviceDefinitionMap.get(getTenantId())).get(serviceType);
+ int tenantId = getTenantId();
+ if(!serviceDefinitionMap.containsKey(tenantId)){
+ if(!serviceDefinitionMap.containsKey(PUBLIC_DEFINITION)){
+ throw new RestAPIException(Status.NO_CONTENT,"No services have been defined for tenant");
+ }
+ return (serviceDefinitionMap.get(PUBLIC_DEFINITION)).get(serviceType);
+ }
+ return (serviceDefinitionMap.get(tenantId)).get(serviceType);
}
public Partition[] getPartitions(String deploymentPolicyId, String partitionGroupId) throws RestAPIException{
- if(!deploymentPolicyMap.containsKey(getTenantId()))
- throw new RestAPIException(Status.NO_CONTENT,"No deployment policies have been defined for tenant");
-
- if(!(deploymentPolicyMap.get(getTenantId())).containsKey(deploymentPolicyId)){
- throw new RestAPIException(Status.NO_CONTENT,"There is no deployment policy with id: " + deploymentPolicyId);
- }
+ int tenantId = getTenantId();
+ DeploymentPolicy deploymentPolicy;
+ if(!deploymentPolicyMap.containsKey(tenantId)){
+ if(!deploymentPolicyMap.containsKey(PUBLIC_DEFINITION)){
+ throw new RestAPIException(Status.NO_CONTENT,"No deployment policies have been defined for tenant");
+ }
+ else{
+ if(!(deploymentPolicyMap.get(PUBLIC_DEFINITION)).containsKey(deploymentPolicyId)){
+ throw new RestAPIException(Status.NO_CONTENT,"There is no deployment policy with id: " + deploymentPolicyId);
+ }
+ else{
+ deploymentPolicy = (deploymentPolicyMap.get(PUBLIC_DEFINITION)).get(deploymentPolicyId);
+ }
+ }
+ }
+ else{
+ if(!(deploymentPolicyMap.get(tenantId)).containsKey(deploymentPolicyId)){
+ throw new RestAPIException(Status.NO_CONTENT,"There is no deployment policy with id: " + deploymentPolicyId);
+ }
+ else{
+ deploymentPolicy = (deploymentPolicyMap.get(tenantId)).get(deploymentPolicyId);
+ }
+ }
+
Partition[] partitions = null;
- DeploymentPolicy deploymentPolicy = (deploymentPolicyMap.get(getTenantId())).get(deploymentPolicyId);
for(PartitionGroup partitionGroup : deploymentPolicy.partitionGroup){
if(partitionGroup.id.equals(partitionGroupId)){
partitions = partitionGroup.partition.toArray(new Partition[0]);
@@ -542,10 +825,18 @@ public class MockContext {
}
public DeploymentPolicy[] getDeploymentPoliciesForCartridgeType(String cartridgeType) throws RestAPIException{
- if(!deploymentPolicyMap.containsKey(getTenantId())){
- return new HashMap<String,DeploymentPolicy>().values().toArray(new DeploymentPolicy[0]);
+ int tenantId = getTenantId();
+ if(!deploymentPolicyMap.containsKey(tenantId)){
+ if(!deploymentPolicyMap.containsKey(PUBLIC_DEFINITION)){
+ return new HashMap<String,DeploymentPolicy>().values().toArray(new DeploymentPolicy[0]);
+ }
+ else{
+ return (deploymentPolicyMap.get(PUBLIC_DEFINITION)).values().toArray(new DeploymentPolicy[0]);
+ }
+ }
+ else{
+ return (deploymentPolicyMap.get(tenantId)).values().toArray(new DeploymentPolicy[0]);
}
- return (deploymentPolicyMap.get(getTenantId())).values().toArray(new DeploymentPolicy[0]);
}
public StratosAdminResponse addSubscriptionDomains(int tenantId, String alias, SubscriptionDomainRequest request) {
@@ -636,5 +927,4 @@ public class MockContext {
return -1;
}
}
-
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/d0b0c634/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/schemas/schema.xsd
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/schemas/schema.xsd b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/schemas/schema.xsd
index 9ccb989..ad37c12 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/schemas/schema.xsd
+++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos-test/WEB-INF/schemas/schema.xsd
@@ -19,6 +19,7 @@
<xs:sequence>
<xs:element name="id" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1" nillable="true"/>
+ <xs:element name="isPublic" type="xs:boolean" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="provider" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="property" minOccurs="1" maxOccurs="unbounded">
<xs:complexType>
@@ -37,6 +38,7 @@
<xs:sequence>
<xs:element name="id" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1" nillable="true"/>
+ <xs:element name="isPublic" type="xs:boolean" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="loadThresholds" minOccurs="1" maxOccurs="1" nillable="false">
<xs:complexType>
<xs:all>
@@ -55,6 +57,7 @@
<xs:sequence>
<xs:element name="id" type="xs:string" maxOccurs="1" minOccurs="1" nillable="false"/>
<xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1" nillable="true"/>
+ <xs:element name="isPublic" type="xs:boolean" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="partitionGroup">
<xs:complexType>
<xs:sequence>
@@ -88,6 +91,7 @@
<xs:complexType>
<xs:sequence>
<xs:element name="type" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="isPublic" type="xs:boolean" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="provider" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="host" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="displayName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
@@ -196,6 +200,7 @@
<xs:complexType>
<xs:all>
<xs:element name="serviceName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="isPublic" type="xs:boolean" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="cartridgeType" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="deploymentPolicyName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="autoscalingPolicyName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
[5/7] git commit: Adding in isPublic property to beans
Posted by ni...@apache.org.
Adding in isPublic property to beans
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/48df0482
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/48df0482
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/48df0482
Branch: refs/heads/origin
Commit: 48df048214a64e9dc6071421ebf494e879f70e8b
Parents: db95d88
Author: Shiro <sh...@wso2.com>
Authored: Fri Sep 19 09:52:10 2014 +0530
Committer: Shiro <sh...@wso2.com>
Committed: Fri Sep 19 09:52:10 2014 +0530
----------------------------------------------------------------------
.../org.apache.stratos.autoscaler/pom.xml | 5 +++
.../deployment/policy/DeploymentPolicy.java | 46 +++++++++++++++++++-
.../policy/model/AutoscalePolicy.java | 44 ++++++++++++++++++-
.../deployment/partition/Partition.java | 24 +++++++++-
.../cloud/controller/pojo/CartridgeConfig.java | 12 ++++-
.../cloud/controller/pojo/CartridgeInfo.java | 10 +++++
.../common/constants/StratosConstants.java | 3 ++
.../stratos/manager/deploy/service/Service.java | 12 ++++-
.../service/ServiceDeploymentManager.java | 10 ++---
.../service/multitenant/MultiTenantService.java | 4 +-
.../multitenant/lb/DefaultLBService.java | 4 +-
.../multitenant/lb/ExistingLBService.java | 4 +-
.../service/multitenant/lb/LBService.java | 4 +-
.../multitenant/lb/MultiTenantLBService.java | 4 +-
.../multitenant/lb/ServiceAwareLBService.java | 4 +-
.../bean/util/converter/PojoConverter.java | 40 ++++-------------
.../rest/endpoint/services/StratosAdmin.java | 2 +-
.../webapp/stratos/WEB-INF/schemas/schema.xsd | 5 +++
.../src/main/resources/AutoScalerService.wsdl | 18 +++++---
.../main/resources/CloudControllerService.wsdl | 15 ++++---
20 files changed, 202 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/48df0482/components/org.apache.stratos.autoscaler/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/pom.xml b/components/org.apache.stratos.autoscaler/pom.xml
index 35d03da..0ef2d4f 100644
--- a/components/org.apache.stratos.autoscaler/pom.xml
+++ b/components/org.apache.stratos.autoscaler/pom.xml
@@ -170,6 +170,11 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/stratos/blob/48df0482/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java
index cf0efb4..a8a44d0 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/deployment/policy/DeploymentPolicy.java
@@ -34,7 +34,9 @@ public class DeploymentPolicy implements Serializable{
private static final long serialVersionUID = 5675507196284400099L;
private String id;
private String description;
+ private boolean isPublic;
private PartitionGroup[] partitionGroups;
+ private int tenantId;
/**
* Gets the value of the id property.
@@ -84,6 +86,46 @@ public class DeploymentPolicy implements Serializable{
this.description = value;
}
+ /**
+ * Gets the value of the isPublic property.
+ *
+ * @return
+ * possible object is boolean
+ *
+ */
+ public boolean getIsPublic() {
+ return isPublic;
+ }
+
+ /**
+ * Sets the value of the isPublic property.
+ *
+ * @param description
+ * allowed object is boolean
+ *
+ */
+ public void setIsPublic(boolean isPublic) {
+ this.isPublic = isPublic;
+ }
+
+ /**
+ * Gets the value of the tenantId property.
+ *
+ *
+ */
+ public int getTenantId() {
+ return tenantId;
+ }
+
+ /**
+ * Sets the value of the tenantId property.
+ *
+ *
+ */
+ public void setTenantId(int tenantId) {
+ this.tenantId = tenantId;
+ }
+
public void setPartitionGroups(PartitionGroup[] groups) {
this.partitionGroups = groups;
}
@@ -125,7 +167,9 @@ public class DeploymentPolicy implements Serializable{
}
public String toString() {
- return "Deployment Policy [id]" + this.id + " Description " + this.description +" [partitions] " + Arrays.toString(this.getAllPartitions());
+ return "Deployment Policy [id]" + this.id + " Description " + this.description
+ + " isPublic " + this.isPublic
+ +" [partitions] " + Arrays.toString(this.getAllPartitions());
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/48df0482/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/AutoscalePolicy.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/AutoscalePolicy.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/AutoscalePolicy.java
index cdfba84..e1630b8 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/AutoscalePolicy.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/model/AutoscalePolicy.java
@@ -31,6 +31,8 @@ public class AutoscalePolicy implements Serializable {
private String id;
private String displayName;
private String description;
+ private boolean isPublic;
+ private int tenantId;
/**
* Gets the value of the loadThresholds property.
@@ -127,11 +129,51 @@ public class AutoscalePolicy implements Serializable {
public void setDescription(String description) {
this.description = description;
}
+
+ /**
+ * Gets the value of the isPublic property.
+ *
+ * @return
+ * possible object is boolean
+ *
+ */
+ public boolean getIsPublic() {
+ return isPublic;
+ }
+
+ /**
+ * Sets the value of the isPublic property.
+ *
+ * @param description
+ * allowed object is boolean
+ *
+ */
+ public void setIsPublic(boolean isPublic) {
+ this.isPublic = isPublic;
+ }
+
+ /**
+ * Gets the value of the tenantId property.
+ *
+ *
+ */
+ public int getTenantId() {
+ return tenantId;
+ }
+
+ /**
+ * Sets the value of the tenantId property.
+ *
+ *
+ */
+ public void setTenantId(int tenantId) {
+ this.tenantId = tenantId;
+ }
@Override
public String toString() {
return "ASPolicy [id=" + id + ", displayName=" + displayName
- + ", description=" + description + "]";
+ + ", description=" + description + ", isPublic=" + isPublic + "]";
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/48df0482/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployment/partition/Partition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployment/partition/Partition.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployment/partition/Partition.java
index cdd1fea..2376fd9 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployment/partition/Partition.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/deployment/partition/Partition.java
@@ -38,6 +38,7 @@ public class Partition implements Serializable{
private Properties properties = new Properties();
private String id;
private String description;
+ private boolean isPublic;
/**
@@ -120,6 +121,25 @@ public class Partition implements Serializable{
this.description = description;
}
+ /**
+ * Sets the value of the isPublic property.
+ *
+ * @param value
+ * allowed object is boolean
+ *
+ */
+ public void setIsPublic(boolean isPublic) {
+ this.isPublic = isPublic;
+ }
+
+ /**
+ * Gets the value of the isPublic property.
+ *
+ */
+ public boolean getIsPublic() {
+ return isPublic;
+ }
+
public Properties getProperties() {
return properties;
}
@@ -138,8 +158,8 @@ public class Partition implements Serializable{
@Override
public String toString() {
- return "Partition [id=" + id + ", description=" + description + ", provider=" + provider
- + ", partitionMin=" + partitionMin + ", partitionMax="
+ return "Partition [id=" + id + ", description=" + description + ", isPublic=" + isPublic
+ + ", provider=" + provider + ", partitionMin=" + partitionMin + ", partitionMax="
+ partitionMax + ", properties=" + properties + "]";
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/48df0482/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java
index 0862ad1..5c7f629 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java
@@ -42,6 +42,8 @@ public class CartridgeConfig implements Serializable {
private String version;
private boolean multiTenant;
+
+ private boolean isPublic;
private String baseDir;
@@ -119,6 +121,14 @@ public class CartridgeConfig implements Serializable {
public void setMultiTenant(boolean multiTenant) {
this.multiTenant = multiTenant;
}
+
+ public boolean getIsPublic() {
+ return isPublic;
+ }
+
+ public void setisPublic(boolean isPublic) {
+ this.isPublic = isPublic;
+ }
public String getBaseDir() {
return baseDir;
@@ -163,7 +173,7 @@ public class CartridgeConfig implements Serializable {
public String toString () {
return "Type: " + type + ", Provider: " + provider + ", Host: " + hostName + ", Display Name: " + displayName +
- ", Description: " + description + ", Version: " + version + ", Multitenant " + multiTenant +
+ ", Description: " + description + ", Version: " + version + ", Multitenant " + multiTenant + ", IsPublic " + isPublic +
"\n Deployment: " + getDeploymentDetails() + "\n PortMapping: " + getPortMappingDetails() +
"\n IaaS: " + getIaasConfigDetails() + "\n Properties: " + getPropertyDetails();
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/48df0482/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeInfo.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeInfo.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeInfo.java
index 0064b2e..163f6aa 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeInfo.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeInfo.java
@@ -46,6 +46,8 @@ public class CartridgeInfo {
private boolean multiTenant;
+ private boolean isPublic;
+
private String baseDir;
private Property[] properties;
@@ -138,6 +140,14 @@ public class CartridgeInfo {
public void setMultiTenant(boolean multiTenant) {
this.multiTenant = multiTenant;
}
+
+ public boolean getIsPublic() {
+ return isPublic;
+ }
+
+ public void setIsPublic(boolean isPublic) {
+ this.isPublic = isPublic;
+ }
public String getBaseDir() {
return baseDir;
http://git-wip-us.apache.org/repos/asf/stratos/blob/48df0482/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
index b365258..73b9b24 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java
@@ -139,5 +139,8 @@ public class StratosConstants {
public static final String MULTITENANCY_LARGE_PLAN = "Enterprise";
public static final String EMAIL_CONFIG= "email";
public static final String MULTITENANCY_CONFIG_FOLDER = "multitenancy";
+
+ // Policy and definition related constants
+ public static final int PUBLIC_DEFINITION = 0;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/48df0482/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java
index 30b123f..72176c3 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/Service.java
@@ -42,9 +42,10 @@ public abstract class Service extends CartridgeMgtBehaviour {
private CartridgeInfo cartridgeInfo;
private PayloadData payloadData;
private Cluster cluster;
+ private boolean isPublic;
public Service (String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId, CartridgeInfo cartridgeInfo,
- String tenantRange) {
+ String tenantRange, boolean isPublic) {
this.type = type;
this.autoscalingPolicyName = autoscalingPolicyName;
@@ -54,6 +55,7 @@ public abstract class Service extends CartridgeMgtBehaviour {
this.tenantRange = tenantRange;
this.subscriptionKey = CartridgeSubscriptionUtils.generateSubscriptionKey();
this.setCluster(new Cluster());
+ this.isPublic = isPublic;
}
public void create () throws ADCException {
@@ -179,4 +181,12 @@ public abstract class Service extends CartridgeMgtBehaviour {
public void setCluster(Cluster cluster) {
this.cluster = cluster;
}
+
+ public boolean getIsPublic() {
+ return isPublic;
+ }
+
+ public void setIsPublic(boolean isPublic) {
+ this.isPublic = isPublic;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/48df0482/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java
index 08589b3..c5921b6 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/ServiceDeploymentManager.java
@@ -47,7 +47,7 @@ public class ServiceDeploymentManager {
private static Log log = LogFactory.getLog(ServiceDeploymentManager.class);
public Service deployService (String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId, String tenantRange,
- String tenantDomain, String userName)
+ String tenantDomain, String userName, boolean isPublic)
throws ADCException, UnregisteredCartridgeException, ServiceAlreadyDeployedException {
//check if already we have a Multitenant service deployed for the same type
@@ -319,7 +319,7 @@ public class ServiceDeploymentManager {
deployLBCluster(type, lbDataCtxt, tenantRange);
}
- Service service = new MultiTenantService(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange);
+ Service service = new MultiTenantService(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange, isPublic);
Properties serviceClusterProperties = null;
if (lbDataCtxt != null) {
@@ -353,17 +353,17 @@ public class ServiceDeploymentManager {
if (lbDataCtxt.getLbCategory().equals(Constants.EXISTING_LOAD_BALANCERS)) {
lbService = new ExistingLBService(lbDataCtxt.getLbCartridgeInfo().getType(), lbDataCtxt.getAutoscalePolicy(),
lbDataCtxt.getDeploymentPolicy(), -1234, lbDataCtxt.getLbCartridgeInfo(),
- tenantRange);
+ tenantRange, false);
} else if (lbDataCtxt.getLbCategory().equals(Constants.DEFAULT_LOAD_BALANCER)) {
lbService = new DefaultLBService(lbDataCtxt.getLbCartridgeInfo().getType(), lbDataCtxt.getAutoscalePolicy(),
lbDataCtxt.getDeploymentPolicy(), -1234, lbDataCtxt.getLbCartridgeInfo(),
- tenantRange);
+ tenantRange, false);
} else if (lbDataCtxt.getLbCategory().equals(Constants.SERVICE_AWARE_LOAD_BALANCER)) {
lbService = new ServiceAwareLBService(lbDataCtxt.getLbCartridgeInfo().getType(), lbDataCtxt.getAutoscalePolicy(),
lbDataCtxt.getDeploymentPolicy(), -1234, lbDataCtxt.getLbCartridgeInfo(),
- tenantRange);
+ tenantRange, false);
}
if (lbService == null) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/48df0482/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/MultiTenantService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/MultiTenantService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/MultiTenantService.java
index fc7a639..b8a468b 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/MultiTenantService.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/MultiTenantService.java
@@ -27,7 +27,7 @@ public class MultiTenantService extends Service {
private static final long serialVersionUID = 3038272784193474660L;
public MultiTenantService (String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId, CartridgeInfo cartridgeInfo,
- String tenantRange) {
- super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange);
+ String tenantRange, boolean isPublic) {
+ super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange, isPublic);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/48df0482/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java
index 487140c..982535a 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/DefaultLBService.java
@@ -44,9 +44,9 @@ public class DefaultLBService extends LBService {
private boolean defaultLBServiceExists = false;
public DefaultLBService (String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId,
- CartridgeInfo cartridgeInfo, String tenantRange) {
+ CartridgeInfo cartridgeInfo, String tenantRange, boolean isPublic) {
- super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange);
+ super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange, isPublic);
}
public PayloadData create(String alias, Cluster cluster, Subscriber subscriber, Repository repository, CartridgeInfo cartridgeInfo,
http://git-wip-us.apache.org/repos/asf/stratos/blob/48df0482/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ExistingLBService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ExistingLBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ExistingLBService.java
index 78acae7..4a67d8b 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ExistingLBService.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ExistingLBService.java
@@ -35,8 +35,8 @@ public class ExistingLBService extends LBService {
private static final long serialVersionUID = -421015139303889832L;
- public ExistingLBService(String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId, CartridgeInfo cartridgeInfo, String tenantRange) {
- super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange);
+ public ExistingLBService(String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId, CartridgeInfo cartridgeInfo, String tenantRange, boolean isPublic) {
+ super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange, isPublic);
}
public PayloadData create(String alias, Cluster cluster, Subscriber subscriber, Repository repository, CartridgeInfo cartridgeInfo,
http://git-wip-us.apache.org/repos/asf/stratos/blob/48df0482/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/LBService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/LBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/LBService.java
index f062626..1214c0e 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/LBService.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/LBService.java
@@ -33,9 +33,9 @@ public class LBService extends Service {
private String loadBalancedServiceType;
public LBService(String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId,
- CartridgeInfo cartridgeInfo, String tenantRange) {
+ CartridgeInfo cartridgeInfo, String tenantRange, boolean isPublic) {
- super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange);
+ super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange, isPublic);
}
public void create () throws ADCException {
http://git-wip-us.apache.org/repos/asf/stratos/blob/48df0482/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java
index 993afde..c22c545 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/MultiTenantLBService.java
@@ -33,9 +33,9 @@ public class MultiTenantLBService extends Service {
private LoadBalancerCategory loadBalancerCategory;
public MultiTenantLBService(String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId,
- CartridgeInfo cartridgeInfo, String tenantRange, LoadBalancerCategory loadBalancerCategory) {
+ CartridgeInfo cartridgeInfo, String tenantRange, boolean isPublic, LoadBalancerCategory loadBalancerCategory) {
- super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange);
+ super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange, isPublic);
this.loadBalancerCategory = loadBalancerCategory;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/48df0482/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java
index f5c3ea4..4f4cae7 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/service/multitenant/lb/ServiceAwareLBService.java
@@ -44,9 +44,9 @@ public class ServiceAwareLBService extends LBService {
private static final long serialVersionUID = -4107281204555031986L;
public ServiceAwareLBService(String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId,
- CartridgeInfo cartridgeInfo, String tenantRange) {
+ CartridgeInfo cartridgeInfo, String tenantRange, boolean isPublic) {
- super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange);
+ super(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange, isPublic);
}
private static Log log = LogFactory.getLog(ServiceAwareLBService.class);
http://git-wip-us.apache.org/repos/asf/stratos/blob/48df0482/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
index d9a9e44..f717972 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
@@ -48,6 +48,7 @@ public class PojoConverter {
cartridgeConfig.setProvider(cartridgeDefinitionBean.provider);
cartridgeConfig.setVersion(cartridgeDefinitionBean.version);
cartridgeConfig.setMultiTenant(cartridgeDefinitionBean.multiTenant);
+ cartridgeConfig.setIsPublic(cartridgeDefinitionBean.isPublic);
cartridgeConfig.setDisplayName(cartridgeDefinitionBean.displayName);
cartridgeConfig.setDescription(cartridgeDefinitionBean.description);
cartridgeConfig.setDefaultAutoscalingPolicy(cartridgeDefinitionBean.defaultAutoscalingPolicy);
@@ -218,6 +219,7 @@ public class PojoConverter {
partition.setId(partitionBean.id);
partition.setDescription(partitionBean.description);
+ partition.setIsPublic(partitionBean.isPublic);
partition.setProvider(partitionBean.provider);
partition.setPartitionMin(partitionBean.partitionMin);
partition.setPartitionMax(partitionBean.partitionMax);
@@ -237,6 +239,7 @@ public class PojoConverter {
autoscalePolicy.setId(autoscalePolicyBean.getId());
autoscalePolicy.setDescription(autoscalePolicyBean.getDescription());
+ autoscalePolicy.setIsPublic(autoscalePolicyBean.getIsPublic());
autoscalePolicy.setDisplayName(autoscalePolicyBean.getDisplayName());
if (autoscalePolicyBean.getLoadThresholds() != null) {
@@ -290,6 +293,7 @@ public class PojoConverter {
deploymentPolicy.setId(deploymentPolicyBean.id);
deploymentPolicy.setDescription(deploymentPolicyBean.description);
+ deploymentPolicy.setIsPublic(deploymentPolicyBean.isPublic);
if(deploymentPolicyBean.partitionGroup != null && !deploymentPolicyBean.partitionGroup.isEmpty()) {
deploymentPolicy.setPartitionGroups(convertToCCPartitionGroup(deploymentPolicyBean.partitionGroup));
}
@@ -380,16 +384,6 @@ public class PojoConverter {
partitionBeans = new Partition[partitions.length];
for (int i = 0 ; i < partitions.length ; i++) {
- /*Partition partition = new Partition();
- partition.id = partitions[i].getId();
- partition.provider = partitions[i].getProvider();
- partition.partitionMin = partitions[i].getPartitionMin();
- partition.partitionMax = partitions[i].getPartitionMax();*/
- //properties are not added currently, TODO if required
- //if(partitions[i].getProperties() != null) {
- // List<PropertyBean> propertyBeans = getPropertyBeans(partitions[i].getProperties());
- // partition.property = propertyBeans;
- //}
partitionBeans[i] = populatePartitionPojo(partitions[i]);
}
return partitionBeans;
@@ -405,6 +399,7 @@ public class PojoConverter {
partitionBeans.id = partition.getId();
partitionBeans.description = partition.getDescription();
+ partitionBeans.isPublic = partition.getIsPublic();
partitionBeans.provider = partition.getProvider();
partitionBeans.partitionMin = partition.getPartitionMin();
partitionBeans.partitionMax = partition.getPartitionMax();
@@ -472,13 +467,6 @@ public class PojoConverter {
autoscalePolicyBeans = new AutoscalePolicy[autoscalePolicies.length];
for (int i = 0 ; i < autoscalePolicies.length ; i++) {
- /*AutoscalePolicy autoscalePolicy = new AutoscalePolicy();
- autoscalePolicy.id = autoscalePolicies[i].getId();
- autoscalePolicy.displayName = autoscalePolicies[i].getDisplayName();
- autoscalePolicy.description = autoscalePolicies[i].getDescription();
- if(autoscalePolicies[i].getLoadThresholds() != null) {
- autoscalePolicy.loadThresholds = populateLoadThresholds(autoscalePolicies[i].getLoadThresholds());
- }*/
autoscalePolicyBeans[i] = populateAutoscalePojo(autoscalePolicies[i]);
}
return autoscalePolicyBeans;
@@ -494,6 +482,7 @@ public class PojoConverter {
autoscalePolicyBean.setId(autoscalePolicy.getId());
autoscalePolicyBean.setDescription(autoscalePolicy.getDescription());
+ autoscalePolicyBean.setIsPublic(autoscalePolicy.getIsPublic());
autoscalePolicyBean.setDisplayName(autoscalePolicy.getDisplayName());
autoscalePolicyBean.setDescription(autoscalePolicy.getDescription());
if(autoscalePolicy.getLoadThresholds() != null) {
@@ -538,14 +527,6 @@ public class PojoConverter {
deploymentPolicyBeans = new DeploymentPolicy[deploymentPolicies.length];
for (int i = 0 ; i < deploymentPolicies.length ; i++) {
- //DeploymentPolicy deploymentPolicy = new DeploymentPolicy();
- //deploymentPolicy.id = deploymentPolicies[i].getId();
-
- //if(deploymentPolicies[i].getPartitionGroups() != null &&
- // deploymentPolicies[i].getPartitionGroups().length > 0) {
- // deploymentPolicy.partitionGroup = getPartitionGroups(deploymentPolicies[i].getPartitionGroups());
- //}
-
deploymentPolicyBeans[i] = populateDeploymentPolicyPojo(deploymentPolicies[i]);
}
@@ -562,6 +543,7 @@ public class PojoConverter {
deploymentPolicyBean.id = deploymentPolicy.getId();
deploymentPolicyBean.description = deploymentPolicy.getDescription();
+ deploymentPolicyBean.isPublic = deploymentPolicy.getIsPublic();
if (deploymentPolicy.getPartitionGroups() != null && deploymentPolicy.getPartitionGroups().length > 0) {
deploymentPolicyBean.partitionGroup = Arrays.asList(populatePartitionGroupPojos(deploymentPolicy.getPartitionGroups()));
@@ -601,13 +583,6 @@ public class PojoConverter {
partitionGroupsBeans = new PartitionGroup[partitionGroups.length];
for (int i = 0 ; i < partitionGroups.length ; i ++) {
- /*PartitionGroup partitionGroup = new PartitionGroup();
- partitionGroup.id = partitionGroups[i].getId();
- partitionGroup.partitionAlgo = partitionGroups[i].getPartitionAlgo();
-
- if(partitionGroups[i].getPartitions() != null && partitionGroups[i].getPartitions().length > 0){
- partitionGroup.partition = getPartitionList(partitionGroups[i].getPartitions());
- }*/
partitionGroupsBeans[i] = populatePartitionGroupPojo(partitionGroups[i]);
}
@@ -639,6 +614,7 @@ public class PojoConverter {
serviceDefinitionBean.setCartridgeType(service.getType());
serviceDefinitionBean.setTenantRange(service.getTenantRange());
serviceDefinitionBean.setClusterDomain(service.getClusterId());
+ serviceDefinitionBean.setIsPublic(service.getIsPublic());
serviceDefinitionBean.setAutoscalingPolicyName(service.getAutoscalingPolicyName());
serviceDefinitionBean.setDeploymentPolicyName(service.getDeploymentPolicyName());
http://git-wip-us.apache.org/repos/asf/stratos/blob/48df0482/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
index f8c9f2f..c1f16a8 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
@@ -955,7 +955,7 @@ public class StratosAdmin extends AbstractAdmin {
ServiceUtils.deployService(serviceDefinitionBean.getCartridgeType(), UUID.randomUUID().toString(), serviceDefinitionBean.getAutoscalingPolicyName(),
serviceDefinitionBean.getDeploymentPolicyName(), getTenantDomain(), getUsername(), getTenantId(),
serviceDefinitionBean.getClusterDomain(), serviceDefinitionBean.getClusterSubDomain(),
- serviceDefinitionBean.getTenantRange());
+ serviceDefinitionBean.getTenantRange(), serviceDefinitionBean.getIsPublic());
URI url = uriInfo.getAbsolutePathBuilder().path(serviceDefinitionBean.getServiceName()).build();
return Response.created(url).build();
http://git-wip-us.apache.org/repos/asf/stratos/blob/48df0482/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd
index 7485c13..7746e8e 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd
+++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd
@@ -19,6 +19,7 @@
<xs:sequence>
<xs:element name="id" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1" nillable="true"/>
+ <xs:element name="isPublic" type="xs:boolean" minOccurs="0" maxOccurs="1" nillable="false"/>
<xs:element name="provider" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="property" minOccurs="1" maxOccurs="unbounded">
<xs:complexType>
@@ -37,6 +38,7 @@
<xs:sequence>
<xs:element name="id" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1" nillable="true"/>
+ <xs:element name="isPublic" type="xs:boolean" minOccurs="0" maxOccurs="1" nillable="false"/>
<xs:element name="loadThresholds" minOccurs="1" maxOccurs="1" nillable="false">
<xs:complexType>
<xs:all>
@@ -55,6 +57,7 @@
<xs:sequence>
<xs:element name="id" type="xs:string" maxOccurs="1" minOccurs="1" nillable="false"/>
<xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1" nillable="true"/>
+ <xs:element name="isPublic" type="xs:boolean" minOccurs="0" maxOccurs="1" nillable="false"/>
<xs:element name="partitionGroup">
<xs:complexType>
<xs:sequence>
@@ -88,6 +91,7 @@
<xs:complexType>
<xs:sequence>
<xs:element name="type" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="isPublic" type="xs:boolean" minOccurs="0" maxOccurs="1" nillable="false"/>
<xs:element name="provider" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="host" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="displayName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
@@ -196,6 +200,7 @@
<xs:complexType>
<xs:all>
<xs:element name="serviceName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
+ <xs:element name="isPublic" type="xs:boolean" minOccurs="0" maxOccurs="1" nillable="false"/>
<xs:element name="cartridgeType" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="deploymentPolicyName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
<xs:element name="autoscalingPolicyName" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/>
http://git-wip-us.apache.org/repos/asf/stratos/blob/48df0482/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl
index b3fcb6b..5bb9e92 100644
--- a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl
+++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoScalerService.wsdl
@@ -336,6 +336,7 @@
<xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="displayName" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/>
<xs:element minOccurs="0" name="loadThresholds" nillable="true" type="ax214:LoadThresholds"/>
</xs:sequence>
</xs:complexType>
@@ -373,6 +374,7 @@
<xs:element maxOccurs="unbounded" minOccurs="0" name="allPartitions" nillable="true" type="ax27:Partition"/>
<xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/>
<xs:element maxOccurs="unbounded" minOccurs="0" name="partitionGroups" nillable="true" type="ax28:PartitionGroup"/>
</xs:sequence>
</xs:complexType>
@@ -381,8 +383,12 @@
<xs:import namespace="http://pojo.stub.controller.cloud.stratos.apache.org/xsd"/>
<xs:complexType name="Partition">
<xs:sequence>
+ <xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="descriptionSpecified" type="xs:boolean"/>
<xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="idSpecified" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="isPublicSpecified" type="xs:boolean"/>
<xs:element minOccurs="0" name="partitionMax" type="xs:int"/>
<xs:element minOccurs="0" name="partitionMaxSpecified" type="xs:boolean"/>
<xs:element minOccurs="0" name="partitionMin" type="xs:int"/>
@@ -1135,22 +1141,22 @@
</wsdl:binding>
<wsdl:service name="AutoScalerService">
<wsdl:port name="AutoScalerServiceHttpSoap11Endpoint" binding="ns:AutoScalerServiceSoap11Binding">
- <soap:address location="http://192.168.122.1:9763/services/AutoScalerService.AutoScalerServiceHttpSoap11Endpoint/"/>
+ <soap:address location="http://192.168.0.100:9763/services/AutoScalerService.AutoScalerServiceHttpSoap11Endpoint/"/>
</wsdl:port>
<wsdl:port name="AutoScalerServiceHttpsSoap11Endpoint" binding="ns:AutoScalerServiceSoap11Binding">
- <soap:address location="https://192.168.122.1:9443/services/AutoScalerService.AutoScalerServiceHttpsSoap11Endpoint/"/>
+ <soap:address location="https://192.168.0.100:9443/services/AutoScalerService.AutoScalerServiceHttpsSoap11Endpoint/"/>
</wsdl:port>
<wsdl:port name="AutoScalerServiceHttpsSoap12Endpoint" binding="ns:AutoScalerServiceSoap12Binding">
- <soap12:address location="https://192.168.122.1:9443/services/AutoScalerService.AutoScalerServiceHttpsSoap12Endpoint/"/>
+ <soap12:address location="https://192.168.0.100:9443/services/AutoScalerService.AutoScalerServiceHttpsSoap12Endpoint/"/>
</wsdl:port>
<wsdl:port name="AutoScalerServiceHttpSoap12Endpoint" binding="ns:AutoScalerServiceSoap12Binding">
- <soap12:address location="http://192.168.122.1:9763/services/AutoScalerService.AutoScalerServiceHttpSoap12Endpoint/"/>
+ <soap12:address location="http://192.168.0.100:9763/services/AutoScalerService.AutoScalerServiceHttpSoap12Endpoint/"/>
</wsdl:port>
<wsdl:port name="AutoScalerServiceHttpEndpoint" binding="ns:AutoScalerServiceHttpBinding">
- <http:address location="http://192.168.122.1:9763/services/AutoScalerService.AutoScalerServiceHttpEndpoint/"/>
+ <http:address location="http://192.168.0.100:9763/services/AutoScalerService.AutoScalerServiceHttpEndpoint/"/>
</wsdl:port>
<wsdl:port name="AutoScalerServiceHttpsEndpoint" binding="ns:AutoScalerServiceHttpBinding">
- <http:address location="https://192.168.122.1:9443/services/AutoScalerService.AutoScalerServiceHttpsEndpoint/"/>
+ <http:address location="https://192.168.0.100:9443/services/AutoScalerService.AutoScalerServiceHttpsEndpoint/"/>
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/48df0482/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
index a00edf7..5c40917 100644
--- a/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
+++ b/service-stubs/org.apache.stratos.cloud.controller.service.stub/src/main/resources/CloudControllerService.wsdl
@@ -319,6 +319,7 @@
<xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="displayName" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/>
<xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax221:LoadbalancerConfig"/>
<xs:element minOccurs="0" name="multiTenant" type="xs:boolean"/>
<xs:element minOccurs="0" name="persistence" nillable="true" type="ax221:Persistence"/>
@@ -359,6 +360,7 @@
<xs:element minOccurs="0" name="displayName" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="hostName" nillable="true" type="xs:string"/>
<xs:element maxOccurs="unbounded" minOccurs="0" name="iaasConfigs" nillable="true" type="ax221:IaasConfig"/>
+ <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/>
<xs:element minOccurs="0" name="lbConfig" nillable="true" type="ax221:LoadbalancerConfig"/>
<xs:element minOccurs="0" name="multiTenant" type="xs:boolean"/>
<xs:element minOccurs="0" name="persistence" nillable="true" type="ax221:Persistence"/>
@@ -404,6 +406,7 @@
<xs:sequence>
<xs:element minOccurs="0" name="description" nillable="true" type="xs:string"/>
<xs:element minOccurs="0" name="id" nillable="true" type="xs:string"/>
+ <xs:element minOccurs="0" name="isPublic" type="xs:boolean"/>
<xs:element minOccurs="0" name="partitionMax" type="xs:int"/>
<xs:element minOccurs="0" name="partitionMin" type="xs:int"/>
<xs:element minOccurs="0" name="properties" nillable="true" type="ax221:Properties"/>
@@ -926,22 +929,22 @@
</wsdl:binding>
<wsdl:service name="CloudControllerService">
<wsdl:port name="CloudControllerServiceHttpSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding">
- <soap:address location="http://192.168.122.1:9763/services/CloudControllerService.CloudControllerServiceHttpSoap11Endpoint/"/>
+ <soap:address location="http://192.168.0.100:9763/services/CloudControllerService.CloudControllerServiceHttpSoap11Endpoint/"/>
</wsdl:port>
<wsdl:port name="CloudControllerServiceHttpsSoap11Endpoint" binding="ns:CloudControllerServiceSoap11Binding">
- <soap:address location="https://192.168.122.1:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap11Endpoint/"/>
+ <soap:address location="https://192.168.0.100:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap11Endpoint/"/>
</wsdl:port>
<wsdl:port name="CloudControllerServiceHttpSoap12Endpoint" binding="ns:CloudControllerServiceSoap12Binding">
- <soap12:address location="http://192.168.122.1:9763/services/CloudControllerService.CloudControllerServiceHttpSoap12Endpoint/"/>
+ <soap12:address location="http://192.168.0.100:9763/services/CloudControllerService.CloudControllerServiceHttpSoap12Endpoint/"/>
</wsdl:port>
<wsdl:port name="CloudControllerServiceHttpsSoap12Endpoint" binding="ns:CloudControllerServiceSoap12Binding">
- <soap12:address location="https://192.168.122.1:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap12Endpoint/"/>
+ <soap12:address location="https://192.168.0.100:9443/services/CloudControllerService.CloudControllerServiceHttpsSoap12Endpoint/"/>
</wsdl:port>
<wsdl:port name="CloudControllerServiceHttpEndpoint" binding="ns:CloudControllerServiceHttpBinding">
- <http:address location="http://192.168.122.1:9763/services/CloudControllerService.CloudControllerServiceHttpEndpoint/"/>
+ <http:address location="http://192.168.0.100:9763/services/CloudControllerService.CloudControllerServiceHttpEndpoint/"/>
</wsdl:port>
<wsdl:port name="CloudControllerServiceHttpsEndpoint" binding="ns:CloudControllerServiceHttpBinding">
- <http:address location="https://192.168.122.1:9443/services/CloudControllerService.CloudControllerServiceHttpsEndpoint/"/>
+ <http:address location="https://192.168.0.100:9443/services/CloudControllerService.CloudControllerServiceHttpsEndpoint/"/>
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
\ No newline at end of file
[3/7] git commit: Merge remote-tracking branch 'upstream/master'
Posted by ni...@apache.org.
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/673b17a1
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/673b17a1
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/673b17a1
Branch: refs/heads/origin
Commit: 673b17a15d689e2411fc16d1b1b4029f95cce107
Parents: d0b0c63 24c84ad
Author: Shiro <sh...@wso2.com>
Authored: Thu Sep 11 14:11:04 2014 +0530
Committer: Shiro <sh...@wso2.com>
Committed: Thu Sep 11 14:11:04 2014 +0530
----------------------------------------------------------------------
.../apache/stratos/manager/dto/Cartridge.java | 11 +
.../rest/endpoint/services/ServiceUtils.java | 1 +
tools/puppet3/manifests/nodes/default.pp | 1 +
tools/puppet3/manifests/nodes/haproxy.pp | 5 +-
tools/puppet3/manifests/nodes/jboss.pp | 35 +
tools/puppet3/manifests/nodes/lb.pp | 5 +-
tools/puppet3/manifests/nodes/mysql.pp | 7 +-
tools/puppet3/manifests/nodes/nodejs.pp | 7 +-
tools/puppet3/manifests/nodes/php.pp | 8 +-
tools/puppet3/manifests/nodes/ruby.pp | 6 +-
tools/puppet3/manifests/nodes/tomcat.pp | 5 +-
tools/puppet3/manifests/nodes/wordpress.pp | 5 +-
.../lib/puppet/parser/functions/difference.rb | 21 +
tools/puppet3/modules/agent/manifests/init.pp | 50 +-
.../modules/agent/manifests/push_templates.pp | 5 +-
.../modules/agent/manifests/remove_templates.pp | 24 +
.../templates/extensions/addons/_jboss-as.erb | 18 -
.../templates/extensions/addons/_mysql.erb | 32 -
.../templates/extensions/addons/_nodejs.erb | 21 -
.../agent/templates/extensions/addons/_php.erb | 18 -
.../agent/templates/extensions/addons/_ruby.erb | 34 -
.../templates/extensions/artifacts-copy.sh.erb | 3 +-
.../extensions/artifacts-updated.sh.erb | 6 -
.../templates/extensions/complete-tenant.sh.erb | 2 -
.../extensions/complete-topology.sh.erb | 6 -
.../extensions/member-activated.sh.erb | 279 +-------
.../templates/extensions/member-started.sh.erb | 17 +-
.../extensions/member-suspended.sh.erb | 17 +-
.../extensions/member-terminated.sh.erb | 15 -
.../templates/extensions/start-servers.sh.erb | 285 +-------
.../extensions/subscription-domain-added.sh.erb | 6 -
.../subscription-domain-removed.sh.erb | 5 -
tools/puppet3/modules/appserver/LICENSE | 13 +
tools/puppet3/modules/appserver/Modulefile | 11 +
tools/puppet3/modules/appserver/README | 11 +
.../modules/appserver/files/configs/README.txt | 5 +
.../repository/components/lib/README.txt | 1 +
.../modules/appserver/files/patches/README.txt | 3 +
.../repository/components/patches/README.txt | 1 +
.../modules/appserver/lib/facter/java_home.rb | 5 +
.../modules/appserver/manifests/clean.pp | 45 ++
.../modules/appserver/manifests/deploy.pp | 43 ++
.../puppet3/modules/appserver/manifests/init.pp | 137 ++++
.../modules/appserver/manifests/initialize.pp | 59 ++
.../modules/appserver/manifests/params.pp | 74 ++
.../appserver/manifests/push_templates.pp | 26 +
.../modules/appserver/manifests/start.pp | 28 +
.../agent/extensions/artifacts-copy.sh.erb | 29 +
.../agent/extensions/artifacts-updated.sh.erb | 28 +
.../templates/agent/extensions/clean.sh.erb | 28 +
.../agent/extensions/complete-tenant.sh.erb | 30 +
.../agent/extensions/complete-topology.sh.erb | 34 +
.../agent/extensions/instance-activated.sh.erb | 28 +
.../agent/extensions/instance-started.sh.erb | 27 +
.../agent/extensions/member-activated.sh.erb | 303 ++++++++
.../agent/extensions/member-started.sh.erb | 43 ++
.../agent/extensions/member-suspended.sh.erb | 43 ++
.../agent/extensions/member-terminated.sh.erb | 43 ++
.../agent/extensions/mount-volumes.sh.erb | 87 +++
.../agent/extensions/start-servers.sh.erb | 308 ++++++++
.../extensions/subscription-domain-added.sh.erb | 35 +
.../subscription-domain-removed.sh.erb | 34 +
.../templates/conf/axis2/axis2.xml.erb | 713 +++++++++++++++++++
.../appserver/templates/conf/carbon.xml.erb | 626 ++++++++++++++++
.../conf/datasources/master-datasources.xml.erb | 72 ++
.../datasources/master-datasources/_remote.erb | 68 ++
.../templates/conf/log4j.properties.erb | 175 +++++
.../appserver/templates/conf/registry.xml.erb | 105 +++
.../templates/conf/registry/_remote.erb | 35 +
.../conf/security/authenticators.xml.erb | 52 ++
.../conf/tomcat/catalina-server.xml.erb | 98 +++
.../appserver/templates/conf/user-mgt.xml.erb | 356 +++++++++
.../templates/conf/user-mgt/_roldap.erb | 32 +
.../templates/conf/user-mgt/_rwldap.erb | 41 ++
tools/puppet3/modules/haproxy/manifests/init.pp | 6 +
tools/puppet3/modules/jboss/manifests/init.pp | 10 +
.../agent/extensions/artifacts-updated.sh.erb | 30 +
tools/puppet3/modules/lb/manifests/init.pp | 7 +-
.../puppet3/modules/lb/manifests/initialize.pp | 10 +-
tools/puppet3/modules/mysql/manifests/init.pp | 10 +
.../agent/extensions/instance-started.sh.erb | 43 ++
tools/puppet3/modules/nodejs/manifests/init.pp | 11 +
.../agent/extensions/start-servers.sh.erb | 32 +
tools/puppet3/modules/php/manifests/init.pp | 11 +
.../agent/extensions/artifacts-updated.sh.erb | 30 +
tools/puppet3/modules/ruby/manifests/init.pp | 11 +
.../agent/extensions/instance-started.sh.erb | 46 ++
tools/puppet3/modules/tomcat/manifests/init.pp | 6 +
.../puppet3/modules/wordpress/manifests/init.pp | 5 +
89 files changed, 4352 insertions(+), 811 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/673b17a1/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/dto/Cartridge.java
----------------------------------------------------------------------
[6/7] git commit: Adding in ServiceUitls to incorporate isPublic
Posted by ni...@apache.org.
Adding in ServiceUitls to incorporate isPublic
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6fae635f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6fae635f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6fae635f
Branch: refs/heads/origin
Commit: 6fae635f173d727109fd24bfd7ecb0b590053f49
Parents: 48df048
Author: Shiro <sh...@wso2.com>
Authored: Fri Sep 19 11:40:25 2014 +0530
Committer: Shiro <sh...@wso2.com>
Committed: Fri Sep 19 11:40:25 2014 +0530
----------------------------------------------------------------------
.../apache/stratos/rest/endpoint/services/ServiceUtils.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/6fae635f/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 0da5c2e..d1ea6b9 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
@@ -64,6 +64,7 @@ import org.apache.stratos.rest.endpoint.bean.repositoryNotificationInfoBean.Payl
import org.apache.stratos.rest.endpoint.bean.subscription.domain.SubscriptionDomainBean;
import org.apache.stratos.rest.endpoint.bean.util.converter.PojoConverter;
import org.apache.stratos.rest.endpoint.exception.RestAPIException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
@@ -249,7 +250,7 @@ public class ServiceUtils {
}
public static Partition[] getAvailablePartitions() throws RestAPIException {
-
+
org.apache.stratos.cloud.controller.stub.deployment.partition.Partition[] partitions = null;
AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient();
if (autoscalerServiceClient != null) {
@@ -262,7 +263,7 @@ public class ServiceUtils {
throw new RestAPIException(errorMsg, e);
}
}
-
+
return PojoConverter.populatePartitionPojos(partitions);
}
@@ -1134,10 +1135,10 @@ public class ServiceUtils {
* @param clusterSubdomain
*/
static void deployService(String cartridgeType, String alias, String autoscalingPolicy, String deploymentPolicy,
- String tenantDomain, String tenantUsername, int tenantId, String clusterDomain, String clusterSubdomain, String tenantRange) throws RestAPIException {
+ String tenantDomain, String tenantUsername, int tenantId, String clusterDomain, String clusterSubdomain, String tenantRange, boolean isPublic) throws RestAPIException {
log.info("Deploying service..");
try {
- serviceDeploymentManager.deployService(cartridgeType, autoscalingPolicy, deploymentPolicy, tenantId, tenantRange, tenantDomain, tenantUsername);
+ serviceDeploymentManager.deployService(cartridgeType, autoscalingPolicy, deploymentPolicy, tenantId, tenantRange, tenantDomain, tenantUsername, isPublic);
} catch (Exception e) {
String msg = String.format("Failed to deploy the Service [Cartridge type] %s [alias] %s . Cause: %s", cartridgeType, alias, e.getMessage());