You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/02/25 19:54:42 UTC
[07/50] [abbrv] stratos git commit: removing network management logic
from AS
removing network management logic from AS
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/504c0f40
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/504c0f40
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/504c0f40
Branch: refs/heads/master-deployment-policy-fix-merge
Commit: 504c0f40f7110cfa50cda0556221edb7b39ce8a7
Parents: 13519a6
Author: R-Rajkumar <rr...@gmail.com>
Authored: Tue Feb 17 10:41:01 2015 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Wed Feb 25 22:41:02 2015 +0530
----------------------------------------------------------------------
.../autoscaler/services/AutoscalerService.java | 37 +-----
.../services/impl/AutoscalerServiceImpl.java | 126 +++----------------
2 files changed, 15 insertions(+), 148 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/504c0f40/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java
index 5e748d7..1fb3c18 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/AutoscalerService.java
@@ -23,17 +23,13 @@ package org.apache.stratos.autoscaler.services;
import org.apache.stratos.autoscaler.applications.pojo.ApplicationContext;
import org.apache.stratos.autoscaler.exception.InvalidArgumentException;
-import org.apache.stratos.autoscaler.exception.kubernetes.InvalidServiceGroupException;
-import org.apache.stratos.autoscaler.pojo.policy.deployment.ApplicationPolicy;
-import org.apache.stratos.autoscaler.pojo.policy.deployment.DeploymentPolicy;
-import org.apache.stratos.autoscaler.exception.*;
import org.apache.stratos.autoscaler.exception.application.ApplicationDefinitionException;
import org.apache.stratos.autoscaler.exception.kubernetes.InvalidServiceGroupException;
import org.apache.stratos.autoscaler.exception.policy.InvalidPolicyException;
import org.apache.stratos.autoscaler.pojo.ServiceGroup;
import org.apache.stratos.autoscaler.pojo.policy.autoscale.AutoscalePolicy;
+import org.apache.stratos.autoscaler.pojo.policy.deployment.ApplicationPolicy;
import org.apache.stratos.autoscaler.pojo.policy.deployment.DeploymentPolicy;
-import org.apache.stratos.autoscaler.pojo.policy.deployment.partition.network.NetworkPartition;
import org.apache.stratos.common.Properties;
public interface AutoscalerService {
@@ -149,37 +145,6 @@ public interface AutoscalerService {
public ServiceGroup getServiceGroup(String name);
/**
- * Add network partition
- * @param networkPartition
- */
- public void addNetworkPartition(NetworkPartition networkPartition);
-
- /**
- * Remove network partition
- * @param networkPartitionId
- */
- public void removeNetworkPartition(String networkPartitionId);
-
- /**
- * Update network partition
- * @param networkPartition
- */
- public void updateNetworkPartition(NetworkPartition networkPartition);
-
- /**
- * Get network partitions
- * @return
- */
- public NetworkPartition[] getNetworkPartitions();
-
- /**
- * Get network partition by network partition id
- * @param networkPartitionId
- * @return
- */
- public NetworkPartition getNetworkPartition(String networkPartitionId);
-
- /**
* Find cluster id of an application by subscription alias.
* @param applicationId
* @param alias
http://git-wip-us.apache.org/repos/asf/stratos/blob/504c0f40/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
index 10873a0..d4cf5ac 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
@@ -18,13 +18,26 @@
*/
package org.apache.stratos.autoscaler.services.impl;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.autoscaler.applications.ApplicationHolder;
import org.apache.stratos.autoscaler.applications.parser.ApplicationParser;
import org.apache.stratos.autoscaler.applications.parser.DefaultApplicationParser;
-import org.apache.stratos.autoscaler.applications.pojo.*;
+import org.apache.stratos.autoscaler.applications.pojo.ApplicationClusterContext;
+import org.apache.stratos.autoscaler.applications.pojo.ApplicationContext;
+import org.apache.stratos.autoscaler.applications.pojo.ArtifactRepositoryContext;
+import org.apache.stratos.autoscaler.applications.pojo.CartridgeContext;
+import org.apache.stratos.autoscaler.applications.pojo.ComponentContext;
+import org.apache.stratos.autoscaler.applications.pojo.GroupContext;
+import org.apache.stratos.autoscaler.applications.pojo.SubscribableInfoContext;
import org.apache.stratos.autoscaler.applications.topic.ApplicationBuilder;
import org.apache.stratos.autoscaler.client.CloudControllerClient;
import org.apache.stratos.autoscaler.context.AutoscalerContext;
@@ -49,11 +62,9 @@ import org.apache.stratos.autoscaler.pojo.policy.deployment.partition.network.Ne
import org.apache.stratos.autoscaler.pojo.policy.deployment.partition.network.Partition;
import org.apache.stratos.autoscaler.registry.RegistryManager;
import org.apache.stratos.autoscaler.services.AutoscalerService;
-import org.apache.stratos.autoscaler.util.AutoscalerObjectConverter;
import org.apache.stratos.autoscaler.util.AutoscalerUtil;
import org.apache.stratos.common.Properties;
import org.apache.stratos.common.Property;
-import org.apache.stratos.common.client.CloudControllerServiceClient;
import org.apache.stratos.common.client.StratosManagerServiceClient;
import org.apache.stratos.common.util.CommonUtil;
import org.apache.stratos.manager.service.stub.domain.application.signup.ApplicationSignUp;
@@ -67,9 +78,6 @@ import org.apache.stratos.metadata.client.defaults.MetaDataServiceClient;
import org.apache.stratos.metadata.client.exception.MetaDataServiceClientException;
import org.wso2.carbon.registry.api.RegistryException;
-import java.text.MessageFormat;
-import java.util.*;
-
/**
* Auto Scaler Service API is responsible getting Partitions and Policies.
*/
@@ -632,112 +640,6 @@ public class AutoscalerServiceImpl implements AutoscalerService {
}
@Override
- public void addNetworkPartition(NetworkPartition networkPartition) {
- try {
- if(log.isInfoEnabled()) {
- log.info(String.format("Adding network partition: [network-partition-id] %s", networkPartition.getId()));
- }
-
- CloudControllerServiceClient cloudControllerServiceClient = CloudControllerServiceClient.getInstance();
- if(networkPartition.getPartitions() != null) {
- for(Partition partition : networkPartition.getPartitions()) {
- if(partition != null) {
- if(log.isInfoEnabled()) {
- log.info(String.format("Validating partition: [network-partition-id] %s [partition-id] %s",
- networkPartition.getId(), partition.getId()));
- }
-
- cloudControllerServiceClient.validatePartition(
- AutoscalerObjectConverter.convertASPartitionToCCPartition(partition));
-
- if(log.isInfoEnabled()) {
- log.info(String.format("Partition validated successfully: [network-partition-id] %s " +
- "[partition-id] %s", networkPartition.getId(), partition.getId()));
- }
- }
- }
- }
- RegistryManager.getInstance().persistNetworkPartition(networkPartition);
-
- if(log.isInfoEnabled()) {
- log.info(String.format("Network partition added successfully: [network-partition-id] %s",
- networkPartition.getId()));
- }
- } catch (Exception e) {
- String message = "Could not add network partition";
- log.error(message);
- throw new AutoScalerException(message, e);
- }
- }
-
- @Override
- public void removeNetworkPartition(String networkPartitionId) {
- try {
- if(log.isInfoEnabled()) {
- log.info(String.format("Removing network partition: [network-partition-id] %s", networkPartitionId));
- }
-
- // TODO: Add validation logic
- RegistryManager.getInstance().removeNetworkPartition(networkPartitionId);
-
- if(log.isInfoEnabled()) {
- log.info(String.format("Network partition removed successfully: [network-partition-id] %s",
- networkPartitionId));
- }
- } catch (Exception e) {
- String message = "Could not remove network partition";
- log.error(message);
- throw new AutoScalerException(message, e);
- }
- }
-
- @Override
- public void updateNetworkPartition(NetworkPartition networkPartition) {
- try {
- if (log.isInfoEnabled()) {
- log.info(String.format("Updating network partition: [network-partition-id] %s",
- networkPartition.getId()));
- }
-
- RegistryManager.getInstance().updateNetworkPartition(networkPartition);
-
- if (log.isInfoEnabled()) {
- log.info(String.format("Network partition updated successfully: [network-partition-id] %s",
- networkPartition.getId()));
- }
- } catch (Exception e) {
- String message = String.format("Could not update network partition: [network-partition-id] %s",
- networkPartition.getId());
- log.error(message);
- throw new AutoScalerException(message, e);
- }
- }
-
- @Override
- public NetworkPartition[] getNetworkPartitions() {
- try {
- List<NetworkPartition> networkPartitionList = RegistryManager.getInstance().getNetworkPartitions();
- return networkPartitionList.toArray(new NetworkPartition[networkPartitionList.size()]);
- } catch (Exception e) {
- String message = "Could not get network partitions";
- log.error(message);
- throw new AutoScalerException(message, e);
- }
- }
-
- @Override
- public NetworkPartition getNetworkPartition(String networkPartitionId) {
- try {
- return RegistryManager.getInstance().getNetworkPartition(networkPartitionId);
- } catch (Exception e) {
- String message = String.format("Could not get network partition: [network-partition-id] %s",
- networkPartitionId);
- log.error(message);
- throw new AutoScalerException(message, e);
- }
- }
-
- @Override
public String findClusterId(String applicationId, String alias) {
try {
Application application = ApplicationManager.getApplications().getApplication(applicationId);