Repository: stratos Updated Branches: refs/heads/master 7c7e97e37 -> fcdc4b4e3
Concat Autoscalarconstants and constants files to one Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fcdc4b4e Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fcdc4b4e Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fcdc4b4e Branch: refs/heads/master Commit: fcdc4b4e329477d5ea5c271d3e93c4dd707730e2 Parents: 7c7e97e Author: Gayan Gunarathne <[email protected]> Authored: Sun Jan 25 22:09:25 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Sun Jan 25 22:09:45 2015 +0530 ---------------------------------------------------------------------- .../apache/stratos/autoscaler/Constants.java | 91 -------------------- .../ApplicationSynchronizerTaskScheduler.java | 16 ++-- .../dependency/DependencyBuilder.java | 16 ++-- .../context/ApplicationChildContextFactory.java | 10 +-- .../parser/DefaultApplicationParser.java | 21 ++--- .../client/CloudControllerClient.java | 6 +- ...ntityApplicationManagementServiceClient.java | 10 +-- .../client/OAuthAdminServiceClient.java | 6 +- .../component/ParentComponentMonitor.java | 5 +- .../autoscaler/rule/RuleTasksDelegator.java | 8 +- .../autoscaler/util/AutoscalerConstants.java | 46 ++++++++++ .../stratos/autoscaler/util/ConfUtil.java | 3 +- .../src/test/resources/autoscaler-old.drl | 2 +- .../src/test/resources/autoscaler.drl | 2 +- .../test/resources/minimum-autoscaler-rule.drl | 2 +- .../resources/test-minimum-autoscaler-rule.drl | 2 +- .../test-terminating-obsoleted-members-rule.drl | 2 +- .../src/main/conf/drools/mincheck.drl | 2 +- .../src/main/conf/drools/obsoletecheck.drl | 2 +- .../src/main/conf/drools/scaling.drl | 2 +- 20 files changed, 104 insertions(+), 150 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/fcdc4b4e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/Constants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/Constants.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/Constants.java deleted file mode 100644 index 837e504..0000000 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/Constants.java +++ /dev/null @@ -1,91 +0,0 @@ -package org.apache.stratos.autoscaler; -/* - * - * 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. - * -*/ - - -/** - * - */ -public class Constants { - - public static final String ROUND_ROBIN_ALGORITHM_ID = "round-robin"; - public static final String ONE_AFTER_ANOTHER_ALGORITHM_ID = "one-after-another"; - public static final String MEMBER_FAULT_EVENT_NAME = "member_fault"; - - //scheduler - public static final int SCHEDULE_DEFAULT_INITIAL_DELAY = 30; - public static final int SCHEDULE_DEFAULT_PERIOD = 15; - - public static final String APPLICATION_SYNC_CRON = "1 * * * * ? *"; - public static final String APPLICATION_SYNC_TASK_NAME = "APPLICATION_SYNC_TASK"; - public static final String APPLICATION_SYNC_TASK_TYPE = "APPLICATION_SYNC_TASK_TYPE"; - - public static final String AUTOSCALER_CONFIG_FILE_NAME = "autoscaler.xml"; - - public static final String CLOUD_CONTROLLER_SERVICE_SFX = "services/CloudControllerService"; - public static final int CLOUD_CONTROLLER_DEFAULT_PORT = 9444; - - public static final String STRATOS_MANAGER_SERVICE_SFX = "services/InstanceCleanupNotificationService"; - public static final int STRATOS_MANAGER_DEFAULT_PORT = 9445; - public static final String STRATOS_MANAGER_HOSTNAME_ELEMENT = "autoscaler.stratosManager.hostname"; - public static final String STRATOS_MANAGER_DEFAULT_PORT_ELEMENT = "autoscaler.stratosManager.port"; - public static final String STRATOS_MANAGER_CLIENT_TIMEOUT_ELEMENT= "autoscaler.stratosManager.clientTimeout"; - - // partition properties - public static final String REGION_PROPERTY = "region"; - - public static final String MEMBER_AVERAGE_LOAD_AVERAGE = "member_average_load_average"; - public static final String MEMBER_AVERAGE_MEMORY_CONSUMPTION = "member_average_memory_consumption"; - public static final String AVERAGE_REQUESTS_IN_FLIGHT = "average_in_flight_requests"; - - public static final String MEMBER_GRADIENT_LOAD_AVERAGE = "member_gradient_load_average"; - public static final String MEMBER_GRADIENT_MEMORY_CONSUMPTION = "member_gradient_memory_consumption"; - public static final String GRADIENT_OF_REQUESTS_IN_FLIGHT = "gradient_in_flight_requests"; - - public static final String MEMBER_SECOND_DERIVATIVE_OF_MEMORY_CONSUMPTION = "member_second_derivative_memory_consumption"; - public static final String MEMBER_SECOND_DERIVATIVE_OF_LOAD_AVERAGE = "member_second_derivative_load_average"; - public static final String SECOND_DERIVATIVE_OF_REQUESTS_IN_FLIGHT = "second_derivative_in_flight_requests"; - - public static final String AVERAGE_LOAD_AVERAGE = "average_load_average"; - public static final String AVERAGE_MEMORY_CONSUMPTION = "average_memory_consumption"; - - public static final String GRADIENT_LOAD_AVERAGE = "gradient_load_average"; - public static final String GRADIENT_MEMORY_CONSUMPTION = "gradient_memory_consumption"; - - public static final String SECOND_DERIVATIVE_OF_MEMORY_CONSUMPTION = "second_derivative_memory_consumption"; - public static final String SECOND_DERIVATIVE_OF_LOAD_AVERAGE = "second_derivative_load_average"; - - //member expiry interval - public static final String MEMBER_EXPIRY_INTERVAL = "member.expiry.interval"; - - //Grouping - public static final String TERMINATE_NONE = "terminate-none"; - public static final String TERMINATE_ALL = "terminate-all"; - public static final String TERMINATE_DEPENDENTS = "terminate-dependents"; - public static final String GROUP = "group"; - public static final String CARTRIDGE = "cartridge"; - - - public static final int IS_DEFAULT_PORT = 9443; - public static final String OAUTH_SERVICE_SFX = "services/OAuthAdminService"; - public static final String IDENTITY_APPLICATION_SERVICE_SFX = "services/IdentityApplicationManagementService"; - public static final String TOKEN_ENDPOINT_SFX = "oauth2/token"; -} http://git-wip-us.apache.org/repos/asf/stratos/blob/fcdc4b4e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationSynchronizerTaskScheduler.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationSynchronizerTaskScheduler.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationSynchronizerTaskScheduler.java index 7d9eb1c..ea692c2 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationSynchronizerTaskScheduler.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationSynchronizerTaskScheduler.java @@ -21,7 +21,7 @@ package org.apache.stratos.autoscaler.applications; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.autoscaler.Constants; +import org.apache.stratos.autoscaler.util.AutoscalerConstants; import org.wso2.carbon.ntask.common.TaskException; import org.wso2.carbon.ntask.core.TaskInfo; import org.wso2.carbon.ntask.core.TaskManager; @@ -43,7 +43,7 @@ public class ApplicationSynchronizerTaskScheduler { //if (!taskService.getRegisteredTaskTypes().contains(CloudControllerConstants.TOPOLOGY_SYNC_TASK_TYPE)) { // Register task type - taskService.registerTaskType(Constants.APPLICATION_SYNC_TASK_TYPE); + taskService.registerTaskType(AutoscalerConstants.APPLICATION_SYNC_TASK_TYPE); /*// Register task taskManager = taskService.getTaskManager(CloudControllerConstants.TOPOLOGY_SYNC_TASK_TYPE); @@ -55,22 +55,22 @@ public class ApplicationSynchronizerTaskScheduler { new HashMap<String, String>(), triggerInfo); taskManager.registerTask(taskInfo);*/ - taskManager = taskService.getTaskManager(Constants.APPLICATION_SYNC_TASK_TYPE); - String cronProp = Constants.APPLICATION_SYNC_CRON; + taskManager = taskService.getTaskManager(AutoscalerConstants.APPLICATION_SYNC_TASK_TYPE); + String cronProp = AutoscalerConstants.APPLICATION_SYNC_CRON; TaskInfo.TriggerInfo triggerInfo = new TaskInfo.TriggerInfo(cronProp); - TaskInfo taskInfo = new TaskInfo(Constants.APPLICATION_SYNC_TASK_NAME, + TaskInfo taskInfo = new TaskInfo(AutoscalerConstants.APPLICATION_SYNC_TASK_NAME, ApplicationSynchronizeTask.class.getName(), new HashMap<String, String>(), triggerInfo); taskManager.registerTask(taskInfo); if (log.isDebugEnabled()) { - log.debug(String.format("Topology synchronization task scheduled: %s", Constants.APPLICATION_SYNC_TASK_NAME)); + log.debug(String.format("Topology synchronization task scheduled: %s", AutoscalerConstants.APPLICATION_SYNC_TASK_NAME)); } //} } catch (Exception e) { if (taskManager != null) { try { - taskManager.deleteTask(Constants.APPLICATION_SYNC_TASK_NAME); + taskManager.deleteTask(AutoscalerConstants.APPLICATION_SYNC_TASK_NAME); } catch (TaskException te) { if (log.isErrorEnabled()) { log.error(te); @@ -79,7 +79,7 @@ public class ApplicationSynchronizerTaskScheduler { } String msg = String.format("Could not schedule topology synchronization task: %s", - Constants.APPLICATION_SYNC_TASK_NAME); + AutoscalerConstants.APPLICATION_SYNC_TASK_NAME); log.error(msg, e); throw new RuntimeException(msg, e); } http://git-wip-us.apache.org/repos/asf/stratos/blob/fcdc4b4e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyBuilder.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyBuilder.java index f577339..3964ac2 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyBuilder.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/DependencyBuilder.java @@ -20,10 +20,10 @@ package org.apache.stratos.autoscaler.applications.dependency; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.autoscaler.*; import org.apache.stratos.autoscaler.applications.dependency.context.ApplicationChildContext; import org.apache.stratos.autoscaler.applications.dependency.context.ApplicationChildContextFactory; import org.apache.stratos.autoscaler.exception.application.DependencyBuilderException; +import org.apache.stratos.autoscaler.util.AutoscalerConstants; import org.apache.stratos.messaging.domain.application.*; import java.util.*; @@ -64,11 +64,11 @@ public class DependencyBuilder { //Parsing the kill behaviour String terminationBehaviour = dependencyOrder.getTerminationBehaviour(); - if (Constants.TERMINATE_NONE.equals(terminationBehaviour)) { + if (AutoscalerConstants.TERMINATE_NONE.equals(terminationBehaviour)) { dependencyTree.setTerminationBehavior(DependencyTree.TerminationBehavior.TERMINATE_NONE); - } else if (Constants.TERMINATE_ALL.equals(terminationBehaviour)) { + } else if (AutoscalerConstants.TERMINATE_ALL.equals(terminationBehaviour)) { dependencyTree.setTerminationBehavior(DependencyTree.TerminationBehavior.TERMINATE_ALL); - } else if (Constants.TERMINATE_DEPENDENTS.equals(terminationBehaviour)) { + } else if (AutoscalerConstants.TERMINATE_DEPENDENTS.equals(terminationBehaviour)) { dependencyTree.setTerminationBehavior(DependencyTree.TerminationBehavior.TERMINATE_DEPENDENT); } @@ -180,10 +180,10 @@ public class DependencyBuilder { for (ScalingDependentList dependentList : component.getDependencyOrder().getScalingDependents()) { List<String> scalingDependencies = new ArrayList<String>(); for (String string : dependentList.getScalingDependentListComponents()) { - if (string.trim().startsWith(Constants.GROUP + ".")) { + if (string.trim().startsWith(AutoscalerConstants.GROUP + ".")) { //getting the group alias scalingDependencies.add(getGroupFromStartupOrder(string)); - } else if (string.trim().startsWith(Constants.CARTRIDGE + ".")) { + } else if (string.trim().startsWith(AutoscalerConstants.CARTRIDGE + ".")) { //getting the cluster alias String id = getClusterFromStartupOrder(string); //getting the cluster-id from cluster alias @@ -217,7 +217,7 @@ public class DependencyBuilder { * @return group alias */ public static String getGroupFromStartupOrder(String startupOrder) { - return startupOrder.substring(Constants.GROUP.length() + 1); + return startupOrder.substring(AutoscalerConstants.GROUP.length() + 1); } /** @@ -227,7 +227,7 @@ public class DependencyBuilder { * @return cluster alias */ public static String getClusterFromStartupOrder(String startupOrder) { - return startupOrder.substring(Constants.CARTRIDGE.length() + 1); + return startupOrder.substring(AutoscalerConstants.CARTRIDGE.length() + 1); } http://git-wip-us.apache.org/repos/asf/stratos/blob/fcdc4b4e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ApplicationChildContextFactory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ApplicationChildContextFactory.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ApplicationChildContextFactory.java index 8bec36f..314ab60 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ApplicationChildContextFactory.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/dependency/context/ApplicationChildContextFactory.java @@ -20,8 +20,8 @@ package org.apache.stratos.autoscaler.applications.dependency.context; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.autoscaler.Constants; import org.apache.stratos.autoscaler.applications.dependency.DependencyTree; +import org.apache.stratos.autoscaler.util.AutoscalerConstants; import org.apache.stratos.messaging.domain.application.ClusterDataHolder; import org.apache.stratos.messaging.domain.application.ParentComponent; @@ -45,11 +45,11 @@ public class ApplicationChildContextFactory { String id; ApplicationChildContext applicationContext = null; boolean hasDependents = tree.isTerminateDependent() || tree.isTerminateAll(); - if (order.trim().startsWith(Constants.GROUP + ".")) { + if (order.trim().startsWith(AutoscalerConstants.GROUP + ".")) { //getting the group alias id = getGroupFromStartupOrder(order); applicationContext = getGroupChildContext(id, hasDependents); - } else if (order.trim().startsWith(Constants.CARTRIDGE + ".")) { + } else if (order.trim().startsWith(AutoscalerConstants.CARTRIDGE + ".")) { //getting the cartridge type id = getClusterFromStartupOrder(order); //getting the cluster-id from cluster alias @@ -70,7 +70,7 @@ public class ApplicationChildContextFactory { * @return group alias */ public static String getGroupFromStartupOrder(String startupOrder) { - return startupOrder.substring(Constants.GROUP.length() + 1); + return startupOrder.substring(AutoscalerConstants.GROUP.length() + 1); } /** @@ -80,7 +80,7 @@ public class ApplicationChildContextFactory { * @return cluster alias */ public static String getClusterFromStartupOrder(String startupOrder) { - return startupOrder.substring(Constants.CARTRIDGE.length() + 1); + return startupOrder.substring(AutoscalerConstants.CARTRIDGE.length() + 1); } /** http://git-wip-us.apache.org/repos/asf/stratos/blob/fcdc4b4e/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 2fa7c4c..0e926af 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 @@ -24,7 +24,6 @@ import org.apache.amber.oauth2.common.exception.OAuthSystemException; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.autoscaler.Constants; import org.apache.stratos.autoscaler.applications.ApplicationUtils; import org.apache.stratos.autoscaler.applications.ClusterInformation; import org.apache.stratos.autoscaler.applications.MTClusterInformation; @@ -39,6 +38,7 @@ import org.apache.stratos.autoscaler.exception.application.ApplicationDefinition import org.apache.stratos.autoscaler.exception.cartridge.CartridgeInformationException; import org.apache.stratos.autoscaler.pojo.ServiceGroup; 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.domain.CartridgeInfo; import org.apache.stratos.common.Properties; @@ -236,9 +236,10 @@ public class DefaultApplicationParser implements ApplicationParser { // Set groups if (components.getGroupContexts() != null) { - application.setGroups(parseGroups(applicationContext.getApplicationId(), applicationContext.getTenantId(), - application.getKey(), Arrays.asList(components.getGroupContexts()), - subscribableInfoCtxts)); + application.setGroups( + parseGroups(applicationContext.getApplicationId(), applicationContext.getTenantId(), + application.getKey(), Arrays.asList(components.getGroupContexts()), + subscribableInfoCtxts)); } } @@ -361,14 +362,14 @@ public class DefaultApplicationParser implements ApplicationParser { private static void validateTerminationBehavior(String terminationBehavior) throws ApplicationDefinitionException { if (!(terminationBehavior == null || - Constants.TERMINATE_NONE.equals(terminationBehavior) || - Constants.TERMINATE_DEPENDENTS.equals(terminationBehavior) || - Constants.TERMINATE_ALL.equals(terminationBehavior))) { + AutoscalerConstants.TERMINATE_NONE.equals(terminationBehavior) || + AutoscalerConstants.TERMINATE_DEPENDENTS.equals(terminationBehavior) || + AutoscalerConstants.TERMINATE_ALL.equals(terminationBehavior))) { throw new ApplicationDefinitionException("Invalid termination behaviour found: [ " + terminationBehavior + " ], should be one of '" + - Constants.TERMINATE_NONE + "', '" + - Constants.TERMINATE_DEPENDENTS + "', '" + - Constants.TERMINATE_ALL + "'"); + AutoscalerConstants.TERMINATE_NONE + "', '" + + AutoscalerConstants.TERMINATE_DEPENDENTS + "', '" + + AutoscalerConstants.TERMINATE_ALL + "'"); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/fcdc4b4e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java index cbac3bb..b945c54 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/CloudControllerClient.java @@ -23,12 +23,12 @@ import org.apache.axis2.transport.http.HTTPConstants; import org.apache.commons.configuration.XMLConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.autoscaler.Constants; import org.apache.stratos.autoscaler.applications.pojo.ApplicationClusterContext; import org.apache.stratos.autoscaler.exception.cartridge.CartridgeInformationException; import org.apache.stratos.autoscaler.exception.cartridge.SpawningException; import org.apache.stratos.autoscaler.exception.cartridge.TerminationException; import org.apache.stratos.autoscaler.exception.partition.PartitionValidationException; +import org.apache.stratos.autoscaler.util.AutoscalerConstants; import org.apache.stratos.autoscaler.util.AutoscalerObjectConverter; import org.apache.stratos.autoscaler.util.AutoscalerUtil; import org.apache.stratos.autoscaler.util.ConfUtil; @@ -69,9 +69,9 @@ public class CloudControllerClient { private CloudControllerClient() { try { XMLConfiguration conf = ConfUtil.getInstance(null).getConfiguration(); - int port = conf.getInt("autoscaler.cloudController.port", Constants.CLOUD_CONTROLLER_DEFAULT_PORT); + int port = conf.getInt("autoscaler.cloudController.port", AutoscalerConstants.CLOUD_CONTROLLER_DEFAULT_PORT); String hostname = conf.getString("autoscaler.cloudController.hostname", "localhost"); - String epr = "https://"; + hostname + ":" + port + "/" + Constants.CLOUD_CONTROLLER_SERVICE_SFX; + String epr = "https://"; + hostname + ":" + port + "/" + AutoscalerConstants.CLOUD_CONTROLLER_SERVICE_SFX; int cloudControllerClientTimeout = conf.getInt("autoscaler.cloudController.clientTimeout", 180000); stub = new CloudControllerServiceStub(epr); http://git-wip-us.apache.org/repos/asf/stratos/blob/fcdc4b4e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/IdentityApplicationManagementServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/IdentityApplicationManagementServiceClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/IdentityApplicationManagementServiceClient.java index ac820fe..728e8c6 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/IdentityApplicationManagementServiceClient.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/IdentityApplicationManagementServiceClient.java @@ -30,7 +30,7 @@ import org.apache.axis2.transport.http.HTTPConstants; import org.apache.commons.configuration.XMLConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.autoscaler.Constants; +import org.apache.stratos.autoscaler.util.AutoscalerConstants; import org.apache.stratos.autoscaler.util.ConfUtil; import org.wso2.carbon.base.ServerConfiguration; import org.wso2.carbon.identity.application.common.model.xsd.InboundAuthenticationRequestConfig; @@ -87,8 +87,8 @@ public class IdentityApplicationManagementServiceClient { if (serviceClient == null) { XMLConfiguration conf = ConfUtil.getInstance(null).getConfiguration(); String hostname = conf.getString("autoscaler.identity.hostname", "localhost"); - int port = conf.getInt("autoscaler.cloudController.port", Constants.IS_DEFAULT_PORT); - String epr = "https://"; + hostname + ":" + port + "/" + Constants.IDENTITY_APPLICATION_SERVICE_SFX; + int port = conf.getInt("autoscaler.cloudController.port", AutoscalerConstants.IS_DEFAULT_PORT); + String epr = "https://"; + hostname + ":" + port + "/" + AutoscalerConstants.IDENTITY_APPLICATION_SERVICE_SFX; serviceClient = new IdentityApplicationManagementServiceClient(epr); } } @@ -186,8 +186,8 @@ public class IdentityApplicationManagementServiceClient { private String getIdToken(String compositeAppId, String consumerKey, String consumerSecret) throws OAuthSystemException, OAuthProblemException { XMLConfiguration conf = ConfUtil.getInstance(null).getConfiguration(); String hostname = conf.getString("autoscaler.identity.hostname", "localhost"); - int port = conf.getInt("autoscaler.cloudController.port", Constants.IS_DEFAULT_PORT); - String tokenEndpoint = "https://"; + hostname + ":" + port + "/" + Constants.TOKEN_ENDPOINT_SFX; + int port = conf.getInt("autoscaler.cloudController.port", AutoscalerConstants.IS_DEFAULT_PORT); + String tokenEndpoint = "https://"; + hostname + ":" + port + "/" + AutoscalerConstants.TOKEN_ENDPOINT_SFX; OAuthClientRequest accessRequest = OAuthClientRequest.tokenLocation(tokenEndpoint) .setGrantType(GrantType.CLIENT_CREDENTIALS) .setClientId(consumerKey) http://git-wip-us.apache.org/repos/asf/stratos/blob/fcdc4b4e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/OAuthAdminServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/OAuthAdminServiceClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/OAuthAdminServiceClient.java index 7b79b01..3a0a549 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/OAuthAdminServiceClient.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/OAuthAdminServiceClient.java @@ -23,7 +23,7 @@ import org.apache.axis2.transport.http.HTTPConstants; import org.apache.commons.configuration.XMLConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.autoscaler.Constants; +import org.apache.stratos.autoscaler.util.AutoscalerConstants; import org.apache.stratos.autoscaler.util.ConfUtil; import org.wso2.carbon.base.ServerConfiguration; import org.wso2.carbon.identity.oauth.stub.OAuthAdminServiceException; @@ -77,8 +77,8 @@ public class OAuthAdminServiceClient { if (serviceClient == null) { XMLConfiguration conf = ConfUtil.getInstance(null).getConfiguration(); String hostname = conf.getString("autoscaler.identity.hostname", "localhost"); - int port = conf.getInt("autoscaler.cloudController.port", Constants.IS_DEFAULT_PORT); - String epr = "https://"; + hostname + ":" + port + "/" + Constants.OAUTH_SERVICE_SFX; + int port = conf.getInt("autoscaler.cloudController.port", AutoscalerConstants.IS_DEFAULT_PORT); + String epr = "https://"; + hostname + ":" + port + "/" + AutoscalerConstants.OAUTH_SERVICE_SFX; serviceClient = new OAuthAdminServiceClient(epr); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/fcdc4b4e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java index 14df03b..fe04671 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java @@ -20,7 +20,6 @@ package org.apache.stratos.autoscaler.monitor.component; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.autoscaler.Constants; import org.apache.stratos.autoscaler.algorithm.AutoscaleAlgorithm; import org.apache.stratos.autoscaler.algorithm.OneAfterAnother; import org.apache.stratos.autoscaler.algorithm.RoundRobin; @@ -772,10 +771,10 @@ public abstract class ParentComponentMonitor extends Monitor implements Runnable if (log.isDebugEnabled()) { log.debug(String.format("Partition algorithm is ", partitionAlgorithm)); } - if (Constants.ROUND_ROBIN_ALGORITHM_ID.equals(partitionAlgorithm)) { + if (AutoscalerConstants.ROUND_ROBIN_ALGORITHM_ID.equals(partitionAlgorithm)) { autoscaleAlgorithm = new RoundRobin(); - } else if (Constants.ONE_AFTER_ANOTHER_ALGORITHM_ID.equals(partitionAlgorithm)) { + } else if (AutoscalerConstants.ONE_AFTER_ANOTHER_ALGORITHM_ID.equals(partitionAlgorithm)) { autoscaleAlgorithm = new OneAfterAnother(); } else { http://git-wip-us.apache.org/repos/asf/stratos/blob/fcdc4b4e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java index 68f06e4..94b26de 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java @@ -23,7 +23,6 @@ package org.apache.stratos.autoscaler.rule; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.autoscaler.Constants; import org.apache.stratos.autoscaler.algorithm.AutoscaleAlgorithm; import org.apache.stratos.autoscaler.algorithm.OneAfterAnother; import org.apache.stratos.autoscaler.algorithm.RoundRobin; @@ -37,6 +36,7 @@ import org.apache.stratos.autoscaler.context.partition.network.ClusterLevelNetwo import org.apache.stratos.autoscaler.event.publisher.InstanceNotificationPublisher; import org.apache.stratos.autoscaler.exception.cartridge.TerminationException; import org.apache.stratos.autoscaler.monitor.cluster.ClusterMonitor; +import org.apache.stratos.autoscaler.util.AutoscalerConstants; import org.apache.stratos.cloud.controller.stub.domain.MemberContext; /** @@ -136,14 +136,14 @@ public class RuleTasksDelegator { if(partitionAlgorithm == null) { //Send one after another as default - partitionAlgorithm = Constants.ONE_AFTER_ANOTHER_ALGORITHM_ID; + partitionAlgorithm = AutoscalerConstants.ONE_AFTER_ANOTHER_ALGORITHM_ID; } if (log.isDebugEnabled()) { log.debug(String.format("Retrieving partition algorithm [Partition algorithm]: ", partitionAlgorithm)); } - if (Constants.ROUND_ROBIN_ALGORITHM_ID.equals(partitionAlgorithm)) { + if (AutoscalerConstants.ROUND_ROBIN_ALGORITHM_ID.equals(partitionAlgorithm)) { autoscaleAlgorithm = new RoundRobin(); - } else if (Constants.ONE_AFTER_ANOTHER_ALGORITHM_ID.equals(partitionAlgorithm)) { + } else if (AutoscalerConstants.ONE_AFTER_ANOTHER_ALGORITHM_ID.equals(partitionAlgorithm)) { autoscaleAlgorithm = new OneAfterAnother(); } else { if (log.isErrorEnabled()) { http://git-wip-us.apache.org/repos/asf/stratos/blob/fcdc4b4e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerConstants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerConstants.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerConstants.java index 27f5f4b..6f48600 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerConstants.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerConstants.java @@ -78,4 +78,50 @@ public final class AutoscalerConstants { public static final String CLUSTER_MONITOR_SCHEDULER_ID = "cluster.monitor.scheduler"; public static final String CLUSTER_MONITOR_THREAD_POOL_ID = "cluster.monitor.thread.pool"; public static final String CLUSTER_MONITOR_THREAD_POOL_SIZE = "cluster.monitor.thread.pool.size"; + public static final String ROUND_ROBIN_ALGORITHM_ID = "round-robin"; + public static final String ONE_AFTER_ANOTHER_ALGORITHM_ID = "one-after-another"; + public static final String MEMBER_FAULT_EVENT_NAME = "member_fault"; + //scheduler + public static final int SCHEDULE_DEFAULT_INITIAL_DELAY = 30; + public static final int SCHEDULE_DEFAULT_PERIOD = 15; + public static final String APPLICATION_SYNC_CRON = "1 * * * * ? *"; + public static final String APPLICATION_SYNC_TASK_NAME = "APPLICATION_SYNC_TASK"; + public static final String APPLICATION_SYNC_TASK_TYPE = "APPLICATION_SYNC_TASK_TYPE"; + public static final String AUTOSCALER_CONFIG_FILE_NAME = "autoscaler.xml"; + public static final String CLOUD_CONTROLLER_SERVICE_SFX = "services/CloudControllerService"; + public static final int CLOUD_CONTROLLER_DEFAULT_PORT = 9444; + public static final String STRATOS_MANAGER_SERVICE_SFX = "services/InstanceCleanupNotificationService"; + public static final int STRATOS_MANAGER_DEFAULT_PORT = 9445; + public static final String STRATOS_MANAGER_HOSTNAME_ELEMENT = "autoscaler.stratosManager.hostname"; + public static final String STRATOS_MANAGER_DEFAULT_PORT_ELEMENT = "autoscaler.stratosManager.port"; + public static final String STRATOS_MANAGER_CLIENT_TIMEOUT_ELEMENT= "autoscaler.stratosManager.clientTimeout"; + // partition properties + public static final String REGION_PROPERTY = "region"; + public static final String MEMBER_AVERAGE_LOAD_AVERAGE = "member_average_load_average"; + public static final String MEMBER_AVERAGE_MEMORY_CONSUMPTION = "member_average_memory_consumption"; + public static final String AVERAGE_REQUESTS_IN_FLIGHT = "average_in_flight_requests"; + public static final String MEMBER_GRADIENT_LOAD_AVERAGE = "member_gradient_load_average"; + public static final String MEMBER_GRADIENT_MEMORY_CONSUMPTION = "member_gradient_memory_consumption"; + public static final String GRADIENT_OF_REQUESTS_IN_FLIGHT = "gradient_in_flight_requests"; + public static final String MEMBER_SECOND_DERIVATIVE_OF_MEMORY_CONSUMPTION = "member_second_derivative_memory_consumption"; + public static final String MEMBER_SECOND_DERIVATIVE_OF_LOAD_AVERAGE = "member_second_derivative_load_average"; + public static final String SECOND_DERIVATIVE_OF_REQUESTS_IN_FLIGHT = "second_derivative_in_flight_requests"; + public static final String AVERAGE_LOAD_AVERAGE = "average_load_average"; + public static final String AVERAGE_MEMORY_CONSUMPTION = "average_memory_consumption"; + public static final String GRADIENT_LOAD_AVERAGE = "gradient_load_average"; + public static final String GRADIENT_MEMORY_CONSUMPTION = "gradient_memory_consumption"; + public static final String SECOND_DERIVATIVE_OF_MEMORY_CONSUMPTION = "second_derivative_memory_consumption"; + public static final String SECOND_DERIVATIVE_OF_LOAD_AVERAGE = "second_derivative_load_average"; + //member expiry interval + public static final String MEMBER_EXPIRY_INTERVAL = "member.expiry.interval"; + //Grouping + public static final String TERMINATE_NONE = "terminate-none"; + public static final String TERMINATE_ALL = "terminate-all"; + public static final String GROUP = "group"; + public static final String CARTRIDGE = "cartridge"; + public static final int IS_DEFAULT_PORT = 9443; + public static final String OAUTH_SERVICE_SFX = "services/OAuthAdminService"; + public static final String IDENTITY_APPLICATION_SERVICE_SFX = "services/IdentityApplicationManagementService"; + public static final String TOKEN_ENDPOINT_SFX = "oauth2/token"; + public static final String TERMINATE_DEPENDENTS = "terminate-dependents"; } http://git-wip-us.apache.org/repos/asf/stratos/blob/fcdc4b4e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/ConfUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/ConfUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/ConfUtil.java index 3a5c50f..5c21766 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/ConfUtil.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/ConfUtil.java @@ -23,7 +23,6 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.XMLConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.autoscaler.Constants; import org.wso2.carbon.utils.CarbonUtils; import java.io.File; @@ -49,7 +48,7 @@ public class ConfUtil { confFile = new File(configFilePath); } else { - confFile = new File(CarbonUtils.getCarbonConfigDirPath(), Constants.AUTOSCALER_CONFIG_FILE_NAME); + confFile = new File(CarbonUtils.getCarbonConfigDirPath(), AutoscalerConstants.AUTOSCALER_CONFIG_FILE_NAME); } config = new XMLConfiguration(confFile); } catch (ConfigurationException e) { http://git-wip-us.apache.org/repos/asf/stratos/blob/fcdc4b4e/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler-old.drl ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler-old.drl b/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler-old.drl index f24c410..bc045f7 100644 --- a/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler-old.drl +++ b/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler-old.drl @@ -23,7 +23,7 @@ import org.apache.stratos.messaging.domain.topology.Service; import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.autoscaler.context.AutoscalerContext; import org.apache.stratos.autoscaler.ClusterContext; -import org.apache.stratos.autoscaler.Constants; +import org.apache.stratos.autoscaler.util.AutoscalerConstants; import org.apache.stratos.autoscaler.pojo.policy.PolicyManager; import org.apache.stratos.autoscaler.pojo.policy.autoscale.AutoscalePolicy; import org.apache.stratos.messaging.domain.policy.Partition; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcdc4b4e/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler.drl ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler.drl b/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler.drl index 08fffe6..da4f293 100644 --- a/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler.drl +++ b/components/org.apache.stratos.autoscaler/src/test/resources/autoscaler.drl @@ -23,7 +23,7 @@ import org.apache.stratos.messaging.domain.topology.Service; import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.autoscaler.context.AutoscalerContext; import org.apache.stratos.autoscaler.ClusterContext; -import org.apache.stratos.autoscaler.Constants; +import org.apache.stratos.autoscaler.util.AutoscalerConstants; import org.apache.stratos.autoscaler.pojo.policy.PolicyManager; import org.apache.stratos.autoscaler.pojo.policy.autoscale.AutoscalePolicy; import org.apache.stratos.autoscaler.pojo.policy.autoscale.RequestsInFlight; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcdc4b4e/components/org.apache.stratos.autoscaler/src/test/resources/minimum-autoscaler-rule.drl ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/test/resources/minimum-autoscaler-rule.drl b/components/org.apache.stratos.autoscaler/src/test/resources/minimum-autoscaler-rule.drl index 1079729..228e5a2 100644 --- a/components/org.apache.stratos.autoscaler/src/test/resources/minimum-autoscaler-rule.drl +++ b/components/org.apache.stratos.autoscaler/src/test/resources/minimum-autoscaler-rule.drl @@ -23,7 +23,7 @@ import org.apache.stratos.messaging.domain.topology.Service; import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.autoscaler.context.AutoscalerContext; import org.apache.stratos.autoscaler.ClusterContext; -import org.apache.stratos.autoscaler.Constants; +import org.apache.stratos.autoscaler.util.AutoscalerConstants; import org.apache.stratos.autoscaler.pojo.policy.PolicyManager; import org.apache.stratos.autoscaler.pojo.policy.autoscale.AutoscalePolicy; import org.apache.stratos.messaging.domain.policy.Partition; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcdc4b4e/components/org.apache.stratos.autoscaler/src/test/resources/test-minimum-autoscaler-rule.drl ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/test/resources/test-minimum-autoscaler-rule.drl b/components/org.apache.stratos.autoscaler/src/test/resources/test-minimum-autoscaler-rule.drl index 65c9d37..d475524 100644 --- a/components/org.apache.stratos.autoscaler/src/test/resources/test-minimum-autoscaler-rule.drl +++ b/components/org.apache.stratos.autoscaler/src/test/resources/test-minimum-autoscaler-rule.drl @@ -22,7 +22,7 @@ package org.apache.stratos.autoscaler.rule; import org.apache.stratos.messaging.domain.topology.Service; import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.autoscaler.context.AutoscalerContext; -import org.apache.stratos.autoscaler.Constants; +import org.apache.stratos.autoscaler.util.AutoscalerConstants; import org.apache.stratos.autoscaler.pojo.policy.PolicyManager; import org.apache.stratos.autoscaler.pojo.policy.autoscale.AutoscalePolicy; import org.apache.stratos.autoscaler.pojo.policy.autoscale.RequestsInFlight; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcdc4b4e/components/org.apache.stratos.autoscaler/src/test/resources/test-terminating-obsoleted-members-rule.drl ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/test/resources/test-terminating-obsoleted-members-rule.drl b/components/org.apache.stratos.autoscaler/src/test/resources/test-terminating-obsoleted-members-rule.drl index 064fcda..a536ec7c 100644 --- a/components/org.apache.stratos.autoscaler/src/test/resources/test-terminating-obsoleted-members-rule.drl +++ b/components/org.apache.stratos.autoscaler/src/test/resources/test-terminating-obsoleted-members-rule.drl @@ -22,7 +22,7 @@ package org.apache.stratos.autoscaler.rule; import org.apache.stratos.messaging.domain.topology.Service; import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.autoscaler.context.AutoscalerContext; -import org.apache.stratos.autoscaler.Constants; +import org.apache.stratos.autoscaler.util.AutoscalerConstants; import org.apache.stratos.autoscaler.pojo.policy.PolicyManager; import org.apache.stratos.autoscaler.pojo.policy.autoscale.AutoscalePolicy; import org.apache.stratos.autoscaler.pojo.policy.autoscale.RequestsInFlight; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcdc4b4e/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl b/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl index 8125018..360b522 100755 --- a/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl +++ b/products/stratos/modules/distribution/src/main/conf/drools/mincheck.drl @@ -22,7 +22,7 @@ package org.apache.stratos.autoscaler.rule; import org.apache.stratos.messaging.domain.topology.Service; import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.autoscaler.context.AutoscalerContext; -import org.apache.stratos.autoscaler.Constants; +import org.apache.stratos.autoscaler.util.AutoscalerConstants; import org.apache.stratos.autoscaler.pojo.policy.PolicyManager; import org.apache.stratos.autoscaler.pojo.policy.autoscale.AutoscalePolicy; import org.apache.stratos.autoscaler.pojo.policy.autoscale.RequestsInFlight; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcdc4b4e/products/stratos/modules/distribution/src/main/conf/drools/obsoletecheck.drl ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/conf/drools/obsoletecheck.drl b/products/stratos/modules/distribution/src/main/conf/drools/obsoletecheck.drl index 14283e6..734cd0a 100755 --- a/products/stratos/modules/distribution/src/main/conf/drools/obsoletecheck.drl +++ b/products/stratos/modules/distribution/src/main/conf/drools/obsoletecheck.drl @@ -22,7 +22,7 @@ package org.apache.stratos.autoscaler.rule; import org.apache.stratos.messaging.domain.topology.Service; import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.autoscaler.context.AutoscalerContext; -import org.apache.stratos.autoscaler.Constants; +import org.apache.stratos.autoscaler.util.AutoscalerConstants; import org.apache.stratos.autoscaler.pojo.policy.PolicyManager; import org.apache.stratos.autoscaler.pojo.policy.autoscale.AutoscalePolicy; import org.apache.stratos.autoscaler.pojo.policy.autoscale.RequestsInFlight; http://git-wip-us.apache.org/repos/asf/stratos/blob/fcdc4b4e/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl index e4d7110..6b44be7 100644 --- a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl +++ b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl @@ -23,7 +23,7 @@ import org.apache.stratos.messaging.domain.topology.Service; import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.autoscaler.context.AutoscalerContext; import org.apache.stratos.autoscaler.context.member.MemberStatsContext; -import org.apache.stratos.autoscaler.Constants; +import org.apache.stratos.autoscaler.util.AutoscalerConstants; import org.apache.stratos.autoscaler.context.partition.network.ClusterLevelNetworkPartitionContext; import org.apache.stratos.autoscaler.pojo.policy.PolicyManager; import org.apache.stratos.autoscaler.pojo.policy.autoscale.AutoscalePolicy;
