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 2015/03/25 02:23:54 UTC
[09/10] stratos git commit: Refactoring and improvements
Refactoring and improvements
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b0e3a996
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b0e3a996
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b0e3a996
Branch: refs/heads/master
Commit: b0e3a9963c36852df17d3661c148de4deded38e3
Parents: 6952d07
Author: Vishanth <vi...@gmail.com>
Authored: Tue Mar 24 21:12:12 2015 +0530
Committer: Vishanth <vi...@gmail.com>
Committed: Tue Mar 24 21:12:12 2015 +0530
----------------------------------------------------------------------
.../applications/ApplicationUtils.java | 102 +--
.../parser/DefaultApplicationParser.java | 39 +-
.../context/CloudControllerContext.java | 42 +-
.../services/CloudControllerService.java | 2 +-
.../impl/CloudControllerServiceImpl.java | 2 +-
.../controller/util/CloudControllerUtil.java | 45 --
.../client/CloudControllerServiceClient.java | 4 +-
.../rest/endpoint/api/StratosApiV40Utils.java | 2 +-
.../rest/endpoint/api/StratosApiV41Utils.java | 12 +-
.../main/resources/CloudControllerService.wsdl | 735 +++++++++----------
10 files changed, 433 insertions(+), 552 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/b0e3a996/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java
index 8b224f5..f9999bb 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java
@@ -38,6 +38,8 @@ public class ApplicationUtils {
private static final Log log = LogFactory.getLog(ApplicationUtils.class);
public static final String TOKEN_PAYLOAD_PARAM_NAME = "TOKEN";
+ public static final String DEPLOYMENT = "DEPLOYMENT";
+ public static final String PAYLOAD_PARAMETER = "payload_parameter.";
private static Pattern ALIAS_PATTERN = Pattern.compile("([a-z0-9]+([-][a-z0-9])*)+");
public static boolean isAliasValid (String alias) {
@@ -72,71 +74,6 @@ public class ApplicationUtils {
return globalProperties;
}
-// public static MetaDataHolder getClusterLevelPayloadData (String appId, String groupName, int tenantId, String key,
-// String hostname, String tenantRange, String clusterId,
-// SubscribableContext subscribableCtxt,
-// SubscribableInfoContext subscribableInfoCtxt,
-// Cartridge cartridge) {
-//
-// MetaDataHolder metaDataHolder;
-// if (groupName != null) {
-// metaDataHolder = new MetaDataHolder(appId, groupName, clusterId);
-// } else {
-// metaDataHolder = new MetaDataHolder(appId, clusterId);
-// }
-//
-// Properties clusterLevelPayloadProperties = new Properties();
-// // app id
-// clusterLevelPayloadProperties.setProperty("APP_ID", appId);
-// // group name
-// if (groupName != null) {
-// clusterLevelPayloadProperties.setProperty("GROUP_NAME", groupName);
-// }
-// // service name
-// if (subscribableCtxt.getType() != null) {
-// clusterLevelPayloadProperties.put("SERVICE_NAME", subscribableCtxt.getType());
-// }
-// // host name
-// if (hostname != null) {
-// clusterLevelPayloadProperties.put("HOST_NAME", hostname);
-// }
-// // multi tenant
-// clusterLevelPayloadProperties.put("MULTITENANT", String.valueOf(cartridge.isMultiTenant()));
-// // tenant range
-// if (tenantRange != null) {
-// clusterLevelPayloadProperties.put("TENANT_RANGE", tenantRange);
-// }
-// // cartridge alias
-// if (subscribableCtxt.getAlias() != null) {
-// clusterLevelPayloadProperties.put("CARTRIDGE_ALIAS", subscribableCtxt.getAlias());
-// }
-// // cluster id
-// if (clusterId != null) {
-// clusterLevelPayloadProperties.put("CLUSTER_ID", clusterId);
-// }
-// // repo url
-// if (subscribableInfoCtxt.getRepoUrl() != null) {
-// clusterLevelPayloadProperties.put("REPO_URL", subscribableInfoCtxt.getRepoUrl());
-// }
-// // ports
-//// if (createPortMappingPayloadString(cartridge) != null) {
-//// clusterLevelPayloadProperties.put("PORTS", createPortMappingPayloadString(cartridge));
-//// }
-// // provider
-// if (cartridge.getProvider() != null) {
-// clusterLevelPayloadProperties.put("PROVIDER", cartridge.getProvider());
-// }
-// // tenant id
-// clusterLevelPayloadProperties.setProperty("TENANT_ID", String.valueOf(tenantId));
-// // cartridge key
-// clusterLevelPayloadProperties.setProperty("CARTRIDGE_KEY", key);
-// // get global payload params
-// //clusterLevelPayloadProperties.putAll(ApplicationUtils.getGlobalPayloadData());
-//
-// metaDataHolder.setProperties(clusterLevelPayloadProperties);
-// return metaDataHolder;
-// }
-
private static String createPortMappingPayloadString (Cartridge cartridge) {
// port mappings
@@ -191,27 +128,27 @@ public class ApplicationUtils {
return payloadBuilder;
}
- public static PayloadData createPayload(String appId, String groupName, Cartridge cartridgeInfo, String subscriptionKey, int tenantId, String clusterId,
+ public static PayloadData createPayload(String appId, String groupName, Cartridge cartridge, String subscriptionKey, int tenantId, String clusterId,
String hostName, String repoUrl, String alias, Map<String, String> customPayloadEntries, String[] dependencyAliases,
org.apache.stratos.common.Properties properties, String oauthToken,String[] dependencyClusterIDs,
String[] exportMetadata, String[] importMetadata)
throws ApplicationDefinitionException {
//Create the payload
- BasicPayloadData basicPayloadData = createBasicPayload(appId, groupName, cartridgeInfo, subscriptionKey,
+ BasicPayloadData basicPayloadData = createBasicPayload(appId, groupName, cartridge, subscriptionKey,
clusterId, hostName, repoUrl, alias, tenantId, dependencyAliases, dependencyClusterIDs,exportMetadata,importMetadata);
//Populate the basic payload details
basicPayloadData.populatePayload();
- PayloadData payloadData = PayloadFactory.getPayloadDataInstance(cartridgeInfo.getProvider(),
- cartridgeInfo.getType(), basicPayloadData);
+ PayloadData payloadData = PayloadFactory.getPayloadDataInstance(cartridge.getProvider(),
+ cartridge.getType(), basicPayloadData);
- // get the payload parameters defined in the cartridgeInfo definition file for this cartridgeInfo type
+ // get the payload parameters defined in the cartridge definition file for this cartridge type
- if (cartridgeInfo.getProperties() != null) {
- if (cartridgeInfo.getProperties().getProperties() != null && cartridgeInfo.getProperties().getProperties().length != 0) {
+ if (cartridge.getProperties() != null) {
+ if (cartridge.getProperties().getProperties() != null && cartridge.getProperties().getProperties().length != 0) {
- org.apache.stratos.common.Properties cartridgeProps = AutoscalerUtil.toCommonProperties(cartridgeInfo.getProperties().getProperties());
+ org.apache.stratos.common.Properties cartridgeProps = AutoscalerUtil.toCommonProperties(cartridge.getProperties().getProperties());
if (cartridgeProps != null) {
@@ -222,14 +159,14 @@ public class ApplicationUtils {
// so the payload param name will
// be taken as the substring from the index of '.' to the
// end of the property name.
- if (propertyEntry.getName().startsWith("payload_parameter.")) {
- String payloadParamName = propertyEntry.getName();
- String payloadParamSubstring = payloadParamName.substring(payloadParamName.indexOf(".") + 1);
- if ("DEPLOYMENT".equals(payloadParamSubstring)) {
- payloadData.getBasicPayloadData().setDeployment(payloadParamSubstring);
+ if (propertyEntry.getName().startsWith(PAYLOAD_PARAMETER)) {
+ String propertyName = propertyEntry.getName();
+ String payloadParamName = propertyName.substring(propertyName.indexOf(".") + 1);
+ if (DEPLOYMENT.equals(payloadParamName)) {
+ payloadData.getBasicPayloadData().setDeployment(payloadParamName);
continue;
}
- payloadData.add(payloadParamSubstring, propertyEntry.getValue());
+ payloadData.add(payloadParamName, propertyEntry.getValue());
}
}
}
@@ -240,7 +177,7 @@ public class ApplicationUtils {
// get subscription payload parameters (MB_IP, MB_PORT so on) and set them to payload (kubernetes scenario)
if (properties != null && properties.getProperties() != null && properties.getProperties().length != 0) {
for (Property property : properties.getProperties()) {
- if (property.getName().startsWith("payload_parameter.")) {
+ if (property.getName().startsWith(PAYLOAD_PARAMETER)) {
String payloadParamName = property.getName();
String payloadParamSubstring = payloadParamName.substring(payloadParamName.indexOf(".") + 1);
payloadData.add(payloadParamSubstring, property.getValue());
@@ -303,11 +240,6 @@ public class ApplicationUtils {
basicPayloadData.setDependencyClusterIDs(dependencyCLusterIDs);
basicPayloadData.setExportMetadataKeys(exportMetadata);
basicPayloadData.setImportMetadataKeys(importMetadata);
-// if(cartridge.getExportingProperties() != null){
-// basicPayloadData.setExportingProperties(cartridge.getExportingProperties());
-// log.info("testing1 getExportingProperties " + cartridge.getExportingProperties());
-//
-// }
return basicPayloadData;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b0e3a996/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
index 577b4d5..99b6385 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
@@ -30,19 +30,16 @@ import org.apache.stratos.autoscaler.applications.MTClusterInformation;
import org.apache.stratos.autoscaler.applications.STClusterInformation;
import org.apache.stratos.autoscaler.applications.payload.PayloadData;
import org.apache.stratos.autoscaler.applications.pojo.*;
-import org.apache.stratos.autoscaler.client.CloudControllerClient;
import org.apache.stratos.autoscaler.client.IdentityApplicationManagementServiceClient;
import org.apache.stratos.autoscaler.client.OAuthAdminServiceClient;
import org.apache.stratos.autoscaler.exception.AutoScalerException;
import org.apache.stratos.autoscaler.exception.application.ApplicationDefinitionException;
-import org.apache.stratos.autoscaler.exception.cartridge.CartridgeInformationException;
import org.apache.stratos.autoscaler.pojo.ServiceGroup;
import org.apache.stratos.autoscaler.pojo.policy.PolicyManager;
import org.apache.stratos.autoscaler.pojo.policy.autoscale.AutoscalePolicy;
import org.apache.stratos.autoscaler.registry.RegistryManager;
import org.apache.stratos.autoscaler.util.AutoscalerConstants;
import org.apache.stratos.autoscaler.util.AutoscalerUtil;
-import org.apache.stratos.cloud.controller.stub.CloudControllerServiceCartridgeNotFoundExceptionException;
import org.apache.stratos.cloud.controller.stub.domain.Cartridge;
import org.apache.stratos.common.Properties;
import org.apache.stratos.common.client.CloudControllerServiceClient;
@@ -359,13 +356,13 @@ public class DefaultApplicationParser implements ApplicationParser {
SubscribableInfoContext subscribableInfoContext = cartridgeContext.getSubscribableInfoContext();
String subscriptionAlias = subscribableInfoContext.getAlias();
- Cartridge cartridgeInfo = getCartridge(cartridgeType);
- if(cartridgeInfo == null) {
+ Cartridge cartridge = getCartridge(cartridgeType);
+ if(cartridge == null) {
throw new RuntimeException("Cartridge not found: " + cartridgeType);
}
// Add metadata keys defined in cartridges as export metadata keys
- String[] metadataKeys = cartridgeInfo.getMetadataKeys();
+ String[] metadataKeys = cartridge.getMetadataKeys();
if (metadataKeys != null) {
for (String str : metadataKeys) {
if(!StringUtils.isBlank(str)) {
@@ -377,13 +374,13 @@ public class DefaultApplicationParser implements ApplicationParser {
// get hostname and cluster id
ClusterInformation clusterInfo;
- if (cartridgeInfo.getMultiTenant()) {
+ if (cartridge.getMultiTenant()) {
clusterInfo = new MTClusterInformation();
} else {
clusterInfo = new STClusterInformation();
}
- String hostname = clusterInfo.getHostName(appId, subscriptionAlias, cartridgeInfo.getHostName());
+ String hostname = clusterInfo.getHostName(appId, subscriptionAlias, cartridge.getHostName());
String clusterId = clusterInfo.getClusterId(appId, subscriptionAlias, cartridgeType);
String repoUrl = null;
if (subscribableInfoContext.getArtifactRepositoryContext() != null) {
@@ -437,13 +434,13 @@ public class DefaultApplicationParser implements ApplicationParser {
arrImportMetadata = importMetadataKeys.toArray(arrImportMetadata);
// Find tenant range of cluster
- String tenantRange = AutoscalerUtil.findTenantRange(tenantId, cartridgeInfo.getTenantPartitions());
+ String tenantRange = AutoscalerUtil.findTenantRange(tenantId, cartridge.getTenantPartitions());
Boolean isLB=false;
- if(cartridgeInfo.getCategory().equals("lb")){
+ if(cartridge.getCategory().equals("lb")){
isLB=true;
}
// create and collect this cluster's information
- ApplicationClusterContext appClusterCtxt = createApplicationClusterContext(appId, groupName, cartridgeInfo,
+ ApplicationClusterContext appClusterCtxt = createApplicationClusterContext(appId, groupName, cartridge,
key, tenantId, repoUrl, subscriptionAlias, clusterId, hostname,
subscribableInfoContext.getDeploymentPolicy(), isLB,
tenantRange, subscribableInfoContext.getDependencyAliases(),
@@ -489,17 +486,17 @@ public class DefaultApplicationParser implements ApplicationParser {
SubscribableInfoContext subscribableInfoContext = cartridgeContext.getSubscribableInfoContext();
String subscriptionAlias = subscribableInfoContext.getAlias();
- // check if a cartridgeInfo with relevant type is already deployed. else, can't continue
- Cartridge cartridgeInfo = getCartridge(cartridgeType);
- if (cartridgeInfo == null) {
+ // check if a cartridge with relevant type is already deployed. else, can't continue
+ Cartridge cartridge = getCartridge(cartridgeType);
+ if (cartridge == null) {
handleError("No deployed Cartridge found with type [ " + cartridgeType +
" ] for Composite Application");
}
// get hostname and cluster id
ClusterInformation clusterInfo;
- assert cartridgeInfo != null;
- if (cartridgeInfo.getMultiTenant()) {
+ assert cartridge != null;
+ if (cartridge.getMultiTenant()) {
clusterInfo = new MTClusterInformation();
} else {
clusterInfo = new STClusterInformation();
@@ -921,7 +918,7 @@ public class DefaultApplicationParser implements ApplicationParser {
*
* @param appId Application id
* @param groupName Group name
- * @param cartridgeInfo Cartridge information
+ * @param cartridge Cartridge information
* @param subscriptionKey Generated key for the Application
* @param tenantId Tenant Id of the tenant which deployed the Application
* @param repoUrl Repository URL
@@ -934,7 +931,7 @@ public class DefaultApplicationParser implements ApplicationParser {
* @return ApplicationClusterContext object with relevant information
* @throws ApplicationDefinitionException If any error occurs
*/
- private ApplicationClusterContext createApplicationClusterContext(String appId, String groupName, Cartridge cartridgeInfo,
+ private ApplicationClusterContext createApplicationClusterContext(String appId, String groupName, Cartridge cartridge,
String subscriptionKey, int tenantId, String repoUrl,
String alias, String clusterId, String hostname,
String deploymentPolicy, boolean isLB, String tenantRange,
@@ -943,12 +940,12 @@ public class DefaultApplicationParser implements ApplicationParser {
throws ApplicationDefinitionException {
// Create text payload
- PayloadData payloadData = ApplicationUtils.createPayload(appId, groupName, cartridgeInfo, subscriptionKey, tenantId, clusterId,
+ PayloadData payloadData = ApplicationUtils.createPayload(appId, groupName, cartridge, subscriptionKey, tenantId, clusterId,
hostname, repoUrl, alias, null, dependencyAliases, properties, oauthToken, dependencyClustorIDs,exportMetadata,importMetadata);
String textPayload = payloadData.toString();
log.debug("Payload :: " + textPayload);
- return new ApplicationClusterContext(cartridgeInfo.getType(), clusterId, hostname, textPayload, deploymentPolicy, isLB, tenantRange, dependencyClustorIDs);
+ return new ApplicationClusterContext(cartridge.getType(), clusterId, hostname, textPayload, deploymentPolicy, isLB, tenantRange, dependencyClustorIDs);
}
public String createToken(String applicationId) throws AutoScalerException {
@@ -989,7 +986,7 @@ public class DefaultApplicationParser implements ApplicationParser {
private Cartridge getCartridge(String cartridgeType) throws ApplicationDefinitionException {
try {
- return CloudControllerServiceClient.getInstance().getCartridgeInfo(cartridgeType);
+ return CloudControllerServiceClient.getInstance().getCartridge(cartridgeType);
} catch (Exception e) {
throw new ApplicationDefinitionException(e);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b0e3a996/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
index 2b361c4..928460e 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
@@ -61,7 +61,7 @@ public class CloudControllerContext implements Serializable {
private static final String CC_CARTRIDGE_TYPE_TO_PARTITION_IDS_MAP = "CC_CARTRIDGE_TYPE_TO_PARTITION_IDS_MAP";
private static final String CC_CARTRIDGE_TYPE_TO_CARTRIDGES_MAP = "CC_CARTRIDGE_TYPE_TO_CARTRIDGES_MAP";
private static final String CC_SERVICE_GROUP_NAME_TO_SERVICE_GROUP_MAP = "CC_SERVICE_GROUP_NAME_TO_SERVICE_GROUP_MAP";
- private static final String CC_DEPLOYMENT_POLICY_ID_TO_DEPLOYEMENT_POLICY_MAP = "CC_DEPLOYMENT_POLICY_ID_TO_DEPLOYEMENT_POLICY_MAP";
+ private static final String CC_DEPLOYMENT_POLICY_ID_TO_DEPLOYMENT_POLICY_MAP = "CC_DEPLOYMENT_POLICY_ID_TO_DEPLOYMENT_POLICY_MAP";
private static final String CC_NETWORK_PARTITION_ID_TO_NETWORK_PARTITION_MAP = "CC_NETWORK_PARTITION_ID_TO_NETWORK_PARTITION_MAP";
private static final String CC_CLUSTER_CTX_WRITE_LOCK = "CC_CLUSTER_CTX_WRITE_LOCK";
@@ -158,7 +158,6 @@ public class CloudControllerContext implements Serializable {
*/
private Map<String, NetworkPartition> networkPartitionIDToNetworkPartitionMap;
-
/**
* Key - cartridge id (cartridge type is used as an unique identifier)
* Value - Inner Key - partition id
@@ -200,7 +199,7 @@ public class CloudControllerContext implements Serializable {
cartridgeTypeToPartitionIdsMap = distributedObjectProvider.getMap(CC_CARTRIDGE_TYPE_TO_PARTITION_IDS_MAP);
cartridgeTypeToCartridgeMap = distributedObjectProvider.getMap(CC_CARTRIDGE_TYPE_TO_CARTRIDGES_MAP);
serviceGroupNameToServiceGroupMap = distributedObjectProvider.getMap(CC_SERVICE_GROUP_NAME_TO_SERVICE_GROUP_MAP);
- deploymentPolicyIDToDeployPolicyMap=distributedObjectProvider.getMap(CC_DEPLOYMENT_POLICY_ID_TO_DEPLOYEMENT_POLICY_MAP);
+ deploymentPolicyIDToDeployPolicyMap=distributedObjectProvider.getMap(CC_DEPLOYMENT_POLICY_ID_TO_DEPLOYMENT_POLICY_MAP);
networkPartitionIDToNetworkPartitionMap = distributedObjectProvider.getMap(CC_NETWORK_PARTITION_ID_TO_NETWORK_PARTITION_MAP);
partitionToIaasProviderByCartridge = distributedObjectProvider.getMap(CC_PARTITION_TO_IAAS_PROVIDER_BY_CARTRIDGE_MAP);
cartridgeTypeToIaasProvider = distributedObjectProvider.getMap(CC_CARTRIDGE_TYPE_TO_IAAS_PROVIDER_MAP);
@@ -750,13 +749,13 @@ public class CloudControllerContext implements Serializable {
this.partitionToIaasProviderByCartridge = partitionToIaasProviderByCartridge;
}
- public void addIaasProvider(String cartridgeId, String partitionId, IaasProvider iaasProvider) {
+ public void addIaasProvider(String cartridgeType, String partitionId, IaasProvider iaasProvider) {
Map<String, IaasProvider> partitionToIaasProvider = new ConcurrentHashMap<String, IaasProvider>();
partitionToIaasProvider.put(partitionId, iaasProvider);
- this.partitionToIaasProviderByCartridge.put(cartridgeId, partitionToIaasProvider);
+ this.partitionToIaasProviderByCartridge.put(cartridgeType, partitionToIaasProvider);
}
- public void addIaasProviders(String cartridgeId, Map<String, IaasProvider> map) {
+ public void addIaasProviders(String cartridgeType, Map<String, IaasProvider> map) {
Map<String, IaasProvider> partitionToIaasProvider = new ConcurrentHashMap<String, IaasProvider>();
for (Iterator<String> iterator = map.keySet().iterator(); iterator.hasNext(); ) {
String key = iterator.next();
@@ -764,23 +763,23 @@ public class CloudControllerContext implements Serializable {
partitionToIaasProvider.put(key, value);
if (log.isDebugEnabled()) {
- log.debug("Partition map updated for the Cartridge: " + this.hashCode() + ". "
+ log.debug("Partition map updated for the Cartridge: " + cartridgeType + ". "
+ "Current Partition List: " + partitionToIaasProvider.keySet().toString());
}
}
- this.partitionToIaasProviderByCartridge.put(cartridgeId, partitionToIaasProvider);
+ this.partitionToIaasProviderByCartridge.put(cartridgeType, partitionToIaasProvider);
}
- public IaasProvider getIaasProviderOfPartition(String cartridgeId, String partitionId) {
+ public IaasProvider getIaasProviderOfPartition(String cartridgeType, String partitionId) {
if (log.isDebugEnabled()) {
log.debug("Retrieving partition: " + partitionId + " for the Cartridge: " + this.hashCode() + ". "
- + "Current Partition List: " + getPartitionToIaasProvider(cartridgeId).keySet().toString());
+ + "Current Partition List: " + getPartitionToIaasProvider(cartridgeType).keySet().toString());
}
- return getPartitionToIaasProvider(cartridgeId).get(partitionId);
+ return getPartitionToIaasProvider(cartridgeType).get(partitionId);
}
- public Map<String, IaasProvider> getPartitionToIaasProvider(String cartridgeId) {
- return this.partitionToIaasProviderByCartridge.get(cartridgeId);
+ public Map<String, IaasProvider> getPartitionToIaasProvider(String cartridgeType) {
+ return this.partitionToIaasProviderByCartridge.get(cartridgeType);
}
public Map<String, List<IaasProvider>> getCartridgeTypeToIaasProvider() {
@@ -791,12 +790,13 @@ public class CloudControllerContext implements Serializable {
this.cartridgeTypeToIaasProvider = cartridgeTypeToIaasProvider;
}
- public void addIaasProvider(String cartridgeId, IaasProvider iaas) {
+ public void addIaasProvider(String cartridgeType, IaasProvider iaas) {
List<IaasProvider> iaasProviderList = new ArrayList<IaasProvider>();
- if (cartridgeTypeToIaasProvider.get(cartridgeId) != null) {
- iaasProviderList = cartridgeTypeToIaasProvider.get(cartridgeId);
+ if (cartridgeTypeToIaasProvider.get(cartridgeType) != null) {
+ iaasProviderList = cartridgeTypeToIaasProvider.get(cartridgeType);
}
+ //removing from a list using iterator
if (iaasProviderList != null) {
for (IaasProvider anIaas : iaasProviderList) {
if (anIaas.equals(iaas)) {
@@ -809,11 +809,11 @@ public class CloudControllerContext implements Serializable {
}
iaasProviderList.add(iaas);
- this.cartridgeTypeToIaasProvider.put(cartridgeId, iaasProviderList);
+ this.cartridgeTypeToIaasProvider.put(cartridgeType, iaasProviderList);
}
- public IaasProvider getIaasProvider(String cartridgeId, String iaasType){
- List<IaasProvider> iaasProviderList = cartridgeTypeToIaasProvider.get(cartridgeId);
+ public IaasProvider getIaasProvider(String cartridgeType, String iaasType){
+ List<IaasProvider> iaasProviderList = cartridgeTypeToIaasProvider.get(cartridgeType);
if (iaasProviderList != null) {
for (IaasProvider iaas : iaasProviderList) {
@@ -825,8 +825,8 @@ public class CloudControllerContext implements Serializable {
return null;
}
- public List<IaasProvider> getIaases(String cartridgeId) {
- List<IaasProvider> iaasProviderList = cartridgeTypeToIaasProvider.get(cartridgeId);
+ public List<IaasProvider> getIaases(String cartridgeType) {
+ List<IaasProvider> iaasProviderList = cartridgeTypeToIaasProvider.get(cartridgeType);
if (iaasProviderList != null) {
return iaasProviderList;
http://git-wip-us.apache.org/repos/asf/stratos/blob/b0e3a996/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
index 61525d5..48f61ad 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/CloudControllerService.java
@@ -212,7 +212,7 @@ public interface CloudControllerService {
* @throws org.apache.stratos.cloud.controller.exception.CartridgeNotFoundException if there is no registered
* cartridge with this type.
*/
- Cartridge getCartridgeInfo(String cartridgeType) throws CartridgeNotFoundException;
+ Cartridge getCartridge(String cartridgeType) throws CartridgeNotFoundException;
/**
* Calling this method will result in returning the types of {@link org.apache.stratos.cloud.controller.domain
http://git-wip-us.apache.org/repos/asf/stratos/blob/b0e3a996/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
index fe5dce1..a939895 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
@@ -718,7 +718,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
}
@Override
- public Cartridge getCartridgeInfo(String cartridgeType) throws CartridgeNotFoundException {
+ public Cartridge getCartridge(String cartridgeType) throws CartridgeNotFoundException {
Cartridge cartridge = CloudControllerContext.getInstance().getCartridge(cartridgeType);
if (cartridge != null) {
return cartridge;
http://git-wip-us.apache.org/repos/asf/stratos/blob/b0e3a996/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
index 5726569..4619341 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
@@ -204,51 +204,6 @@ public class CloudControllerUtil {
return cartridge;
}
-
- /*public static CartridgeInfo toCartridgeInfo(Cartridge cartridge) {
-
- CartridgeInfo cartridgeInfo = new CartridgeInfo();
- cartridgeInfo.setType(cartridge.getType());
- cartridgeInfo.setDisplayName(cartridge.getDisplayName());
- cartridgeInfo.setDescription(cartridge.getDescription());
- cartridgeInfo.setHostName(cartridge.getHostName());
-
- if ((cartridge.getDeploymentDirs() != null) && (cartridge.getDeploymentDirs().length > 0)) {
- cartridgeInfo.setDeploymentDirs(Arrays.asList(cartridge.getDeploymentDirs()));
- }
- cartridgeInfo.setProvider(cartridge.getProvider());
- cartridgeInfo.setCategory(cartridge.getCategory());
- cartridgeInfo.setVersion(cartridge.getVersion());
- cartridgeInfo.setMultiTenant(cartridge.isMultiTenant());
- cartridgeInfo.setBaseDir(cartridge.getBaseDir());
- cartridgeInfo.setTenantPartitions(cartridge.getTenantPartitions());
- cartridgeInfo.setPortMappings(cartridge.getPortMappings());
- cartridgeInfo.setAppTypes(cartridge.getAppTypeMappings());
-
- List<Property> propList = new ArrayList<Property>();
- cartridgeInfo.setPersistence(cartridge.getPersistence());
-
- *//*for (Iterator<?> iterator = cartridge.getProperties().entrySet().iterator(); iterator.hasNext();) {
- @SuppressWarnings("unchecked")
- Map.Entry<String, String> entry = (Entry<String, String>) iterator.next();
-
- Property prop = new Property(entry.getKey(), entry.getValue());
- propList.add(prop);
- }*//*
-
- List<Property> propertyList = new ArrayList<Property>();
- if (cartridge.getProperties()!= null) {
- if (cartridge.getProperties().getProperties() != null) {
- propertyList = Arrays.asList(cartridge.getProperties().getProperties());
- Property[] props = new Property[propertyList.size()];
- cartridgeInfo.setProperties(propertyList.toArray(props));
- }
- }
-
- cartridgeInfo.setMetadataKeys(cartridge.getMetadataKeys());
-
- return cartridgeInfo;
- }*/
public static void sleep(long time){
try {
http://git-wip-us.apache.org/repos/asf/stratos/blob/b0e3a996/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java
index e029cf9..32ee917 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java
@@ -142,9 +142,9 @@ public class CloudControllerServiceClient {
return stub.getCartridges();
}
- public Cartridge getCartridgeInfo(String cartridgeType) throws RemoteException,
+ public Cartridge getCartridge(String cartridgeType) throws RemoteException,
CloudControllerServiceCartridgeNotFoundExceptionException {
- return stub.getCartridgeInfo(cartridgeType);
+ return stub.getCartridge(cartridgeType);
}
public ClusterContext getClusterContext (String clusterId) throws RemoteException {
http://git-wip-us.apache.org/repos/asf/stratos/blob/b0e3a996/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 0879fef..c3af4e8 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
@@ -374,7 +374,7 @@ public class StratosApiV40Utils {
for (String cartridgeType : availableCartridges) {
Cartridge cartridgeInfo = null;
try {
- cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridgeInfo(cartridgeType);
+ cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridge(cartridgeType);
} catch (Exception e) {
if (log.isWarnEnabled()) {
log.warn("Error when calling getCartridgeInfo for " + cartridgeType + ", Error: "
http://git-wip-us.apache.org/repos/asf/stratos/blob/b0e3a996/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 cfab404..2f99f12 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
@@ -163,7 +163,7 @@ public class StratosApiV41Utils {
}
CloudControllerServiceClient cloudControllerServiceClient = getCloudControllerServiceClient();
- if(cloudControllerServiceClient.getCartridgeInfo(cartridgeType) == null) {
+ if(cloudControllerServiceClient.getCartridge(cartridgeType) == null) {
throw new RuntimeException("Cartridge not found: [cartridge-type] " + cartridgeType);
}
@@ -252,7 +252,7 @@ public class StratosApiV41Utils {
for (String cartridgeType : availableCartridges) {
Cartridge cartridgeInfo = null;
try {
- cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridgeInfo(cartridgeType);
+ cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridge(cartridgeType);
} catch (Exception e) {
if (log.isWarnEnabled()) {
log.warn("Error when calling getCartridgeInfo for " + cartridgeType + ", Error: "
@@ -320,7 +320,7 @@ public class StratosApiV41Utils {
for (String cartridgeType : availableCartridges) {
Cartridge cartridgeInfo = null;
try {
- cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridgeInfo(cartridgeType);
+ cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridge(cartridgeType);
} catch (Exception e) {
if (log.isWarnEnabled()) {
log.warn("Error when calling getCartridgeInfo for " + cartridgeType + ", Error: "
@@ -386,7 +386,7 @@ public class StratosApiV41Utils {
public static CartridgeBean getCartridge(String cartridgeType) throws RestAPIException {
try {
- Cartridge cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridgeInfo(cartridgeType);
+ Cartridge cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridge(cartridgeType);
if(cartridgeInfo == null) {
return null;
}
@@ -404,7 +404,7 @@ public class StratosApiV41Utils {
public static CartridgeBean getCartridgeForValidate(String cartridgeType) throws RestAPIException {
try {
- Cartridge cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridgeInfo(cartridgeType);
+ Cartridge cartridgeInfo = CloudControllerServiceClient.getInstance().getCartridge(cartridgeType);
if (cartridgeInfo == null) {
return null;
}
@@ -829,7 +829,7 @@ public class StratosApiV41Utils {
int i=0;
for (String cartridgeType : cartridgeTypes) {
try {
- if (ccServiceClient.getCartridgeInfo(cartridgeType) == null) {
+ if (ccServiceClient.getCartridge(cartridgeType) == null) {
// cartridge is not deployed, can't continue
log.error("invalid cartridge found in cartridge group " + cartridgeType);
throw new RestAPIException("No Cartridge Definition found with type " + cartridgeType);