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/14 06:45:06 UTC
[2/7] stratos git commit: Moving rest api domain model to stratos
common component to be reused by the cli
http://git-wip-us.apache.org/repos/asf/stratos/blob/df2d6e6c/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
deleted file mode 100644
index 036ccf7..0000000
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
+++ /dev/null
@@ -1,1255 +0,0 @@
-/*
- * 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.bean.util.converter;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.List;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.stratos.autoscaler.stub.deployment.partition.ChildLevelNetworkPartition;
-import org.apache.stratos.autoscaler.stub.deployment.partition.ChildLevelPartition;
-import org.apache.stratos.autoscaler.stub.deployment.policy.ChildPolicy;
-import org.apache.stratos.autoscaler.stub.pojo.ApplicationContext;
-import org.apache.stratos.autoscaler.stub.pojo.CartridgeContext;
-import org.apache.stratos.autoscaler.stub.pojo.DependencyContext;
-import org.apache.stratos.autoscaler.stub.pojo.GroupContext;
-import org.apache.stratos.autoscaler.stub.pojo.SubscribableInfoContext;
-import org.apache.stratos.cloud.controller.stub.domain.CartridgeConfig;
-import org.apache.stratos.cloud.controller.stub.domain.Container;
-import org.apache.stratos.cloud.controller.stub.domain.FloatingNetwork;
-import org.apache.stratos.cloud.controller.stub.domain.FloatingNetworks;
-import org.apache.stratos.cloud.controller.stub.domain.IaasConfig;
-import org.apache.stratos.cloud.controller.stub.domain.LoadbalancerConfig;
-import org.apache.stratos.cloud.controller.stub.domain.NetworkInterface;
-import org.apache.stratos.cloud.controller.stub.domain.NetworkInterfaces;
-import org.apache.stratos.cloud.controller.stub.domain.Persistence;
-import org.apache.stratos.cloud.controller.stub.domain.PortMapping;
-import org.apache.stratos.cloud.controller.stub.domain.ServiceGroup;
-import org.apache.stratos.cloud.controller.stub.domain.Volume;
-import org.apache.stratos.common.Properties;
-import org.apache.stratos.common.Property;
-import org.apache.stratos.manager.composite.application.beans.ApplicationDefinition;
-import org.apache.stratos.manager.composite.application.beans.CartridgeDefinition;
-import org.apache.stratos.manager.composite.application.beans.GroupDefinition;
-import org.apache.stratos.manager.composite.application.beans.SubscribableInfo;
-import org.apache.stratos.manager.deploy.service.Service;
-import org.apache.stratos.manager.grouping.definitions.DependencyDefinitions;
-import org.apache.stratos.manager.grouping.definitions.ServiceGroupDefinition;
-import org.apache.stratos.manager.subscription.SubscriptionDomain;
-import org.apache.stratos.messaging.domain.applications.Application;
-import org.apache.stratos.messaging.domain.applications.Group;
-import org.apache.stratos.messaging.domain.instance.ApplicationInstance;
-import org.apache.stratos.messaging.domain.instance.ClusterInstance;
-import org.apache.stratos.messaging.domain.instance.GroupInstance;
-import org.apache.stratos.messaging.domain.topology.Cluster;
-import org.apache.stratos.rest.endpoint.bean.ApplicationBean;
-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.partition.Partition;
-import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.AutoscalePolicy;
-import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.LoadAverageThresholds;
-import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.LoadThresholds;
-import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.MemoryConsumptionThresholds;
-import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.RequestsInFlightThresholds;
-import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.deployment.DeploymentPolicy;
-import org.apache.stratos.rest.endpoint.bean.cartridge.definition.CartridgeDefinitionBean;
-import org.apache.stratos.rest.endpoint.bean.cartridge.definition.ContainerBean;
-import org.apache.stratos.rest.endpoint.bean.cartridge.definition.FloatingNetworkBean;
-import org.apache.stratos.rest.endpoint.bean.cartridge.definition.IaasProviderBean;
-import org.apache.stratos.rest.endpoint.bean.cartridge.definition.LoadBalancerBean;
-import org.apache.stratos.rest.endpoint.bean.cartridge.definition.NetworkInterfaceBean;
-import org.apache.stratos.rest.endpoint.bean.cartridge.definition.PersistenceBean;
-import org.apache.stratos.rest.endpoint.bean.cartridge.definition.PortMappingBean;
-import org.apache.stratos.rest.endpoint.bean.cartridge.definition.PropertyBean;
-import org.apache.stratos.rest.endpoint.bean.cartridge.definition.ServiceDefinitionBean;
-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;
-import org.apache.stratos.rest.endpoint.bean.kubernetes.PortRange;
-import org.apache.stratos.rest.endpoint.bean.subscription.domain.SubscriptionDomainBean;
-import org.apache.stratos.rest.endpoint.bean.topology.Instance;
-import org.apache.stratos.rest.endpoint.bean.topology.Member;
-
-public class PojoConverter {
-
- public static CartridgeConfig populateCartridgeConfigPojo(CartridgeDefinitionBean cartridgeDefinitionBean) {
-
- CartridgeConfig cartridgeConfig = new CartridgeConfig();
-
- 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.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.getPortMapping() != null && !cartridgeDefinitionBean.getPortMapping().isEmpty()) {
- cartridgeConfig.setPortMappings(getPortMappingsAsArray(cartridgeDefinitionBean.getPortMapping()));
- }
-
- //persistance mapping
- if (cartridgeDefinitionBean.getPersistence() != null) {
- cartridgeConfig.setPersistence(getPersistence(cartridgeDefinitionBean.getPersistence()));
- }
-
- //IaaS
- if (cartridgeDefinitionBean.getIaasProvider() != null && !cartridgeDefinitionBean.getIaasProvider().isEmpty()) {
- cartridgeConfig.setIaasConfigs(getIaasConfigsAsArray(cartridgeDefinitionBean.getIaasProvider()));
- }
- //Properties
- if (cartridgeDefinitionBean.getProperty() != null && !cartridgeDefinitionBean.getProperty().isEmpty()) {
- cartridgeConfig.setProperties(getCCProperties(cartridgeDefinitionBean.getProperty()));
- }
-
- if (cartridgeDefinitionBean.getExportingProperties() != null) {
- cartridgeConfig.setExportingProperties(cartridgeDefinitionBean.getExportingProperties());
- }
-
- if (cartridgeDefinitionBean.getContainer() != null) {
- cartridgeConfig.setContainer(getContainer(cartridgeDefinitionBean.getContainer()));
- }
-
- return cartridgeConfig;
- }
-
- public static ServiceGroup populateServiceGroupPojo(ServiceGroupDefinition serviceGroupDefinition) {
- ServiceGroup servicegroup = new ServiceGroup();
-
- return servicegroup;
- }
-
- private static Container getContainer(ContainerBean container) {
- Container cn = new Container();
- cn.setDockerFileRepo(container.dockerfileRepo);
- cn.setImageName(container.imageName);
- //cn.setProperties(getProperties(container.property));
- return cn;
- }
-
- private static LoadbalancerConfig getLBConfig(LoadBalancerBean loadBalancer) {
- LoadbalancerConfig lbConfig = new LoadbalancerConfig();
- lbConfig.setType(loadBalancer.type);
- if (loadBalancer.property != null && !loadBalancer.property.isEmpty()) {
- lbConfig.setProperties(getCCProperties(loadBalancer.property));
- }
- return lbConfig;
- }
-
- private static PortMapping[] getPortMappingsAsArray(List<PortMappingBean> portMappingBeans) {
-
- //convert to an array
- PortMappingBean[] portMappingBeanArray = new PortMappingBean[portMappingBeans.size()];
- portMappingBeans.toArray(portMappingBeanArray);
- PortMapping[] portMappingArray = new PortMapping[portMappingBeanArray.length];
-
- for (int i = 0; i < portMappingBeanArray.length; i++) {
- PortMapping portMapping = new PortMapping();
- portMapping.setProtocol(portMappingBeanArray[i].protocol);
- portMapping.setPort(Integer.toString(portMappingBeanArray[i].port));
- portMapping.setProxyPort(Integer.toString(portMappingBeanArray[i].proxyPort));
- portMappingArray[i] = portMapping;
- }
-
- return portMappingArray;
- }
-
- private static IaasConfig[] getIaasConfigsAsArray(List<IaasProviderBean> iaasProviderBeans) {
-
- //convert to an array
- IaasProviderBean[] iaasProviderBeansArray = new IaasProviderBean[iaasProviderBeans.size()];
- iaasProviderBeans.toArray(iaasProviderBeansArray);
- IaasConfig[] iaasConfigsArray = new IaasConfig[iaasProviderBeansArray.length];
-
- for (int i = 0; i < iaasProviderBeansArray.length; i++) {
- IaasConfig iaasConfig = new IaasConfig();
- iaasConfig.setType(iaasProviderBeansArray[i].type);
- iaasConfig.setImageId(iaasProviderBeansArray[i].imageId);
- iaasConfig.setMaxInstanceLimit(iaasProviderBeansArray[i].maxInstanceLimit);
- iaasConfig.setName(iaasProviderBeansArray[i].name);
- iaasConfig.setClassName(iaasProviderBeansArray[i].className);
- iaasConfig.setCredential(iaasProviderBeansArray[i].credential);
- iaasConfig.setIdentity(iaasProviderBeansArray[i].identity);
- iaasConfig.setProvider(iaasProviderBeansArray[i].provider);
-
- if (iaasProviderBeansArray[i].property != null && !iaasProviderBeansArray[i].property.isEmpty()) {
- //set the Properties instance to IaasConfig instance
- iaasConfig.setProperties(getCCProperties(iaasProviderBeansArray[i].property));
- }
-
- if (iaasProviderBeansArray[i].networkInterfaces != null && !iaasProviderBeansArray[i].networkInterfaces.isEmpty()) {
- iaasConfig.setNetworkInterfaces(PojoConverter.getNetworkInterfaces(iaasProviderBeansArray[i].networkInterfaces));
- }
-
- iaasConfigsArray[i] = iaasConfig;
- }
- return iaasConfigsArray;
- }
-
- public static Persistence getPersistence(PersistenceBean persistenceBean) {
- Persistence persistence = new Persistence();
- 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].getId());
- volume.setVolumeId(volumeBean[i].getVolumeId());
- if (StringUtils.isEmpty(volume.getVolumeId())) {
- volume.setSize(Integer.parseInt(volumeBean[i].getSize()));
- }
-
- volume.setDevice(volumeBean[i].getDevice());
- volume.setRemoveOntermination(volumeBean[i].isRemoveOnTermination());
- volume.setMappingPath(volumeBean[i].getMappingPath());
- volume.setSnapshotId(volumeBean[i].getSnapshotId());
-
- volumes[i] = volume;
- }
- persistence.setVolumes(volumes);
- return persistence;
-
- }
-
- public static Properties getProperties(List<PropertyBean> propertyBeans) {
-
- //convert to an array
- PropertyBean[] propertyBeansArray = new PropertyBean[propertyBeans.size()];
- propertyBeans.toArray(propertyBeansArray);
- Property[] propertyArray = new Property[propertyBeansArray.length];
-
- for (int j = 0; j < propertyBeansArray.length; j++) {
- Property property = new Property();
- property.setName(propertyBeansArray[j].name);
- property.setValue(propertyBeansArray[j].value);
- propertyArray[j] = property;
- }
-
- Properties properties = new Properties();
- properties.setProperties(propertyArray);
- return properties;
- }
-
- public static org.apache.stratos.cloud.controller.stub.Properties getCCProperties(List<PropertyBean> propertyBeans) {
-
- //convert to an array
- PropertyBean[] propertyBeansArray = new PropertyBean[propertyBeans.size()];
- propertyBeans.toArray(propertyBeansArray);
- org.apache.stratos.cloud.controller.stub.Property[] propertyArray = new org.apache.stratos.cloud.controller.stub.Property[propertyBeansArray.length];
-
- for (int j = 0; j < propertyBeansArray.length; j++) {
- org.apache.stratos.cloud.controller.stub.Property property = new org.apache.stratos.cloud.controller.stub.Property();
- property.setName(propertyBeansArray[j].name);
- property.setValue(propertyBeansArray[j].value);
- propertyArray[j] = property;
- }
-
- org.apache.stratos.cloud.controller.stub.Properties properties = new org.apache.stratos.cloud.controller.stub.Properties();
- properties.setProperties(propertyArray);
- return properties;
- }
-
-
- public static org.apache.stratos.autoscaler.stub.Properties getASProperties(List<PropertyBean> propertyBeans) {
- if (propertyBeans == null || propertyBeans.isEmpty()) {
- return null;
- }
-
- //convert to an array
- PropertyBean[] propertyBeansArray = new PropertyBean[propertyBeans.size()];
- propertyBeans.toArray(propertyBeansArray);
- org.apache.stratos.autoscaler.stub.Property[] propertyArray = new org.apache.stratos.autoscaler.stub.Property[propertyBeansArray.length];
-
- for (int j = 0; j < propertyBeansArray.length; j++) {
- org.apache.stratos.autoscaler.stub.Property property = new org.apache.stratos.autoscaler.stub.Property();
- property.setName(propertyBeansArray[j].name);
- property.setValue(propertyBeansArray[j].value);
- propertyArray[j] = property;
- }
-
- org.apache.stratos.autoscaler.stub.Properties properties = new org.apache.stratos.autoscaler.stub.Properties();
- properties.setProperties(propertyArray);
- return properties;
- }
-
- private static NetworkInterfaces getNetworkInterfaces(List<NetworkInterfaceBean> networkInterfaceBeans) {
- NetworkInterface[] networkInterfacesArray = new NetworkInterface[networkInterfaceBeans.size()];
-
- int i = 0;
- for (NetworkInterfaceBean nib : networkInterfaceBeans) {
- NetworkInterface networkInterface = new NetworkInterface();
- networkInterface.setNetworkUuid(nib.networkUuid);
- networkInterface.setFixedIp(nib.fixedIp);
- networkInterface.setPortUuid(nib.portUuid);
- if (nib.floatingNetworks != null && !nib.floatingNetworks.isEmpty()) {
- networkInterface.setFloatingNetworks(PojoConverter.getFloatingNetworks(nib.floatingNetworks));
- }
-
- networkInterfacesArray[i++] = networkInterface;
- }
-
- NetworkInterfaces networkInterfaces = new NetworkInterfaces();
- networkInterfaces.setNetworkInterfaces(networkInterfacesArray);
- return networkInterfaces;
- }
-
- private static FloatingNetworks getFloatingNetworks(List<FloatingNetworkBean> floatingNetworkBeans) {
-
- FloatingNetwork[] floatingNetworksArray = new FloatingNetwork[floatingNetworkBeans.size()];
-
- int i =0;
- for (FloatingNetworkBean floatingNetworkBean : floatingNetworkBeans) {
- FloatingNetwork floatingNetwork = new FloatingNetwork();
- floatingNetwork.setName(floatingNetworkBean.name);
- floatingNetwork.setNetworkUuid(floatingNetworkBean.networkUuid);
- floatingNetwork.setFloatingIP(floatingNetworkBean.floatingIP);
- floatingNetworksArray[i++] = floatingNetwork;
- }
-
- FloatingNetworks floatingNetworks = new FloatingNetworks();
- floatingNetworks.setFloatingNetworks(floatingNetworksArray);
- return floatingNetworks;
- }
-
- public static org.apache.stratos.autoscaler.stub.deployment.partition.Partition convertToCCPartitionPojo
- (Partition partitionBean) {
-
- org.apache.stratos.autoscaler.stub.deployment.partition.Partition partition = new
- org.apache.stratos.autoscaler.stub.deployment.partition.Partition();
-
- partition.setId(partitionBean.id);
- partition.setDescription(partitionBean.description);
- partition.setIsPublic(partitionBean.isPublic);
- partition.setProvider(partitionBean.provider);
-
- if (partitionBean.property != null && !partitionBean.property.isEmpty()) {
- partition.setProperties(getASProperties(partitionBean.property));
- }
-
- return partition;
- }
-
- public static org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy convertToCCAutoscalerPojo(AutoscalePolicy
- autoscalePolicyBean) {
-
- org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy autoscalePolicy = new
- org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy();
-
- autoscalePolicy.setId(autoscalePolicyBean.getId());
- autoscalePolicy.setDescription(autoscalePolicyBean.getDescription());
- autoscalePolicy.setIsPublic(autoscalePolicyBean.getIsPublic());
- autoscalePolicy.setDisplayName(autoscalePolicyBean.getDisplayName());
- autoscalePolicy.setInstanceRoundingFactor(autoscalePolicyBean.getInstanceRoundingFactor());
-
- if (autoscalePolicyBean.getLoadThresholds() != null) {
-
- org.apache.stratos.autoscaler.stub.autoscale.policy.LoadThresholds loadThresholds = new
- org.apache.stratos.autoscaler.stub.autoscale.policy.LoadThresholds();
-
- if (autoscalePolicyBean.getLoadThresholds().loadAverage != null) {
-
- //set load average information
- org.apache.stratos.autoscaler.stub.autoscale.policy.LoadAverageThresholds loadAverage = new
- org.apache.stratos.autoscaler.stub.autoscale.policy.LoadAverageThresholds();
- loadAverage.setUpperLimit(autoscalePolicyBean.getLoadThresholds().loadAverage.threshold);
- loadAverage.setLowerLimit(autoscalePolicyBean.getLoadThresholds().loadAverage.lowerLimit);
- //set load average
- loadThresholds.setLoadAverage(loadAverage);
- }
- if (autoscalePolicyBean.getLoadThresholds().requestsInFlight != null) {
-
- org.apache.stratos.autoscaler.stub.autoscale.policy.RequestsInFlightThresholds requestsInFlight = new
- org.apache.stratos.autoscaler.stub.autoscale.policy.RequestsInFlightThresholds();
- //set request in flight information
- requestsInFlight.setUpperLimit(autoscalePolicyBean.getLoadThresholds().requestsInFlight.threshold);
- requestsInFlight.setLowerLimit(autoscalePolicyBean.getLoadThresholds().requestsInFlight.lowerLimit);
- //set request in flight
- loadThresholds.setRequestsInFlight(requestsInFlight);
- }
- if (autoscalePolicyBean.getLoadThresholds().memoryConsumption != null) {
-
- org.apache.stratos.autoscaler.stub.autoscale.policy.MemoryConsumptionThresholds memoryConsumption = new
- org.apache.stratos.autoscaler.stub.autoscale.policy.MemoryConsumptionThresholds();
-
- //set memory consumption information
- memoryConsumption.setUpperLimit(autoscalePolicyBean.getLoadThresholds().memoryConsumption.threshold);
- memoryConsumption.setLowerLimit(autoscalePolicyBean.getLoadThresholds().memoryConsumption.lowerLimit);
- //set memory consumption
- loadThresholds.setMemoryConsumption(memoryConsumption);
- }
-
- autoscalePolicy.setLoadThresholds(loadThresholds);
- }
-
- return autoscalePolicy;
- }
-
- public static org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy convetToASDeploymentPolicyPojo(
- DeploymentPolicy deploymentPolicyBean) {
-
- org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy deploymentPolicy =
- new org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy();
-
- deploymentPolicy.setId(deploymentPolicyBean.id);
- deploymentPolicy.setDescription(deploymentPolicyBean.description);
- deploymentPolicy.setIsPublic(deploymentPolicyBean.isPublic);
- if (deploymentPolicyBean.applicationPolicy != null
- && deploymentPolicyBean.applicationPolicy.networkPartition != null
- && !deploymentPolicyBean.applicationPolicy.networkPartition.isEmpty()) {
- deploymentPolicy
- .setApplicationLevelNetworkPartitions(convertToCCPartitionGroup(deploymentPolicyBean.applicationPolicy.networkPartition));
- deploymentPolicy.setApplicationId(deploymentPolicyBean.applicationPolicy.applicationId);
- }
-
- if (deploymentPolicyBean.childPolicies != null && !deploymentPolicyBean.childPolicies.isEmpty()) {
- deploymentPolicy.setChildPolicies(convertToCCChildPolicy(deploymentPolicyBean.childPolicies));
- }
-
- return deploymentPolicy;
- }
-
- private static org.apache.stratos.autoscaler.stub.deployment.partition.ApplicationLevelNetworkPartition[] convertToCCPartitionGroup(List<ApplicationLevelNetworkPartition> networkPartitionBeans) {
-
- org.apache.stratos.autoscaler.stub.deployment.partition.ApplicationLevelNetworkPartition[]
- appNWPartitions = new
- org.apache.stratos.autoscaler.stub.deployment.partition.ApplicationLevelNetworkPartition
- [networkPartitionBeans.size()];
-
- for (int i = 0; i < networkPartitionBeans.size(); i++) {
- org.apache.stratos.autoscaler.stub.deployment.partition.ApplicationLevelNetworkPartition appNWPartition = new
- org.apache.stratos.autoscaler.stub.deployment.partition.ApplicationLevelNetworkPartition();
- appNWPartition.setId(networkPartitionBeans.get(i).id);
- appNWPartition.setActiveByDefault(networkPartitionBeans.get(i).activeByDefault);
- if (networkPartitionBeans.get(i).partitions != null && !networkPartitionBeans.get(i).partitions.isEmpty()) {
- appNWPartition.setPartitions(convertToCCPartitionPojos(networkPartitionBeans.get(i).partitions));
- }
-
- appNWPartitions[i] = appNWPartition;
- }
-
- return appNWPartitions;
- }
-
- private static ChildPolicy[] convertToCCChildPolicy(List<org.apache.stratos.rest.endpoint.bean.autoscaler.policy.deployment.ChildPolicy> childPolicies) {
-
- ChildPolicy[] childPolicies1 = new ChildPolicy[childPolicies.size()];
-
- for (int i = 0; i < childPolicies.size(); i++) {
- ChildPolicy childPolicy = new ChildPolicy();
- childPolicy.setId(childPolicies.get(i).childId);
- childPolicy.setChildLevelNetworkPartitions(convertToCCChildNetworkPartition(childPolicies.get(i).networkPartition));
-
-
- childPolicies1[i] = childPolicy;
- }
-
- return childPolicies1;
- }
-
- private static ChildLevelNetworkPartition[] convertToCCChildNetworkPartition(List<org.apache.stratos.rest.endpoint.bean.autoscaler.partition.ChildLevelNetworkPartition> networkPartitions) {
-
- ChildLevelNetworkPartition[] childLevelNetworkPartitions = new ChildLevelNetworkPartition[networkPartitions.size()];
-
- for (int i = 0; i < networkPartitions.size(); i++) {
- ChildLevelNetworkPartition childLevelNetworkPartition = new ChildLevelNetworkPartition();
- childLevelNetworkPartition.setId(networkPartitions.get(i).id);
- childLevelNetworkPartition.setPartitionAlgo(networkPartitions.get(i).partitionAlgo);
- childLevelNetworkPartition.setChildLevelPartitions(convertToCCChildPartitionPojos(networkPartitions.get(i).partitions));
-
- childLevelNetworkPartitions[i] = childLevelNetworkPartition;
- }
-
- return childLevelNetworkPartitions;
- }
-
- public static org.apache.stratos.rest.endpoint.bean.topology.Cluster populateClusterPojos(Cluster cluster, String alias) {
- org.apache.stratos.rest.endpoint.bean.topology.Cluster cluster1 = new
- org.apache.stratos.rest.endpoint.bean.topology.Cluster();
- cluster1.alias = alias;
- cluster1.serviceName = cluster.getServiceName();
- cluster1.clusterId = cluster.getClusterId();
- cluster1.isLbCluster = cluster.isLbCluster();
- cluster1.tenantRange = cluster.getTenantRange();
- cluster1.property = getPropertyBeans(cluster.getProperties());
- cluster1.member = new ArrayList<Member>();
- cluster1.hostNames = new ArrayList<String>();
- Collection<ClusterInstance> clusterInstances = cluster.getClusterInstances();
- List<org.apache.stratos.rest.endpoint.bean.topology.Instance> instancesList =
- new ArrayList<org.apache.stratos.rest.endpoint.bean.topology.Instance>();
- if (clusterInstances != null) {
- for (ClusterInstance clusterInstance : clusterInstances) {
- org.apache.stratos.rest.endpoint.bean.topology.Instance instance =
- new org.apache.stratos.rest.endpoint.bean.topology.Instance();
- instance.instanceId = clusterInstance.getInstanceId();
- instance.status = clusterInstance.getStatus().toString();
- instancesList.add(instance);
- }
- cluster1.setInstances(instancesList);
- }
-
- for (org.apache.stratos.messaging.domain.topology.Member tmp : cluster.getMembers()) {
- Member member = new Member();
- member.clusterId = tmp.getClusterId();
- member.lbClusterId = tmp.getLbClusterId();
- member.networkPartitionId = tmp.getNetworkPartitionId();
- member.partitionId = tmp.getPartitionId();
- member.memberId = tmp.getMemberId();
- if (tmp.getMemberIp() == null) {
- member.memberIp = "NULL";
- } else {
- member.memberIp = tmp.getMemberIp();
- }
- if (tmp.getMemberPublicIp() == null) {
- member.memberPublicIp = "NULL";
- } else {
- member.memberPublicIp = tmp.getMemberPublicIp();
- }
- member.serviceName = tmp.getServiceName();
- member.status = tmp.getStatus().toString();
- member.property = getPropertyBeans(tmp.getProperties());
- cluster1.member.add(member);
- }
-
- for (String tmp1 : cluster.getHostNames()) {
- cluster1.hostNames.add(tmp1);
- }
-
- return cluster1;
- }
-
- private static org.apache.stratos.autoscaler.stub.deployment.partition.Partition[] convertToCCPartitionPojos
- (List<Partition> partitionList) {
-
- org.apache.stratos.autoscaler.stub.deployment.partition.Partition[] partitions =
- new org.apache.stratos.autoscaler.stub.deployment.partition.Partition[partitionList.size()];
- for (int i = 0; i < partitionList.size(); i++) {
- partitions[i] = convertToCCPartitionPojo(partitionList.get(i));
- }
-
- return partitions;
- }
-
- private static ChildLevelPartition[] convertToCCChildPartitionPojos
- (List<org.apache.stratos.rest.endpoint.bean.autoscaler.partition.ChildLevelPartition> partitionList) {
-
- ChildLevelPartition[] childLevelPartitions = new ChildLevelPartition[partitionList.size()];
- for (int i = 0; i < partitionList.size(); i++) {
- ChildLevelPartition childLevelPartition = new ChildLevelPartition();
- childLevelPartition.setPartitionId(partitionList.get(i).id);
- childLevelPartition.setMax(partitionList.get(i).max);
-
- childLevelPartitions[i] = childLevelPartition;
- }
-
- return childLevelPartitions;
- }
-
- public static Partition[] populatePartitionPojos(org.apache.stratos.cloud.controller.stub.domain.Partition[]
- partitions) {
-
- Partition[] partitionBeans;
- if (partitions == null) {
- partitionBeans = new Partition[0];
- return partitionBeans;
- }
-
- partitionBeans = new Partition[partitions.length];
- for (int i = 0; i < partitions.length; i++) {
- partitionBeans[i] = populatePartitionPojo(partitions[i]);
- }
- return partitionBeans;
- }
-
- public static Partition populatePartitionPojo(org.apache.stratos.cloud.controller.stub.domain.Partition
- partition) {
-
- Partition partitionBeans = new Partition();
- if (partition == null) {
- return partitionBeans;
- }
-
- partitionBeans.id = partition.getId();
- partitionBeans.description = partition.getDescription();
- partitionBeans.isPublic = partition.getIsPublic();
- partitionBeans.provider = partition.getProvider();
- /*partitionBeans.partitionMin = partition.getPartitionMin();
- partitionBeans.partitionMax = partition.getPartitionMax();*/
- //properties
- if (partition.getProperties() != null) {
- List<PropertyBean> propertyBeans = getPropertyBeans(partition.getProperties());
- partitionBeans.property = propertyBeans;
- }
-
- return partitionBeans;
- }
-
- public static List<SubscriptionDomainBean> populateSubscriptionDomainPojos(List<SubscriptionDomain> subscriptionDomains) {
-
- List<SubscriptionDomainBean> subscriptionDomainBeans = new ArrayList<SubscriptionDomainBean>();
-
- if (subscriptionDomains == null) {
- return subscriptionDomainBeans;
- }
-
- for (SubscriptionDomain subscriptionDomain : subscriptionDomains) {
- subscriptionDomainBeans.add(populateSubscriptionDomainPojo(subscriptionDomain));
- }
-
- return subscriptionDomainBeans;
- }
-
- public static SubscriptionDomainBean populateSubscriptionDomainPojo(SubscriptionDomain subscriptionDomain) {
-
- SubscriptionDomainBean subscriptionDomainBean = new SubscriptionDomainBean();
-
- if (subscriptionDomain == null) {
- return subscriptionDomainBean;
- }
- subscriptionDomainBean.domainName = subscriptionDomain.getDomainName();
- subscriptionDomainBean.applicationContext = subscriptionDomain.getApplicationContext();
-
- return subscriptionDomainBean;
- }
-
- private static List<PropertyBean> getPropertyBeans(Properties properties) {
-
- List<PropertyBean> propertyBeans = null;
- if (properties.getProperties() != null && properties.getProperties().length != 0) {
- Property[] propertyArr = properties.getProperties();
- propertyBeans = new ArrayList<PropertyBean>();
- for (int i = 0; i < propertyArr.length; i++) {
- PropertyBean propertyBean = new PropertyBean();
- propertyBean.name = propertyArr[i].getName();
- propertyBean.value = propertyArr[i].getValue();
- propertyBeans.add(propertyBean);
- }
- }
- return propertyBeans;
- }
-
- private static List<PropertyBean> getPropertyBeans(org.apache.stratos.cloud.controller.stub.Properties properties) {
-
- List<PropertyBean> propertyBeans = null;
- if (properties.getProperties() != null && properties.getProperties().length != 0) {
- org.apache.stratos.cloud.controller.stub.Property[] propertyArr = properties.getProperties();
- propertyBeans = new ArrayList<PropertyBean>();
- for (int i = 0; i < propertyArr.length; i++) {
- PropertyBean propertyBean = new PropertyBean();
- propertyBean.name = propertyArr[i].getName();
- propertyBean.value = propertyArr[i].getValue();
- propertyBeans.add(propertyBean);
- }
- }
- return propertyBeans;
- }
-
- private static List<PropertyBean> getPropertyBeans(java.util.Properties properties) {
-
- List<PropertyBean> propertyBeans = null;
- if (properties != null && !properties.isEmpty()) {
- Enumeration<?> e = properties.propertyNames();
- propertyBeans = new ArrayList<PropertyBean>();
-
- while (e.hasMoreElements()) {
- String key = (String) e.nextElement();
- String value = properties.getProperty(key);
- PropertyBean propertyBean = new PropertyBean();
- propertyBean.name = key;
- propertyBean.value = value;
- propertyBeans.add(propertyBean);
- }
- }
- return propertyBeans;
- }
-
- public static AutoscalePolicy[] populateAutoscalePojos(org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy[]
- autoscalePolicies) {
-
- AutoscalePolicy[] autoscalePolicyBeans;
- if (autoscalePolicies == null) {
- autoscalePolicyBeans = new AutoscalePolicy[0];
- return autoscalePolicyBeans;
- }
-
- autoscalePolicyBeans = new AutoscalePolicy[autoscalePolicies.length];
- for (int i = 0; i < autoscalePolicies.length; i++) {
- autoscalePolicyBeans[i] = populateAutoscalePojo(autoscalePolicies[i]);
- }
- return autoscalePolicyBeans;
- }
-
- public static AutoscalePolicy populateAutoscalePojo(org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy
- autoscalePolicy) {
- if (autoscalePolicy == null) {
- return null;
- }
-
- AutoscalePolicy autoscalePolicyBean = new AutoscalePolicy();
- autoscalePolicyBean.setId(autoscalePolicy.getId());
- autoscalePolicyBean.setDescription(autoscalePolicy.getDescription());
- autoscalePolicyBean.setIsPublic(autoscalePolicy.getIsPublic());
- autoscalePolicyBean.setDisplayName(autoscalePolicy.getDisplayName());
- autoscalePolicyBean.setDescription(autoscalePolicy.getDescription());
- autoscalePolicyBean.setInstanceRoundingFactor(autoscalePolicy.getInstanceRoundingFactor());
- if (autoscalePolicy.getLoadThresholds() != null) {
- autoscalePolicyBean.setLoadThresholds(populateLoadThresholds(autoscalePolicy.getLoadThresholds()));
- }
-
- return autoscalePolicyBean;
- }
-
- private static LoadThresholds populateLoadThresholds(org.apache.stratos.autoscaler.stub.autoscale.policy.LoadThresholds
- loadThresholds) {
-
- LoadThresholds loadThresholdBean = new LoadThresholds();
- if (loadThresholds.getLoadAverage() != null) {
- LoadAverageThresholds loadAverage = new LoadAverageThresholds();
- loadAverage.threshold = loadThresholds.getLoadAverage().getUpperLimit();
- loadAverage.lowerLimit = loadThresholds.getLoadAverage().getLowerLimit();
- loadThresholdBean.loadAverage = loadAverage;
- }
- if (loadThresholds.getMemoryConsumption() != null) {
- MemoryConsumptionThresholds memoryConsumption = new MemoryConsumptionThresholds();
- memoryConsumption.threshold = loadThresholds.getMemoryConsumption().getUpperLimit();
- memoryConsumption.lowerLimit = loadThresholds.getMemoryConsumption().getLowerLimit();
- loadThresholdBean.memoryConsumption = memoryConsumption;
- }
- if (loadThresholds.getRequestsInFlight() != null) {
- RequestsInFlightThresholds requestsInFlight = new RequestsInFlightThresholds();
- requestsInFlight.threshold = loadThresholds.getRequestsInFlight().getUpperLimit();
- requestsInFlight.lowerLimit = loadThresholds.getRequestsInFlight().getLowerLimit();
- loadThresholdBean.requestsInFlight = requestsInFlight;
- }
-
- return loadThresholdBean;
- }
-
- public static DeploymentPolicy[] populateDeploymentPolicyPojos(org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy[]
- deploymentPolicies) {
- DeploymentPolicy[] deploymentPolicyBeans;
- if (deploymentPolicies == null) {
- return null;
- }
-
- deploymentPolicyBeans = new DeploymentPolicy[deploymentPolicies.length];
- for (int i = 0; i < deploymentPolicies.length; i++) {
- deploymentPolicyBeans[i] = populateDeploymentPolicyPojo(deploymentPolicies[i]);
- }
-
- return deploymentPolicyBeans;
- }
-
- public static DeploymentPolicy populateDeploymentPolicyPojo(org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy
- deploymentPolicy) {
-
- DeploymentPolicy deploymentPolicyBean = new DeploymentPolicy();
- if (deploymentPolicy == null) {
- return deploymentPolicyBean;
- }
-
- deploymentPolicyBean.description = deploymentPolicy.getDescription();
- deploymentPolicyBean.isPublic = deploymentPolicy.getIsPublic();
-//TODO populate the Network partition based on new policy structure
-// if (deploymentPolicy.getApplicationLevelNetworkPartition() != null && deploymentPolicy.getApplicationLevelNetworkPartition().length > 0) {
-// deploymentPolicyBean.setPartitionGroup(Arrays.asList(populatePartitionGroupPojos(deploymentPolicy.getApplicationLevelNetworkPartition())));
-// }
-
- /*if (deploymentPolicy.getAllPartitions() != null && deploymentPolicy.getAllPartitions().length > 0) {
- deploymentPolicyBean.partition = Arrays.asList(populatePartitionPojos(deploymentPolicy.getAllPartitions()));
- }*/
-
- return deploymentPolicyBean;
- }
-
- public static ApplicationLevelNetworkPartition populatePartitionGroupPojo(org.apache.stratos.autoscaler.stub.deployment.partition.ApplicationLevelNetworkPartition
- partitionGroup) {
-
- ApplicationLevelNetworkPartition networkPartitionBean = new ApplicationLevelNetworkPartition();
- if (partitionGroup == null) {
- return networkPartitionBean;
- }
-
- networkPartitionBean.id = partitionGroup.getId();
- //FIXME update with new deployment policy pattern
-// networkPartitionBean.partitionAlgo = partitionGroup.getPartitionAlgo();
-// if (partitionGroup.getPartitions() != null && partitionGroup.getPartitions().length > 0) {
-// partitionGroupBean.partition = getPartitionList(partitionGroup.getPartitions());
-// }
-
- return networkPartitionBean;
- }
-
- public static ApplicationLevelNetworkPartition[] populatePartitionGroupPojos(org.apache.stratos.autoscaler.stub.deployment.partition.ApplicationLevelNetworkPartition[] partitionGroups) {
-
- ApplicationLevelNetworkPartition[] networkPartitionGroupsBeans;
- if (partitionGroups == null) {
- networkPartitionGroupsBeans = new ApplicationLevelNetworkPartition[0];
- return networkPartitionGroupsBeans;
- }
-
- networkPartitionGroupsBeans = new ApplicationLevelNetworkPartition[partitionGroups.length];
-
- for (int i = 0; i < partitionGroups.length; i++) {
- networkPartitionGroupsBeans[i] = populatePartitionGroupPojo(partitionGroups[i]);
- }
-
- return networkPartitionGroupsBeans;
- }
-
- private static List<Partition> getPartitionList(org.apache.stratos.cloud.controller.stub.domain.Partition[]
- partitions) {
-
- List<Partition> partitionList = new ArrayList<Partition>();
- 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();*/
- if (partitions[i].getProperties() != null) {
- partition.property = getPropertyBeans(partitions[i].getProperties());
- }
- partitionList.add(partition);
- }
-
- return partitionList;
- }
-
- public static ServiceDefinitionBean convertToServiceDefinitionBean(Service service) {
-
- ServiceDefinitionBean serviceDefinitionBean = new ServiceDefinitionBean();
- serviceDefinitionBean.setCartridgeType(service.getType());
- serviceDefinitionBean.setTenantRange(service.getTenantRange());
- serviceDefinitionBean.setClusterDomain(service.getClusterId());
- serviceDefinitionBean.setIsPublic(service.getIsPublic());
- serviceDefinitionBean.setAutoscalingPolicyName(service.getAutoscalingPolicyName());
- serviceDefinitionBean.setDeploymentPolicyName(service.getDeploymentPolicyName());
-
- return serviceDefinitionBean;
- }
-
- public static List<ServiceDefinitionBean> convertToServiceDefinitionBeans(Collection<Service> services) {
-
- List<ServiceDefinitionBean> serviceDefinitionBeans = new ArrayList<ServiceDefinitionBean>();
-
- for (Service service : services) {
- serviceDefinitionBeans.add(convertToServiceDefinitionBean(service));
- }
- return serviceDefinitionBeans;
- }
-
- public static org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesGroup convertToCCKubernetesGroupPojo(KubernetesGroup kubernetesGroupBean) {
-
- org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesGroup kubernetesGroup = new
- org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesGroup();
-
- kubernetesGroup.setGroupId(kubernetesGroupBean.getGroupId());
- kubernetesGroup.setDescription(kubernetesGroupBean.getDescription());
- kubernetesGroup.setKubernetesMaster(convertToCCKubernetesMasterPojo(kubernetesGroupBean.getKubernetesMaster()));
- kubernetesGroup.setPortRange(convertToASPortRange(kubernetesGroupBean.getPortRange()));
- kubernetesGroup.setKubernetesHosts(convertToASKubernetesHostsPojo(kubernetesGroupBean.getKubernetesHosts()));
- kubernetesGroup.setProperties((getCCProperties(kubernetesGroupBean.getProperty())));
-
- return kubernetesGroup;
- }
-
- private static org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesHost[] convertToASKubernetesHostsPojo(List<KubernetesHost> kubernetesHosts) {
- if (kubernetesHosts == null || kubernetesHosts.isEmpty()) {
- return null;
- }
- int kubernetesHostCount = kubernetesHosts.size();
- org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesHost[]
- kubernetesHostsArr = new org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesHost[kubernetesHostCount];
- for (int i = 0; i < kubernetesHostCount; i++) {
- KubernetesHost kubernetesHostBean = kubernetesHosts.get(i);
- kubernetesHostsArr[i] = convertToCCKubernetesHostPojo(kubernetesHostBean);
- }
- return kubernetesHostsArr;
- }
-
-
- private static org.apache.stratos.cloud.controller.stub.kubernetes.PortRange convertToASPortRange(PortRange portRangeBean) {
- if (portRangeBean == null) {
- return null;
- }
- org.apache.stratos.cloud.controller.stub.kubernetes.PortRange
- portRange = new org.apache.stratos.cloud.controller.stub.kubernetes.PortRange();
- portRange.setLower(portRangeBean.getLower());
- portRange.setUpper(portRangeBean.getUpper());
- return portRange;
- }
-
- public static org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesHost convertToCCKubernetesHostPojo(KubernetesHost kubernetesHostBean) {
- if (kubernetesHostBean == null) {
- return null;
- }
-
- org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesHost
- kubernetesHost = new org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesHost();
- kubernetesHost.setHostId(kubernetesHostBean.getHostId());
- kubernetesHost.setHostIpAddress(kubernetesHostBean.getHostIpAddress());
- kubernetesHost.setHostname(kubernetesHostBean.getHostname());
- kubernetesHost.setProperties(getCCProperties(kubernetesHostBean.getProperty()));
-
- return kubernetesHost;
- }
-
- public static org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesMaster convertToCCKubernetesMasterPojo(KubernetesMaster kubernetesMasterBean) {
- if (kubernetesMasterBean == null) {
- return null;
- }
-
- org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesMaster
- kubernetesMaster = new org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesMaster();
- kubernetesMaster.setHostId(kubernetesMasterBean.getHostId());
- kubernetesMaster.setHostIpAddress(kubernetesMasterBean.getHostIpAddress());
- kubernetesMaster.setHostname(kubernetesMasterBean.getHostname());
- kubernetesMaster.setEndpoint(kubernetesMasterBean.getEndpoint());
- kubernetesMaster.setProperties(getCCProperties(kubernetesMasterBean.getProperty()));
-
- return kubernetesMaster;
- }
-
- public static KubernetesGroup[] populateKubernetesGroupsPojo(org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesGroup[] kubernetesGroups) {
-
- if (kubernetesGroups == null) {
- return null;
- }
- KubernetesGroup[] kubernetesGroupsBean = new KubernetesGroup[kubernetesGroups.length];
- for (int i = 0; i < kubernetesGroups.length; i++) {
- kubernetesGroupsBean[i] = populateKubernetesGroupPojo(kubernetesGroups[i]);
- }
- return kubernetesGroupsBean;
- }
-
- public static KubernetesGroup populateKubernetesGroupPojo(org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesGroup kubernetesGroup) {
- if (kubernetesGroup == null) {
- return null;
- }
- KubernetesGroup kubernetesGroupBean = new KubernetesGroup();
- kubernetesGroupBean.setGroupId(kubernetesGroup.getGroupId());
- kubernetesGroupBean.setDescription(kubernetesGroup.getDescription());
- kubernetesGroupBean.setPortRange(populatePortRangePojo(kubernetesGroup.getPortRange()));
- kubernetesGroupBean.setKubernetesHosts(populateKubernetesHostsPojo(kubernetesGroup.getKubernetesHosts()));
- kubernetesGroupBean.setKubernetesMaster(populateKubernetesMasterPojo(kubernetesGroup.getKubernetesMaster()));
- kubernetesGroupBean.setProperty(populateCCProperties(kubernetesGroup.getProperties()));
- return kubernetesGroupBean;
- }
-
- public static KubernetesMaster populateKubernetesMasterPojo(org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesMaster kubernetesMaster) {
- if (kubernetesMaster == null) {
- return null;
- }
- KubernetesMaster kubernetesMasterBean = new KubernetesMaster();
- kubernetesMasterBean.setHostId(kubernetesMaster.getHostId());
- kubernetesMasterBean.setHostname(kubernetesMaster.getHostname());
- kubernetesMasterBean.setHostIpAddress(kubernetesMaster.getHostIpAddress());
- kubernetesMasterBean.setProperty(populateCCProperties(kubernetesMaster.getProperties()));
- kubernetesMasterBean.setEndpoint(kubernetesMaster.getEndpoint());
- return kubernetesMasterBean;
- }
-
- public static List<KubernetesHost> populateKubernetesHostsPojo(org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesHost[] kubernetesHosts) {
- if (kubernetesHosts == null) {
- return null;
- }
- List<KubernetesHost> kubernetesHostList = new ArrayList<KubernetesHost>();
- for (int i = 0; i < kubernetesHosts.length; i++) {
- kubernetesHostList.add(populateKubernetesHostPojo(kubernetesHosts[i]));
- }
- return kubernetesHostList;
- }
-
- private static KubernetesHost populateKubernetesHostPojo(org.apache.stratos.cloud.controller.stub.kubernetes.KubernetesHost kubernetesHost) {
- if (kubernetesHost == null) {
- return null;
- }
- KubernetesHost kubernetesHostBean = new KubernetesHost();
- kubernetesHostBean.setHostId(kubernetesHost.getHostId());
- kubernetesHostBean.setHostname(kubernetesHost.getHostname());
- kubernetesHostBean.setHostIpAddress(kubernetesHost.getHostIpAddress());
- kubernetesHostBean.setProperty(populateCCProperties(kubernetesHost.getProperties()));
- return kubernetesHostBean;
- }
-
- private static List<PropertyBean> populateASProperties(org.apache.stratos.autoscaler.stub.Properties properties) {
- if (properties == null || properties.getProperties() == null) {
- return null;
- }
- List<PropertyBean> propertyBeanList = new ArrayList<PropertyBean>();
- for (int i = 0; i < properties.getProperties().length; i++) {
- propertyBeanList.add(populateASProperty(properties.getProperties()[i]));
- }
- return propertyBeanList;
- }
-
- private static List<PropertyBean> populateCCProperties(org.apache.stratos.cloud.controller.stub.Properties properties) {
- if (properties == null || properties.getProperties() == null) {
- return null;
- }
- List<PropertyBean> propertyBeanList = new ArrayList<PropertyBean>();
- for (int i = 0; i < properties.getProperties().length; i++) {
- propertyBeanList.add(populateCCProperty(properties.getProperties()[i]));
- }
- return propertyBeanList;
- }
-
- private static PropertyBean populateASProperty(org.apache.stratos.autoscaler.stub.Property propertyE) {
- if (propertyE == null) {
- return null;
- }
- PropertyBean propertyBean = new PropertyBean();
- propertyBean.name = propertyE.getName();
- propertyBean.value = propertyE.getValue();
- return propertyBean;
- }
-
- private static PropertyBean populateCCProperty(org.apache.stratos.cloud.controller.stub.Property propertyE) {
- if (propertyE == null) {
- return null;
- }
- PropertyBean propertyBean = new PropertyBean();
- propertyBean.name = propertyE.getName();
- propertyBean.value = propertyE.getValue();
- return propertyBean;
- }
-
- private static PortRange populatePortRangePojo(org.apache.stratos.cloud.controller.stub.kubernetes.PortRange portRange) {
- if (portRange == null) {
- return null;
- }
- PortRange portRangeBean = new PortRange();
- portRangeBean.setUpper(portRange.getUpper());
- portRangeBean.setLower(portRange.getLower());
- return portRangeBean;
- }
-
- public static ApplicationContext convertApplicationBeanToApplicationContext(ApplicationDefinition compositeAppDefinition) {
-
- org.apache.stratos.autoscaler.stub.pojo.ApplicationContext applicationContext =
- new org.apache.stratos.autoscaler.stub.pojo.ApplicationContext();
- applicationContext.setApplicationId(compositeAppDefinition.getApplicationId());
- applicationContext.setAlias(compositeAppDefinition.getAlias());
- //applicationContext.setDeploymentPolicy(compositeAppDefinition.getDeploymentPolicy());
-
- // convert and set components
- if (compositeAppDefinition.getComponents() != null) {
- org.apache.stratos.autoscaler.stub.pojo.ComponentContext componentContext =
- new org.apache.stratos.autoscaler.stub.pojo.ComponentContext();
-
- // top level Groups
- if (compositeAppDefinition.getComponents().getGroups() != null) {
- componentContext.setGroupContexts(getgroupContextArrayFromGroupDefinitions(compositeAppDefinition.getComponents().getGroups()));
- }
- // top level dependency information
- if (compositeAppDefinition.getComponents().getDependencies() != null) {
- componentContext.setDependencyContext(getDependencyContextFromDependencyDefinition(compositeAppDefinition.getComponents().getDependencies()));
- }
- // top level cartridge context information
- if (compositeAppDefinition.getComponents().getCartridges() != null) {
- componentContext.setCartridgeContexts(getCartridgeContextArrayFromCartridgeDefinition(compositeAppDefinition.getComponents().getCartridges()));
- }
-
- applicationContext.setComponents(componentContext);
- }
-
-
- return applicationContext;
- }
-
- private static CartridgeContext[] getCartridgeContextArrayFromCartridgeDefinition(
- List<CartridgeDefinition> cartridges) {
-
- CartridgeContext[] cartridgeContextArray = new CartridgeContext[cartridges.size()];
- int i = 0;
- for (CartridgeDefinition cartridgeDefinition : cartridges) {
- CartridgeContext context = new CartridgeContext();
- context.setCartridgeMax(cartridgeDefinition.getCartridgeMax());
- context.setCartridgeMin(cartridgeDefinition.getCartridgeMin());
- context.setType(cartridgeDefinition.getType());
- context.setSubscribableInfoContext(convertSubscribableInfo(cartridgeDefinition.getSubscribableInfo()));
- cartridgeContextArray[i++] = context;
- }
-
- return cartridgeContextArray;
- }
-
- private static SubscribableInfoContext convertSubscribableInfo(
- SubscribableInfo subscribableInfo) {
- SubscribableInfoContext infoContext = new SubscribableInfoContext();
- infoContext.setAlias(subscribableInfo.getAlias());
- infoContext.setAutoscalingPolicy(subscribableInfo.getAutoscalingPolicy());
- infoContext.setDependencyAliases(subscribableInfo.getDependencyAliases());
- infoContext.setDeploymentPolicy(subscribableInfo.getDeploymentPolicy());
- infoContext.setMaxMembers(subscribableInfo.getMaxMembers());
- infoContext.setMinMembers(subscribableInfo.getMinMembers());
- //infoContext.setPrivateRepo(subscribableInfo.getpr);
- infoContext.setRepoPassword(subscribableInfo.getRepoPassword());
- infoContext.setRepoUrl(subscribableInfo.getRepoUrl());
- infoContext.setRepoUsername(subscribableInfo.getRepoUsername());
- infoContext.setProperties(convertProperties(subscribableInfo.getProperty()));
-
- return infoContext;
- }
-
- private static org.apache.stratos.autoscaler.stub.Properties convertProperties(
- List<org.apache.stratos.manager.composite.application.beans.PropertyBean> property) {
- org.apache.stratos.autoscaler.stub.Properties prop = new org.apache.stratos.autoscaler.stub.Properties();
- if (property != null) {
- for (org.apache.stratos.manager.composite.application.beans.PropertyBean propertyBean : property) {
- org.apache.stratos.autoscaler.stub.Property p = new org.apache.stratos.autoscaler.stub.Property();
- p.setName(propertyBean.getName());
- p.setValue(propertyBean.getValue());
- prop.addProperties(p);
- }
- }
- return prop;
- }
-
-
- private static DependencyContext getDependencyContextFromDependencyDefinition(DependencyDefinitions dependencyDefinitions) {
-
- DependencyContext dependencyContext = new DependencyContext();
- dependencyContext.setTerminationBehaviour(dependencyDefinitions.getTerminationBehaviour());
-
- if (dependencyDefinitions != null){
-
- if(dependencyDefinitions.getStartupOrders() != null) {
- String[] startupOrders = new String[dependencyDefinitions.getStartupOrders().size()];
- startupOrders = dependencyDefinitions.getStartupOrders().toArray(startupOrders);
- dependencyContext.setStartupOrdersContexts(startupOrders);
- }
- if (dependencyDefinitions.getScalingDependants() != null) {
- String[] scalingDependents = new String[dependencyDefinitions.getScalingDependants().size()];
- scalingDependents = dependencyDefinitions.getScalingDependants().toArray(scalingDependents);
- dependencyContext.setScalingDependents(scalingDependents);
- }
- }
-
-
-
- return dependencyContext;
- }
-
- private static org.apache.stratos.autoscaler.stub.pojo.GroupContext[]
- getgroupContextArrayFromGroupDefinitions(List<GroupDefinition> groupDefinitions) {
-
- GroupContext[] groupContexts = new GroupContext[groupDefinitions.size()];
- int i = 0;
- for (GroupDefinition groupDefinition : groupDefinitions) {
- GroupContext groupContext = new GroupContext();
- groupContext.setName(groupDefinition.getName());
- groupContext.setAlias(groupDefinition.getAlias());
- groupContext.setGroupMaxInstances(groupDefinition.getGroupMaxInstances());
- groupContext.setGroupMinInstances(groupDefinition.getGroupMinInstances());
- groupContext.setGroupScalingEnabled(groupDefinition.isGroupScalingEnabled);
-
- // Groups
- if (groupDefinition.getGroups() != null) {
- groupContext.setGroupContexts(getgroupContextArrayFromGroupDefinitions(groupDefinition.getGroups()));
- }
-
- groupContext.setCartridgeContexts(getCartridgeContextArrayFromCartridgeDefinition(groupDefinition.getCartridges()));
- groupContexts[i++] = groupContext;
- }
-
- return groupContexts;
- }
-
-
- public static ApplicationBean applicationToBean(Application application) {
- if (application == null) {
- return null;
- }
-
- ApplicationBean applicationBean = new ApplicationBean();
- applicationBean.setId(application.getUniqueIdentifier());
- applicationBean.setTenantDomain(application.getTenantDomain());
- applicationBean.setTenantAdminUsername(application.getTenantAdminUserName());
- applicationBean.setInstances(setApplicationInstances(application));
- return applicationBean;
- }
-
- private static List<Instance> setApplicationInstances(
- Application application) {
- List<Instance> applicationInstanceList = new ArrayList<Instance>();
- Collection<ApplicationInstance> applicationInstancesInTopology =
- application.getInstanceIdToInstanceContextMap().values();
-
- if(applicationInstancesInTopology != null) {
- for (ApplicationInstance applicationInstance : applicationInstancesInTopology) {
- Instance instance = new Instance();
- instance.instanceId = applicationInstance.getInstanceId();
- instance.status = applicationInstance.getStatus().toString();
- applicationInstanceList.add(instance);
- }
- }
-
- return applicationInstanceList;
- }
-
- public static GroupBean toGroupBean(Group group) {
- if (group == null) {
- return null;
- }
-
- GroupBean groupBean = new GroupBean();
- groupBean.setInstances(setGroupInstances(group));
- groupBean.setAlias(group.getUniqueIdentifier());
- groupBean.setAutoScalingPolicy(group.getAutoscalingPolicy());
- return groupBean;
- }
-
- private static List<Instance> setGroupInstances(Group group) {
- List<Instance> instanceList = new ArrayList<Instance>();
- Collection<GroupInstance> instancesInTopology = group.getInstanceIdToInstanceContextMap().values();
- if(instancesInTopology != null) {
- for (GroupInstance groupInstance : instancesInTopology) {
- Instance instance = new Instance();
- instance.status = groupInstance.getStatus().toString();
- instance.instanceId = groupInstance.getInstanceId();
- instanceList.add(instance);
- }
- }
-
- return instanceList;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/df2d6e6c/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/type/list/ListType.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/type/list/ListType.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/type/list/ListType.java
deleted file mode 100644
index 36b0930..0000000
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/type/list/ListType.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.bean.util.type.list;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.List;
-
-@XmlRootElement(name = "List")
-public class ListType<T> {
-
- private List<T> list;
-
- @XmlElement(name="Item")
- public List<T> getList() {
- return list;
- }
-
- public void setList(List<T> list) {
- this.list = list;
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/df2d6e6c/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/type/map/MapAdapter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/type/map/MapAdapter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/type/map/MapAdapter.java
deleted file mode 100644
index 9545a5a..0000000
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/type/map/MapAdapter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.bean.util.type.map;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import java.util.HashMap;
-import java.util.Map;
-
-public class MapAdapter<S, T> extends XmlAdapter<MapType,Map<S, T>> {
-
- @Override
- public MapType marshal(Map<S, T> v) throws Exception {
-
- MapType mapType = new MapType();
-
- for(Map.Entry entry : v.entrySet()) {
- MapEntryType myMapEntryType = new MapEntryType();
- myMapEntryType.key = entry.getKey();
- myMapEntryType.value = entry.getValue();
- mapType.entry.add(myMapEntryType);
- }
- return mapType;
- }
-
- @Override
- public Map<S, T> unmarshal(MapType v) throws Exception {
-
- Map hashMap = new HashMap();
-
- for(MapEntryType mapEntryType : v.entry) {
- hashMap.put(mapEntryType.key, mapEntryType.value);
- }
- return hashMap;
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/df2d6e6c/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/type/map/MapEntryType.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/type/map/MapEntryType.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/type/map/MapEntryType.java
deleted file mode 100644
index e9bb344..0000000
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/type/map/MapEntryType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.bean.util.type.map;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlValue;
-
-public class MapEntryType <S,T> {
-
- @XmlAttribute
- public S key;
-
- @XmlValue
- public T value;
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/df2d6e6c/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/type/map/MapType.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/type/map/MapType.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/type/map/MapType.java
deleted file mode 100644
index 3fdd63f..0000000
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/type/map/MapType.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.bean.util.type.map;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class MapType {
-
- public List<MapEntryType> entry = new ArrayList<MapEntryType>();
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/df2d6e6c/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 87323f8..4e4269f 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
@@ -22,19 +22,19 @@ import org.apache.stratos.common.beans.TenantInfoBean;
import org.apache.stratos.manager.dto.Cartridge;
import org.apache.stratos.manager.dto.SubscriptionInfo;
import org.apache.stratos.manager.subscription.SubscriptionDomain;
-import org.apache.stratos.manager.user.mgt.beans.UserInfoBean;
-import org.apache.stratos.rest.endpoint.bean.CartridgeInfoBean;
-import org.apache.stratos.rest.endpoint.bean.StratosApiResponse;
-import org.apache.stratos.rest.endpoint.bean.SubscriptionDomainRequest;
-import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.ApplicationLevelNetworkPartition;
-import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.Partition;
-import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.AutoscalePolicy;
-import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.deployment.DeploymentPolicy;
-import org.apache.stratos.rest.endpoint.bean.cartridge.definition.CartridgeDefinitionBean;
-import org.apache.stratos.rest.endpoint.bean.cartridge.definition.ServiceDefinitionBean;
-import org.apache.stratos.rest.endpoint.bean.subscription.domain.SubscriptionDomainBean;
-import org.apache.stratos.rest.endpoint.bean.topology.Cluster;
-import org.apache.stratos.rest.endpoint.bean.util.converter.PojoConverter;
+import org.apache.stratos.common.beans.UserInfoBean;
+import org.apache.stratos.common.beans.CartridgeInfoBean;
+import org.apache.stratos.common.beans.StratosApiResponse;
+import org.apache.stratos.common.beans.SubscriptionDomainRequest;
+import org.apache.stratos.common.beans.autoscaler.partition.ApplicationLevelNetworkPartition;
+import org.apache.stratos.common.beans.autoscaler.partition.Partition;
+import org.apache.stratos.common.beans.autoscaler.policy.autoscale.AutoscalePolicy;
+import org.apache.stratos.common.beans.autoscaler.policy.deployment.DeploymentPolicy;
+import org.apache.stratos.common.beans.cartridge.definition.CartridgeDefinitionBean;
+import org.apache.stratos.common.beans.cartridge.definition.ServiceDefinitionBean;
+import org.apache.stratos.common.beans.subscription.domain.SubscriptionDomainBean;
+import org.apache.stratos.common.beans.topology.Cluster;
+import org.apache.stratos.rest.endpoint.util.converter.PojoConverter;
import org.apache.stratos.rest.endpoint.exception.RestAPIException;
import org.wso2.carbon.context.CarbonContext;
import java.util.*;
@@ -493,7 +493,7 @@ public class MockContext {
int tenantId = getTenantId();
Map<String,Partition> partitions;
- if(!partition.isPublic){
+ if(!partition.isPublic()){
if (partitionMap.containsKey(tenantId)){
partitions = partitionMap.get(tenantId);
}
@@ -512,7 +512,7 @@ public class MockContext {
}
}
- partitions.put(partition.id, partition);
+ partitions.put(partition.getId(), partition);
StratosApiResponse stratosApiResponse = new StratosApiResponse();
stratosApiResponse.setMessage("Successfully deployed partition");
return stratosApiResponse;
@@ -551,7 +551,7 @@ public class MockContext {
int tenantId = getTenantId();
Map<String,DeploymentPolicy> policies;
- if(!deploymentPolicy.isPublic){
+ if(!deploymentPolicy.isPublic()){
if (deploymentPolicyMap.containsKey(tenantId)){
policies = deploymentPolicyMap.get(tenantId);
}
@@ -570,7 +570,7 @@ public class MockContext {
}
}
- policies.put(deploymentPolicy.applicationPolicy.applicationId+UUID.randomUUID().getLeastSignificantBits(),deploymentPolicy);
+ policies.put(deploymentPolicy.getApplicationPolicy().getApplicationId() +UUID.randomUUID().getLeastSignificantBits(),deploymentPolicy);
StratosApiResponse stratosApiResponse = new StratosApiResponse();
stratosApiResponse.setMessage("Successfully deployed deployment policy definition");
return stratosApiResponse;
@@ -622,7 +622,7 @@ public class MockContext {
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).applicationPolicy.networkPartition.get(0).partitions.toArray(new Partition[0]);
+ return (deploymentPolicyMap.get(PUBLIC_DEFINITION)).get(deploymentPolicyId).getApplicationPolicy().getNetworkPartition().get(0).getPartitions().toArray(new Partition[0]);
}
}
@@ -631,7 +631,7 @@ public class MockContext {
}
//FIXME to parse thr all the NW partitions
return (deploymentPolicyMap.get(tenantId)).
- get(deploymentPolicyId).applicationPolicy.networkPartition.get(0).partitions.toArray(new Partition[0]);
+ get(deploymentPolicyId).getApplicationPolicy().getNetworkPartition().get(0).getPartitions().toArray(new Partition[0]);
}
public ApplicationLevelNetworkPartition[] getPartitionGroups(String deploymentPolicyId) throws RestAPIException{
@@ -644,14 +644,14 @@ public class MockContext {
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).applicationPolicy.networkPartition.toArray(new ApplicationLevelNetworkPartition[0]);
+ return (deploymentPolicyMap.get(PUBLIC_DEFINITION)).get(deploymentPolicyId).getApplicationPolicy().getNetworkPartition().toArray(new ApplicationLevelNetworkPartition[0]);
}
}
if(!(deploymentPolicyMap.get(tenantId)).containsKey(deploymentPolicyId)){
throw new RestAPIException(Status.NO_CONTENT,"There is no deployment policy with id: " + deploymentPolicyId);
}
- return (deploymentPolicyMap.get(tenantId)).get(deploymentPolicyId).applicationPolicy.networkPartition.toArray(new ApplicationLevelNetworkPartition[0]);
+ return (deploymentPolicyMap.get(tenantId)).get(deploymentPolicyId).getApplicationPolicy().getNetworkPartition().toArray(new ApplicationLevelNetworkPartition[0]);
}
public AutoscalePolicy[] getAutoscalePolicies() throws RestAPIException{
@@ -813,9 +813,9 @@ public class MockContext {
}
Partition[] partitions = null;
- for(ApplicationLevelNetworkPartition networkPartition : deploymentPolicy.applicationPolicy.networkPartition){
- if(networkPartition.id.equals(partitionGroupId)){
- partitions = networkPartition.partitions.toArray(new Partition[0]);
+ for(ApplicationLevelNetworkPartition networkPartition : deploymentPolicy.getApplicationPolicy().getNetworkPartition()){
+ if(networkPartition.getId().equals(partitionGroupId)){
+ partitions = networkPartition.getPartitions().toArray(new Partition[0]);
}
}
if(partitions == null){
@@ -861,9 +861,9 @@ public class MockContext {
} else {
list = new ArrayList<SubscriptionDomain>();
}
- for (org.apache.stratos.rest.endpoint.bean.subscription.domain.SubscriptionDomainBean bean : request.domains) {
+ for (org.apache.stratos.common.beans.subscription.domain.SubscriptionDomainBean bean : request.getDomains()) {
- SubscriptionDomain subscriptionDomain = new SubscriptionDomain(bean.domainName, bean.applicationContext);
+ SubscriptionDomain subscriptionDomain = new SubscriptionDomain(bean.getDomainName(), bean.getApplicationContext());
list.add(subscriptionDomain);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/df2d6e6c/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosApiV40Mock.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosApiV40Mock.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosApiV40Mock.java
index 6cfc2d7..f2578de 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosApiV40Mock.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosApiV40Mock.java
@@ -27,21 +27,21 @@ import org.apache.stratos.common.beans.TenantInfoBean;
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.user.mgt.beans.UserInfoBean;
+import org.apache.stratos.common.beans.UserInfoBean;
import org.apache.stratos.rest.endpoint.Utils;
import org.apache.stratos.rest.endpoint.annotation.AuthorizationAction;
import org.apache.stratos.rest.endpoint.annotation.SuperTenantService;
-import org.apache.stratos.rest.endpoint.bean.CartridgeInfoBean;
-import org.apache.stratos.rest.endpoint.bean.StratosApiResponse;
-import org.apache.stratos.rest.endpoint.bean.SubscriptionDomainRequest;
-import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.ApplicationLevelNetworkPartition;
-import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.Partition;
-import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.AutoscalePolicy;
-import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.deployment.DeploymentPolicy;
-import org.apache.stratos.rest.endpoint.bean.cartridge.definition.CartridgeDefinitionBean;
-import org.apache.stratos.rest.endpoint.bean.cartridge.definition.ServiceDefinitionBean;
-import org.apache.stratos.rest.endpoint.bean.subscription.domain.SubscriptionDomainBean;
-import org.apache.stratos.rest.endpoint.bean.topology.Cluster;
+import org.apache.stratos.common.beans.CartridgeInfoBean;
+import org.apache.stratos.common.beans.StratosApiResponse;
+import org.apache.stratos.common.beans.SubscriptionDomainRequest;
+import org.apache.stratos.common.beans.autoscaler.partition.ApplicationLevelNetworkPartition;
+import org.apache.stratos.common.beans.autoscaler.partition.Partition;
+import org.apache.stratos.common.beans.autoscaler.policy.autoscale.AutoscalePolicy;
+import org.apache.stratos.common.beans.autoscaler.policy.deployment.DeploymentPolicy;
+import org.apache.stratos.common.beans.cartridge.definition.CartridgeDefinitionBean;
+import org.apache.stratos.common.beans.cartridge.definition.ServiceDefinitionBean;
+import org.apache.stratos.common.beans.subscription.domain.SubscriptionDomainBean;
+import org.apache.stratos.common.beans.topology.Cluster;
import org.apache.stratos.rest.endpoint.exception.RestAPIException;
import java.util.List;