You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/12/13 19:25:31 UTC
stratos git commit: Changing cartridge definition class to cartridge
definition bean in all rest api cartridge methods
Repository: stratos
Updated Branches:
refs/heads/4.1.0-test b64a9c272 -> 5780b44c4
Changing cartridge definition class to cartridge definition bean in all rest api cartridge methods
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5780b44c
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5780b44c
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5780b44c
Branch: refs/heads/4.1.0-test
Commit: 5780b44c447af300f97455a58f520355a769f192
Parents: b64a9c2
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sat Dec 13 23:55:18 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sat Dec 13 23:55:18 2014 +0530
----------------------------------------------------------------------
.../rest/endpoint/api/StratosApiV40Utils.java | 7 +-
.../rest/endpoint/api/StratosApiV41.java | 21 +-
.../rest/endpoint/api/StratosApiV41Utils.java | 130 ++++++-----
.../definition/CartridgeDefinitionBean.java | 213 ++++++++++++++++---
.../cartridge/definition/PersistenceBean.java | 26 ++-
.../bean/cartridge/definition/VolumeBean.java | 76 ++++++-
.../bean/util/converter/PojoConverter.java | 78 +++----
.../stratos/rest/endpoint/mock/MockContext.java | 16 +-
.../webapp/api-test/WEB-INF/cxf-servlet.xml | 9 +-
.../src/main/webapp/api/WEB-INF/cxf-servlet.xml | 1 +
10 files changed, 412 insertions(+), 165 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/5780b44c/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
index 495ac28..c8655a9 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
@@ -30,7 +30,6 @@ import org.apache.stratos.autoscaler.stub.AutoScalerServiceInvalidPolicyExceptio
import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCartridgeDefinitionExceptionException;
import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidCartridgeTypeExceptionException;
import org.apache.stratos.cloud.controller.stub.CloudControllerServiceInvalidIaasProviderExceptionException;
-import org.apache.stratos.common.Property;
import org.apache.stratos.manager.client.AutoscalerServiceClient;
import org.apache.stratos.manager.client.CloudControllerServiceClient;
import org.apache.stratos.manager.deploy.service.Service;
@@ -86,7 +85,7 @@ public class StratosApiV40Utils {
static StratosApiResponse deployCartridge (CartridgeDefinitionBean cartridgeDefinitionBean, ConfigurationContext ctxt,
String userName, String tenantDomain) throws RestAPIException {
- log.info("Starting to deploy a Cartridge [type] "+cartridgeDefinitionBean.type);
+ log.info("Starting to deploy a Cartridge [type] "+ cartridgeDefinitionBean.getType());
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
@@ -116,12 +115,12 @@ public class StratosApiV40Utils {
throw new RestAPIException(message, e);
}
- log.info("Successfully deployed Cartridge [type] "+cartridgeDefinitionBean.type);
+ log.info("Successfully deployed Cartridge [type] "+ cartridgeDefinitionBean.getType());
}
StratosApiResponse stratosApiResponse = new StratosApiResponse();
- stratosApiResponse.setMessage("Successfully deployed cartridge definition with type " + cartridgeDefinitionBean.type);
+ stratosApiResponse.setMessage("Successfully deployed cartridge definition with type " + cartridgeDefinitionBean.getType());
return stratosApiResponse;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5780b44c/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
index 33bfdde..b23901d 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
@@ -145,7 +145,7 @@ public class StratosApiV41 extends AbstractApi {
throws RestAPIException {
StratosApiV41Utils.createCartridgeDefinition(cartridgeDefinitionBean, getConfigContext(), getUsername(),
getTenantDomain());
- URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeDefinitionBean.type).build();
+ URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeDefinitionBean.getType()).build();
return Response.created(url).build();
}
@@ -162,10 +162,13 @@ public class StratosApiV41 extends AbstractApi {
@Consumes("application/json")
@AuthorizationAction("/permission/admin/manage/view/cartridge")
public Response getCartridges() throws RestAPIException {
- List<Cartridge> cartridges = StratosApiV41Utils.getAvailableCartridges(null, null, getConfigContext());
- ResponseBuilder rb = Response.ok();
- rb.entity(cartridges.isEmpty() ? new Cartridge[0] : cartridges.toArray(new Cartridge[cartridges.size()]));
- return rb.build();
+ List<CartridgeDefinitionBean> cartridges = StratosApiV41Utils.getAvailableCartridges(null, null, getConfigContext());
+ if(cartridges == null) {
+ return Response.status(Response.Status.NOT_FOUND).build();
+ }
+ CartridgeDefinitionBean[] cartridgeArray = cartridges.isEmpty() ?
+ new CartridgeDefinitionBean[0] : cartridges.toArray(new CartridgeDefinitionBean[cartridges.size()]);
+ return Response.ok().entity(cartridgeArray).build();
}
/**
@@ -182,9 +185,11 @@ public class StratosApiV41 extends AbstractApi {
@AuthorizationAction("/permission/admin/manage/view/cartridge")
public Response getCartridgesByFilter(@DefaultValue("") @PathParam("filter") String filter,
@QueryParam("criteria") String criteria) throws RestAPIException {
- List<Cartridge> cartridges = StratosApiV41Utils.getCartridgesByFilter(filter, criteria, getConfigContext());
+ List<CartridgeDefinitionBean> cartridges = StratosApiV41Utils.
+ getCartridgesByFilter(filter, criteria, getConfigContext());
ResponseBuilder rb = Response.ok();
- rb.entity(cartridges.isEmpty() ? new Cartridge[0] : cartridges.toArray(new Cartridge[cartridges.size()]));
+ rb.entity(cartridges.isEmpty() ?
+ new CartridgeDefinitionBean[0] : cartridges.toArray(new CartridgeDefinitionBean[cartridges.size()]));
return rb.build();
}
@@ -202,7 +207,7 @@ public class StratosApiV41 extends AbstractApi {
@AuthorizationAction("/permission/admin/manage/view/cartridge")
public Response getCartridgeByFilter(@DefaultValue("") @PathParam("filter") String filter,
@PathParam("cartridgeType") String cartridgeType) throws RestAPIException {
- Cartridge cartridge = StratosApiV41Utils.getCartridgeByFilter(filter, cartridgeType, getConfigContext());
+ CartridgeDefinitionBean cartridge = StratosApiV41Utils.getCartridgeByFilter(filter, cartridgeType, getConfigContext());
ResponseBuilder rb = Response.ok();
rb.entity(cartridge);
return rb.build();
http://git-wip-us.apache.org/repos/asf/stratos/blob/5780b44c/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index 0218c71..e1fc650 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -29,6 +29,8 @@ import org.apache.stratos.autoscaler.stub.pojo.ApplicationContext;
import org.apache.stratos.cloud.controller.stub.*;
import org.apache.stratos.cloud.controller.stub.domain.CartridgeConfig;
import org.apache.stratos.cloud.controller.stub.domain.CartridgeInfo;
+import org.apache.stratos.cloud.controller.stub.domain.Persistence;
+import org.apache.stratos.cloud.controller.stub.domain.Volume;
import org.apache.stratos.manager.client.AutoscalerServiceClient;
import org.apache.stratos.manager.client.CloudControllerServiceClient;
import org.apache.stratos.manager.composite.application.beans.ApplicationDefinition;
@@ -59,7 +61,9 @@ import org.apache.stratos.rest.endpoint.bean.GroupBean;
import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.ApplicationLevelNetworkPartition;
import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.AutoscalePolicy;
import org.apache.stratos.rest.endpoint.bean.cartridge.definition.CartridgeDefinitionBean;
+import org.apache.stratos.rest.endpoint.bean.cartridge.definition.PersistenceBean;
import org.apache.stratos.rest.endpoint.bean.cartridge.definition.PropertyBean;
+import org.apache.stratos.rest.endpoint.bean.cartridge.definition.VolumeBean;
import org.apache.stratos.rest.endpoint.bean.kubernetes.KubernetesGroup;
import org.apache.stratos.rest.endpoint.bean.kubernetes.KubernetesHost;
import org.apache.stratos.rest.endpoint.bean.kubernetes.KubernetesMaster;
@@ -88,7 +92,7 @@ public class StratosApiV41Utils {
public static void createCartridgeDefinition(CartridgeDefinitionBean cartridgeDefinitionBean, ConfigurationContext ctxt,
String userName, String tenantDomain) throws RestAPIException {
- log.info("Starting to deploy a cartridge: [type] " + cartridgeDefinitionBean.type);
+ log.info("Starting to deploy a cartridge: [type] " + cartridgeDefinitionBean.getType());
CartridgeConfig cartridgeConfig = PojoConverter.populateCartridgeConfigPojo(cartridgeDefinitionBean);
if (cartridgeConfig == null) {
@@ -98,11 +102,11 @@ public class StratosApiV41Utils {
throw new RestAPIException("Category is not specified, cartridge deployment failed");
}
try {
- CartridgeDeploymentManager.getDeploymentManager(cartridgeDefinitionBean.deployerType).deploy(cartridgeConfig);
+ CartridgeDeploymentManager.getDeploymentManager(cartridgeDefinitionBean.getDeployerType()).deploy(cartridgeConfig);
} catch (ADCException e) {
throw new RestAPIException(e);
}
- log.info("Successfully deployed cartridge: [type] " + cartridgeDefinitionBean.type);
+ log.info("Successfully deployed cartridge: [type] " + cartridgeDefinitionBean.getType());
}
public static void deleteCartridgeDefinition(String cartridgeType) throws RestAPIException {
@@ -182,9 +186,9 @@ public class StratosApiV41Utils {
}
}
- public static List<Cartridge> getCartridgesByFilter(String filter, String criteria, ConfigurationContext configurationContext)
+ public static List<CartridgeDefinitionBean> getCartridgesByFilter(String filter, String criteria, ConfigurationContext configurationContext)
throws RestAPIException {
- List<Cartridge> cartridges = null;
+ List<CartridgeDefinitionBean> cartridges = null;
if (filter.equals("singleTenant")) {
cartridges = getAvailableCartridges(null, false, configurationContext);
@@ -199,12 +203,12 @@ public class StratosApiV41Utils {
return cartridges;
}
- public static Cartridge getCartridgeByFilter(String filter, String cartridgeType, ConfigurationContext configurationContext)
+ public static CartridgeDefinitionBean getCartridgeByFilter(String filter, String cartridgeType, ConfigurationContext configurationContext)
throws RestAPIException {
- List<Cartridge> cartridges = getCartridgesByFilter(filter, null, configurationContext);
+ List<CartridgeDefinitionBean> cartridges = getCartridgesByFilter(filter, null, configurationContext);
- for (Cartridge cartridge : cartridges) {
- if (cartridge.getCartridgeType().equals(cartridgeType)) {
+ for (CartridgeDefinitionBean cartridge : cartridges) {
+ if (cartridge.getType().equals(cartridgeType)) {
return cartridge;
}
}
@@ -213,13 +217,13 @@ public class StratosApiV41Utils {
throw new RestAPIException(msg);
}
- private static List<Cartridge> getAvailableLbCartridges(Boolean multiTenant,
+ private static List<CartridgeDefinitionBean> getAvailableLbCartridges(Boolean multiTenant,
ConfigurationContext configurationContext) throws RestAPIException {
- List<Cartridge> cartridges = getAvailableCartridges(null, multiTenant,
+ List<CartridgeDefinitionBean> cartridges = getAvailableCartridges(null, multiTenant,
configurationContext);
- List<Cartridge> lbCartridges = new ArrayList<Cartridge>();
- for (Cartridge cartridge : cartridges) {
- if (cartridge.isLoadBalancer()) {
+ List<CartridgeDefinitionBean> lbCartridges = new ArrayList<CartridgeDefinitionBean>();
+ for (CartridgeDefinitionBean cartridge : cartridges) {
+ if ("loadbalancer".equalsIgnoreCase(cartridge.getCategory())) {
lbCartridges.add(cartridge);
}
}
@@ -232,8 +236,8 @@ public class StratosApiV41Utils {
return lbCartridges;
}
- private static List<Cartridge> getAvailableCartridgesByProvider(String provider, ConfigurationContext configurationContext) throws RestAPIException {
- List<Cartridge> cartridges = new ArrayList<Cartridge>();
+ private static List<CartridgeDefinitionBean> getAvailableCartridgesByProvider(String provider, ConfigurationContext configurationContext) throws RestAPIException {
+ List<CartridgeDefinitionBean> cartridges = new ArrayList<CartridgeDefinitionBean>();
if (log.isDebugEnabled()) {
log.debug("Getting available cartridges. Privider name : " + provider );
@@ -268,30 +272,22 @@ public class StratosApiV41Utils {
continue;
}
- Cartridge cartridge = new Cartridge();
- cartridge.setCartridgeType(cartridgeType);
+ CartridgeDefinitionBean cartridge = new CartridgeDefinitionBean();
+ cartridge.setType(cartridgeType);
cartridge.setProvider(cartridgeInfo.getProvider());
cartridge.setCategory(cartridgeInfo.getCategory());
cartridge.setDisplayName(cartridgeInfo.getDisplayName());
cartridge.setDescription(cartridgeInfo.getDescription());
cartridge.setVersion(cartridgeInfo.getVersion());
cartridge.setMultiTenant(cartridgeInfo.getMultiTenant());
- cartridge.setHostName(cartridgeInfo.getHostName());
+ cartridge.setHost(cartridgeInfo.getHostName());
cartridge.setDefaultAutoscalingPolicy(cartridgeInfo.getDefaultAutoscalingPolicy());
cartridge.setDefaultDeploymentPolicy(cartridgeInfo.getDefaultDeploymentPolicy());
//cartridge.setStatus(CartridgeConstants.NOT_SUBSCRIBED);
- cartridge.setCartridgeAlias("-");
- cartridge.setPersistence(cartridgeInfo.getPersistence());
+ //cartridge.setCartridgeAlias("-");
+ cartridge.setPersistence(convertPersistenceToPersistenceBean(cartridgeInfo.getPersistence()));
cartridge.setServiceGroup(cartridgeInfo.getServiceGroup());
- if (cartridgeInfo.getProperties() != null) {
- for (org.apache.stratos.cloud.controller.stub.Property property : cartridgeInfo
- .getProperties()) {
- if (property.getName().equals("load.balancer")) {
- cartridge.setLoadBalancer(true);
- }
- }
- }
//cartridge.setActiveInstances(0);
cartridges.add(cartridge);
}
@@ -306,7 +302,7 @@ public class StratosApiV41Utils {
throw new RestAPIException(msg, e);
}
- Collections.sort(cartridges);
+ //Collections.sort(cartridges);
if (log.isDebugEnabled()) {
log.debug("Returning available cartridges " + cartridges.size());
@@ -315,8 +311,8 @@ public class StratosApiV41Utils {
return cartridges;
}
- public static List<Cartridge> getAvailableCartridges(String cartridgeSearchString, Boolean multiTenant, ConfigurationContext configurationContext) throws RestAPIException {
- List<Cartridge> cartridges = new ArrayList<Cartridge>();
+ public static List<CartridgeDefinitionBean> getAvailableCartridges(String cartridgeSearchString, Boolean multiTenant, ConfigurationContext configurationContext) throws RestAPIException {
+ List<CartridgeDefinitionBean> cartridges = new ArrayList<CartridgeDefinitionBean>();
if (log.isDebugEnabled()) {
log.debug("Getting available cartridges. Search String: " + cartridgeSearchString + ", Multi-Tenant: " + multiTenant);
@@ -361,32 +357,24 @@ public class StratosApiV41Utils {
continue;
}
- Cartridge cartridge = new Cartridge();
- cartridge.setCartridgeType(cartridgeType);
- cartridge.setProvider(cartridgeInfo.getProvider());
- cartridge.setCategory(cartridgeInfo.getCategory());
- cartridge.setDisplayName(cartridgeInfo.getDisplayName());
- cartridge.setDescription(cartridgeInfo.getDescription());
- cartridge.setVersion(cartridgeInfo.getVersion());
- cartridge.setMultiTenant(cartridgeInfo.getMultiTenant());
- cartridge.setHostName(cartridgeInfo.getHostName());
- cartridge.setDefaultAutoscalingPolicy(cartridgeInfo.getDefaultAutoscalingPolicy());
- cartridge.setDefaultDeploymentPolicy(cartridgeInfo.getDefaultDeploymentPolicy());
- //cartridge.setStatus(CartridgeConstants.NOT_SUBSCRIBED);
- cartridge.setCartridgeAlias("-");
- cartridge.setPersistence(cartridgeInfo.getPersistence());
- cartridge.setServiceGroup(cartridgeInfo.getServiceGroup());
-
- if (cartridgeInfo.getProperties() != null) {
- for (org.apache.stratos.cloud.controller.stub.Property property : cartridgeInfo
- .getProperties()) {
- if (property.getName().equals("load.balancer")) {
- cartridge.setLoadBalancer(true);
- }
- }
- }
- //cartridge.setActiveInstances(0);
- cartridges.add(cartridge);
+ CartridgeDefinitionBean cartridge = new CartridgeDefinitionBean();
+ cartridge.setType(cartridgeType);
+ cartridge.setProvider(cartridgeInfo.getProvider());
+ cartridge.setCategory(cartridgeInfo.getCategory());
+ cartridge.setDisplayName(cartridgeInfo.getDisplayName());
+ cartridge.setDescription(cartridgeInfo.getDescription());
+ cartridge.setVersion(cartridgeInfo.getVersion());
+ cartridge.setMultiTenant(cartridgeInfo.getMultiTenant());
+ cartridge.setHost(cartridgeInfo.getHostName());
+ cartridge.setDefaultAutoscalingPolicy(cartridgeInfo.getDefaultAutoscalingPolicy());
+ cartridge.setDefaultDeploymentPolicy(cartridgeInfo.getDefaultDeploymentPolicy());
+ //cartridge.setStatus(CartridgeConstants.NOT_SUBSCRIBED);
+ //cartridge.setCartridgeAlias("-");
+ cartridge.setPersistence(convertPersistenceToPersistenceBean(cartridgeInfo.getPersistence()));
+ cartridge.setServiceGroup(cartridgeInfo.getServiceGroup());
+
+ //cartridge.setActiveInstances(0);
+ cartridges.add(cartridge);
if (cartridgeInfo.getMultiTenant() && !allowMultipleSubscription) {
@@ -413,7 +401,7 @@ public class StratosApiV41Utils {
throw new RestAPIException(msg, e);
}
- Collections.sort(cartridges);
+ //Collections.sort(cartridges);
if (log.isDebugEnabled()) {
log.debug("Returning available cartridges " + cartridges.size());
@@ -422,6 +410,30 @@ public class StratosApiV41Utils {
return cartridges;
}
+ private static PersistenceBean convertPersistenceToPersistenceBean(Persistence persistence) {
+ if(persistence == null) {
+ return null;
+ }
+
+ PersistenceBean persistenceBean = new PersistenceBean();
+ persistenceBean.setRequired(persistence.isPersistanceRequiredSpecified());
+ persistenceBean.setVolume(convertVolumesToVolumeBeans(persistence.getVolumes()));
+ return persistenceBean;
+ }
+
+ private static List<VolumeBean> convertVolumesToVolumeBeans(Volume[] volumes) {
+ List<VolumeBean> list = new ArrayList<VolumeBean>();
+ for(Volume volume : volumes) {
+ VolumeBean volumeBean = new VolumeBean();
+ volumeBean.setId(volume.getId());
+ volumeBean.setDevice(volume.getDevice());
+ volumeBean.setSize(String.valueOf(volume.getSize()));
+ volumeBean.setSnapshotId(volume.getSnapshotId());
+ list.add(volumeBean);
+ }
+ return list;
+ }
+
private static boolean isAlreadySubscribed(String cartridgeType,
int tenantId) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/5780b44c/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 b5d346c..ad8f055 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
@@ -26,60 +26,60 @@ import java.util.List;
@XmlRootElement(name = "cartridgeDefinitionBean")
public class CartridgeDefinitionBean {
- public String type;
+ private String type;
- public String host;
+ private String host;
- public String provider;
+ private String provider;
//Four types - Application,Framework,Data,LB
- public String category;
+ private String category;
- public String displayName;
+ private String displayName;
- public String description;
+ private String description;
- public String version;
+ private String version;
- public boolean multiTenant;
+ private boolean multiTenant;
- public boolean isPublic;
+ private boolean isPublic;
- public DeploymentBean deployment;
+ private DeploymentBean deployment;
- public List<PortMappingBean> portMapping;
+ private List<PortMappingBean> portMapping;
- public PersistenceBean persistence;
+ private PersistenceBean persistence;
- public List<IaasProviderBean> iaasProvider;
+ private List<IaasProviderBean> iaasProvider;
- public List<PropertyBean> property;
+ private List<PropertyBean> property;
- public String defaultAutoscalingPolicy;
+ private String defaultAutoscalingPolicy;
- public String defaultDeploymentPolicy;
+ private String defaultDeploymentPolicy;
- public String serviceGroup;
+ private String serviceGroup;
- public ContainerBean container;
+ private ContainerBean container;
- public String deployerType;
+ private String deployerType;
private String[] exportingProperties;
public String toString () {
- return "Type: " + type + ", Provider: " + provider + ", Category: " + category+ ", Host: " + host + ", Display Name: " + displayName +
- ", Description: " + description + ", Version: " + version + ", Multitenant " + multiTenant +", Public " + isPublic + "\n" +
+ return "Type: " + getType() + ", Provider: " + getProvider() + ", Category: " + getCategory() + ", Host: " + getHost() + ", Display Name: " + getDisplayName() +
+ ", Description: " + getDescription() + ", Version: " + getVersion() + ", Multitenant " + isMultiTenant() +", Public " + isPublic() + "\n" +
getDeploymentDetails() + "\n PortMapping: " + getPortMappings() + "\n IaaS: " + getIaasProviders() +
- "\n Properties: " + getProperties() +"\n VolumeBean mappings "+ persistence.toString()
- + "\n Exports " + exportingProperties.toString();
+ "\n Properties: " + getProperties() +"\n VolumeBean mappings "+ getPersistence().toString()
+ + "\n Exports " + getExportingProperties().toString();
}
private String getDeploymentDetails () {
- if(deployment != null) {
- return deployment.toString();
+ if(getDeployment() != null) {
+ return getDeployment().toString();
}
return null;
}
@@ -87,8 +87,8 @@ public class CartridgeDefinitionBean {
private String getPortMappings () {
StringBuilder portMappingBuilder = new StringBuilder();
- if(portMapping != null && !portMapping.isEmpty()) {
- for(PortMappingBean portMappingBean : portMapping) {
+ if(getPortMapping() != null && !getPortMapping().isEmpty()) {
+ for(PortMappingBean portMappingBean : getPortMapping()) {
portMappingBuilder.append(portMappingBean.toString());
}
}
@@ -98,8 +98,8 @@ public class CartridgeDefinitionBean {
private String getIaasProviders () {
StringBuilder iaasBuilder = new StringBuilder();
- if(iaasProvider != null && !iaasProvider.isEmpty()) {
- for(IaasProviderBean iaasProviderBean : iaasProvider) {
+ if(getIaasProvider() != null && !getIaasProvider().isEmpty()) {
+ for(IaasProviderBean iaasProviderBean : getIaasProvider()) {
iaasBuilder.append(iaasProviderBean.toString());
}
}
@@ -109,8 +109,8 @@ public class CartridgeDefinitionBean {
private String getProperties () {
StringBuilder propertyBuilder = new StringBuilder();
- if(property != null) {
- for(PropertyBean propertyBean : property) {
+ if(getProperty() != null) {
+ for(PropertyBean propertyBean : getProperty()) {
propertyBuilder.append(propertyBean.name + " : " + propertyBean.value + " | ");
}
}
@@ -126,4 +126,155 @@ public class CartridgeDefinitionBean {
}
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getHost() {
+ return host;
+ }
+
+ public void setHost(String host) {
+ this.host = host;
+ }
+
+ public String getProvider() {
+ return provider;
+ }
+
+ public void setProvider(String provider) {
+ this.provider = provider;
+ }
+
+ public String getCategory() {
+ return category;
+ }
+
+ public void setCategory(String category) {
+ this.category = category;
+ }
+
+ public String getDisplayName() {
+ return displayName;
+ }
+
+ public void setDisplayName(String displayName) {
+ this.displayName = displayName;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public boolean isMultiTenant() {
+ return multiTenant;
+ }
+
+ public void setMultiTenant(boolean multiTenant) {
+ this.multiTenant = multiTenant;
+ }
+
+ public boolean isPublic() {
+ return isPublic;
+ }
+
+ public void setPublic(boolean isPublic) {
+ this.isPublic = isPublic;
+ }
+
+ public DeploymentBean getDeployment() {
+ return deployment;
+ }
+
+ public void setDeployment(DeploymentBean deployment) {
+ this.deployment = deployment;
+ }
+
+ public List<PortMappingBean> getPortMapping() {
+ return portMapping;
+ }
+
+ public void setPortMapping(List<PortMappingBean> portMapping) {
+ this.portMapping = portMapping;
+ }
+
+ public PersistenceBean getPersistence() {
+ return persistence;
+ }
+
+ public void setPersistence(PersistenceBean persistence) {
+ this.persistence = persistence;
+ }
+
+ public List<IaasProviderBean> getIaasProvider() {
+ return iaasProvider;
+ }
+
+ public void setIaasProvider(List<IaasProviderBean> iaasProvider) {
+ this.iaasProvider = iaasProvider;
+ }
+
+ public List<PropertyBean> getProperty() {
+ return property;
+ }
+
+ public void setProperty(List<PropertyBean> property) {
+ this.property = property;
+ }
+
+ public String getDefaultAutoscalingPolicy() {
+ return defaultAutoscalingPolicy;
+ }
+
+ public void setDefaultAutoscalingPolicy(String defaultAutoscalingPolicy) {
+ this.defaultAutoscalingPolicy = defaultAutoscalingPolicy;
+ }
+
+ public String getDefaultDeploymentPolicy() {
+ return defaultDeploymentPolicy;
+ }
+
+ public void setDefaultDeploymentPolicy(String defaultDeploymentPolicy) {
+ this.defaultDeploymentPolicy = defaultDeploymentPolicy;
+ }
+
+ public String getServiceGroup() {
+ return serviceGroup;
+ }
+
+ public void setServiceGroup(String serviceGroup) {
+ this.serviceGroup = serviceGroup;
+ }
+
+ public ContainerBean getContainer() {
+ return container;
+ }
+
+ public void setContainer(ContainerBean container) {
+ this.container = container;
+ }
+
+ public String getDeployerType() {
+ return deployerType;
+ }
+
+ public void setDeployerType(String deployerType) {
+ this.deployerType = deployerType;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5780b44c/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/PersistenceBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/PersistenceBean.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/PersistenceBean.java
index f36c342..96229a5 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/PersistenceBean.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/PersistenceBean.java
@@ -25,22 +25,38 @@ import java.util.List;
@XmlRootElement
public class PersistenceBean {
- public boolean isRequired;
+ private boolean isRequired;
- public List<VolumeBean> volume;
+ private List<VolumeBean> volume;
public String toString () {
- return " [ Persistence Required : " +isRequired + "\n" +
+ return " [ Persistence Required : " + isRequired() + "\n" +
"volume: " + getVolumes() + "] ";
}
private String getVolumes() {
StringBuilder volumeBuilder = new StringBuilder();
- if(volume != null && !volume.isEmpty()) {
- for(VolumeBean volumeBean : volume) {
+ if(getVolume() != null && !getVolume().isEmpty()) {
+ for(VolumeBean volumeBean : getVolume()) {
volumeBuilder.append(volumeBean.toString());
}
}
return volumeBuilder.toString();
}
+
+ public boolean isRequired() {
+ return isRequired;
+ }
+
+ public void setRequired(boolean isRequired) {
+ this.isRequired = isRequired;
+ }
+
+ public List<VolumeBean> getVolume() {
+ return volume;
+ }
+
+ public void setVolume(List<VolumeBean> volume) {
+ this.volume = volume;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5780b44c/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/VolumeBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/VolumeBean.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/VolumeBean.java
index a9d7441..3881b78 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/VolumeBean.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/cartridge/definition/VolumeBean.java
@@ -23,23 +23,79 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
public class VolumeBean {
- public String id;
+ private String id;
- public String size;
+ private String size;
- public String device;
+ private String device;
- public boolean removeOnTermination;
+ private boolean removeOnTermination;
- public String mappingPath;
+ private String mappingPath;
- public String snapshotId;
+ private String snapshotId;
- public String volumeId;
+ private String volumeId;
public String toString () {
- return " [ Persistence Required : " + ", Size: " + size + ", device: " +
- device + " remove on termination " + removeOnTermination +
- ", mappingPath : " + mappingPath + "] ";
+ return " [ Persistence Required : " + ", Size: " + getSize() + ", device: " +
+ getDevice() + " remove on termination " + isRemoveOnTermination() +
+ ", mappingPath : " + getMappingPath() + "] ";
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getSize() {
+ return size;
+ }
+
+ public void setSize(String size) {
+ this.size = size;
+ }
+
+ public String getDevice() {
+ return device;
+ }
+
+ public void setDevice(String device) {
+ this.device = device;
+ }
+
+ public boolean isRemoveOnTermination() {
+ return removeOnTermination;
+ }
+
+ public void setRemoveOnTermination(boolean removeOnTermination) {
+ this.removeOnTermination = removeOnTermination;
+ }
+
+ public String getMappingPath() {
+ return mappingPath;
+ }
+
+ public void setMappingPath(String mappingPath) {
+ this.mappingPath = mappingPath;
+ }
+
+ public String getSnapshotId() {
+ return snapshotId;
+ }
+
+ public void setSnapshotId(String snapshotId) {
+ this.snapshotId = snapshotId;
+ }
+
+ public String getVolumeId() {
+ return volumeId;
+ }
+
+ public void setVolumeId(String volumeId) {
+ this.volumeId = volumeId;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5780b44c/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 be62999..c46e711 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
@@ -96,54 +96,54 @@ public class PojoConverter {
CartridgeConfig cartridgeConfig = new CartridgeConfig();
- cartridgeConfig.setType(cartridgeDefinitionBean.type);
- cartridgeConfig.setHostName(cartridgeDefinitionBean.host);
- cartridgeConfig.setProvider(cartridgeDefinitionBean.provider);
- cartridgeConfig.setCategory(cartridgeDefinitionBean.category);
- cartridgeConfig.setVersion(cartridgeDefinitionBean.version);
- cartridgeConfig.setMultiTenant(cartridgeDefinitionBean.multiTenant);
- cartridgeConfig.setIsPublic(cartridgeDefinitionBean.isPublic);
- cartridgeConfig.setDisplayName(cartridgeDefinitionBean.displayName);
- cartridgeConfig.setDescription(cartridgeDefinitionBean.description);
- cartridgeConfig.setDefaultAutoscalingPolicy(cartridgeDefinitionBean.defaultAutoscalingPolicy);
- cartridgeConfig.setDefaultDeploymentPolicy(cartridgeDefinitionBean.defaultDeploymentPolicy);
- cartridgeConfig.setServiceGroup(cartridgeDefinitionBean.serviceGroup);
- cartridgeConfig.setDeployerType(cartridgeDefinitionBean.deployerType);
+ cartridgeConfig.setType(cartridgeDefinitionBean.getType());
+ cartridgeConfig.setHostName(cartridgeDefinitionBean.getHost());
+ cartridgeConfig.setProvider(cartridgeDefinitionBean.getProvider());
+ cartridgeConfig.setCategory(cartridgeDefinitionBean.getCategory());
+ cartridgeConfig.setVersion(cartridgeDefinitionBean.getVersion());
+ cartridgeConfig.setMultiTenant(cartridgeDefinitionBean.isMultiTenant());
+ cartridgeConfig.setIsPublic(cartridgeDefinitionBean.isPublic());
+ cartridgeConfig.setDisplayName(cartridgeDefinitionBean.getDisplayName());
+ cartridgeConfig.setDescription(cartridgeDefinitionBean.getDescription());
+ cartridgeConfig.setDefaultAutoscalingPolicy(cartridgeDefinitionBean.getDefaultAutoscalingPolicy());
+ cartridgeConfig.setDefaultDeploymentPolicy(cartridgeDefinitionBean.getDefaultDeploymentPolicy());
+ cartridgeConfig.setServiceGroup(cartridgeDefinitionBean.getServiceGroup());
+ cartridgeConfig.setDeployerType(cartridgeDefinitionBean.getDeployerType());
//deployment information
- if (cartridgeDefinitionBean.deployment != null) {
- cartridgeConfig.setBaseDir(cartridgeDefinitionBean.deployment.baseDir);
- if (cartridgeDefinitionBean.deployment.dir != null && !cartridgeDefinitionBean.deployment.dir.isEmpty()) {
- cartridgeConfig.setDeploymentDirs(cartridgeDefinitionBean.deployment.dir.
- toArray(new String[cartridgeDefinitionBean.deployment.dir.size()]));
+ if (cartridgeDefinitionBean.getDeployment() != null) {
+ cartridgeConfig.setBaseDir(cartridgeDefinitionBean.getDeployment().baseDir);
+ if (cartridgeDefinitionBean.getDeployment().dir != null && !cartridgeDefinitionBean.getDeployment().dir.isEmpty()) {
+ cartridgeConfig.setDeploymentDirs(cartridgeDefinitionBean.getDeployment().dir.
+ toArray(new String[cartridgeDefinitionBean.getDeployment().dir.size()]));
}
}
//port mapping
- if (cartridgeDefinitionBean.portMapping != null && !cartridgeDefinitionBean.portMapping.isEmpty()) {
- cartridgeConfig.setPortMappings(getPortMappingsAsArray(cartridgeDefinitionBean.portMapping));
+ if (cartridgeDefinitionBean.getPortMapping() != null && !cartridgeDefinitionBean.getPortMapping().isEmpty()) {
+ cartridgeConfig.setPortMappings(getPortMappingsAsArray(cartridgeDefinitionBean.getPortMapping()));
}
//persistance mapping
- if (cartridgeDefinitionBean.persistence != null) {
- cartridgeConfig.setPersistence(getPersistence(cartridgeDefinitionBean.persistence));
+ if (cartridgeDefinitionBean.getPersistence() != null) {
+ cartridgeConfig.setPersistence(getPersistence(cartridgeDefinitionBean.getPersistence()));
}
//IaaS
- if (cartridgeDefinitionBean.iaasProvider != null && !cartridgeDefinitionBean.iaasProvider.isEmpty()) {
- cartridgeConfig.setIaasConfigs(getIaasConfigsAsArray(cartridgeDefinitionBean.iaasProvider));
+ if (cartridgeDefinitionBean.getIaasProvider() != null && !cartridgeDefinitionBean.getIaasProvider().isEmpty()) {
+ cartridgeConfig.setIaasConfigs(getIaasConfigsAsArray(cartridgeDefinitionBean.getIaasProvider()));
}
//Properties
- if (cartridgeDefinitionBean.property != null && !cartridgeDefinitionBean.property.isEmpty()) {
- cartridgeConfig.setProperties(getCCProperties(cartridgeDefinitionBean.property));
+ if (cartridgeDefinitionBean.getProperty() != null && !cartridgeDefinitionBean.getProperty().isEmpty()) {
+ cartridgeConfig.setProperties(getCCProperties(cartridgeDefinitionBean.getProperty()));
}
if (cartridgeDefinitionBean.getExportingProperties() != null) {
cartridgeConfig.setExportingProperties(cartridgeDefinitionBean.getExportingProperties());
}
- if (cartridgeDefinitionBean.container != null) {
- cartridgeConfig.setContainer(getContainer(cartridgeDefinitionBean.container));
+ if (cartridgeDefinitionBean.getContainer() != null) {
+ cartridgeConfig.setContainer(getContainer(cartridgeDefinitionBean.getContainer()));
}
return cartridgeConfig;
@@ -224,22 +224,22 @@ public class PojoConverter {
public static Persistence getPersistence(PersistenceBean persistenceBean) {
Persistence persistence = new Persistence();
- persistence.setPersistanceRequired(persistenceBean.isRequired);
- VolumeBean[] volumeBean = new VolumeBean[persistenceBean.volume.size()];
- persistenceBean.volume.toArray(volumeBean);
- Volume[] volumes = new Volume[persistenceBean.volume.size()];
+ persistence.setPersistanceRequired(persistenceBean.isRequired());
+ VolumeBean[] volumeBean = new VolumeBean[persistenceBean.getVolume().size()];
+ persistenceBean.getVolume().toArray(volumeBean);
+ Volume[] volumes = new Volume[persistenceBean.getVolume().size()];
for (int i = 0; i < volumes.length; i++) {
Volume volume = new Volume();
- volume.setId(volumeBean[i].id);
- volume.setVolumeId(volumeBean[i].volumeId);
+ volume.setId(volumeBean[i].getId());
+ volume.setVolumeId(volumeBean[i].getVolumeId());
if (StringUtils.isEmpty(volume.getVolumeId())) {
- volume.setSize(Integer.parseInt(volumeBean[i].size));
+ volume.setSize(Integer.parseInt(volumeBean[i].getSize()));
}
- volume.setDevice(volumeBean[i].device);
- volume.setRemoveOntermination(volumeBean[i].removeOnTermination);
- volume.setMappingPath(volumeBean[i].mappingPath);
- volume.setSnapshotId(volumeBean[i].snapshotId);
+ volume.setDevice(volumeBean[i].getDevice());
+ volume.setRemoveOntermination(volumeBean[i].isRemoveOnTermination());
+ volume.setMappingPath(volumeBean[i].getMappingPath());
+ volume.setSnapshotId(volumeBean[i].getSnapshotId());
volumes[i] = volume;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/5780b44c/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 7270371..87323f8 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
@@ -72,7 +72,7 @@ public class MockContext {
int tenantId = getTenantId();
List<CartridgeDefinitionBean> tenantCartridges;
- if(!cartridgeDefinitionBean.isPublic){
+ if(!cartridgeDefinitionBean.isPublic()){
if(this.cartridgeDefinitionBeanList.containsKey(tenantId)){
tenantCartridges = this.cartridgeDefinitionBeanList.get(tenantId);
}
@@ -94,13 +94,13 @@ public class MockContext {
tenantCartridges.add(cartridgeDefinitionBean);
Cartridge cartridge = new Cartridge();
- cartridge.setCartridgeType(cartridgeDefinitionBean.type);
- cartridge.setDescription(cartridgeDefinitionBean.description);
- cartridge.setDisplayName(cartridgeDefinitionBean.displayName);
- cartridge.setMultiTenant(cartridgeDefinitionBean.multiTenant);
- cartridge.setProvider(cartridgeDefinitionBean.provider);
- cartridge.setVersion(cartridgeDefinitionBean.version);
- cartridge.setIsPublic(cartridgeDefinitionBean.isPublic);
+ cartridge.setCartridgeType(cartridgeDefinitionBean.getType());
+ cartridge.setDescription(cartridgeDefinitionBean.getDescription());
+ cartridge.setDisplayName(cartridgeDefinitionBean.getDisplayName());
+ cartridge.setMultiTenant(cartridgeDefinitionBean.isMultiTenant());
+ cartridge.setProvider(cartridgeDefinitionBean.getProvider());
+ cartridge.setVersion(cartridgeDefinitionBean.getVersion());
+ cartridge.setIsPublic(cartridgeDefinitionBean.isPublic());
Map<String,Cartridge> cartridges;
if(cartridge.isMultiTenant()){
http://git-wip-us.apache.org/repos/asf/stratos/blob/5780b44c/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/cxf-servlet.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/cxf-servlet.xml b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/cxf-servlet.xml
index 5489ba0..83cb477 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/cxf-servlet.xml
+++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api-test/WEB-INF/cxf-servlet.xml
@@ -83,8 +83,15 @@
<value>domains</value>
<value>kubernetesHost</value>
<value>cartridges</value>
+ <value>subGroups</value>
+ <value>groups</value>
+ <value>clusters</value>
<value>startupOrders</value>
- <value>dependencies</value>
+ <value>childPolicies</value>
+ <value>childLevelNetworkPartition</value>
+ <value>childLevelPartitions</value>
+ <value>networkPartition</value>
+ <value>partitions</value>
<value>instances</value>
</list>
</property>
http://git-wip-us.apache.org/repos/asf/stratos/blob/5780b44c/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
index 573e51b..9ff0275 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
+++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/api/WEB-INF/cxf-servlet.xml
@@ -127,6 +127,7 @@
<value>childLevelPartitions</value>
<value>networkPartition</value>
<value>partitions</value>
+ <value>instances</value>
</list>
</property>
</bean>