You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/03/01 19:35:37 UTC
[16/50] [abbrv] stratos git commit: Removing kubernetes cluster id
from network partition and adding it as a partition property
Removing kubernetes cluster id from network partition and adding it as a partition property
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/eb9b8731
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/eb9b8731
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/eb9b8731
Branch: refs/heads/docker-grouping-merge
Commit: eb9b873115db7c41fe2c7c7184c5dca40a5fb50d
Parents: 22fdf78
Author: Imesh Gunaratne <im...@apache.org>
Authored: Fri Feb 27 22:45:11 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Feb 27 22:45:56 2015 +0530
----------------------------------------------------------------------
.../stratos/cli/RestCommandLineService.java | 7 +-
.../controller/domain/NetworkPartition.java | 9 -
.../cloud/controller/domain/Partition.java | 21 +-
.../KubernetesPartitionValidator.java | 2 +-
.../impl/CloudControllerServiceImpl.java | 8 +-
.../impl/CloudControllerServiceUtil.java | 38 +-
.../beans/partition/NetworkPartitionBean.java | 9 -
.../util/converter/ObjectConverter.java | 1 -
.../main/resources/CloudControllerService.wsdl | 2459 +++++++++---------
9 files changed, 1244 insertions(+), 1310 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/eb9b8731/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
index 67d6b7c..76676c4 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
@@ -1598,10 +1598,9 @@ public class RestCommandLineService {
RowMapper<NetworkPartitionBean> networkPartitionMapper = new RowMapper<NetworkPartitionBean>() {
public String[] getData(NetworkPartitionBean partition) {
- String[] data = new String[3];
+ String[] data = new String[2];
data[0] = partition.getId();
- data[1] = (partition.getKubernetesClusterId() != null) ? partition.getKubernetesClusterId() : "";
- data[2] = String.valueOf(partition.getPartitions().size());;
+ data[1] = String.valueOf(partition.getPartitions().size());;
return data;
}
};
@@ -1610,7 +1609,7 @@ public class RestCommandLineService {
partitions = networkPartitionsList.toArray(partitions);
System.out.println("Network partitions found:");
- CliUtils.printTable(partitions, networkPartitionMapper, "PartitionId", "Kubernetes Cluster Id", "Partitions");
+ CliUtils.printTable(partitions, networkPartitionMapper, "Network Partition ID", "Number of Partitions");
} catch (Exception e) {
String message = "Error in listing network partitions";
printError(message, e);
http://git-wip-us.apache.org/repos/asf/stratos/blob/eb9b8731/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkPartition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkPartition.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkPartition.java
index e9efd88..f70d161 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkPartition.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/NetworkPartition.java
@@ -30,7 +30,6 @@ public class NetworkPartition implements Serializable {
private static final long serialVersionUID = -8043298009352097370L;
private String id;
- private String kubernetesClusterId;
private boolean activeByDefault;
private Partition[] partitions;
@@ -82,12 +81,4 @@ public class NetworkPartition implements Serializable {
}
return null;
}
-
- public String getKubernetesClusterId() {
- return kubernetesClusterId;
- }
-
- public void setKubernetesClusterId(String kubernetesClusterId) {
- this.kubernetesClusterId = kubernetesClusterId;
- }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/eb9b8731/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Partition.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Partition.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Partition.java
index b84d914..c69d07a 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Partition.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Partition.java
@@ -19,6 +19,7 @@
package org.apache.stratos.cloud.controller.domain;
import org.apache.stratos.common.Properties;
+import org.apache.stratos.common.Property;
import java.io.Serializable;
@@ -28,6 +29,9 @@ import java.io.Serializable;
public class Partition implements Serializable {
private static final long serialVersionUID = 3725971287992010720L;
+
+ private static final String KUBERNETES_CLUSTER = "cluster";
+
/**
* provider should match with an IaasProvider type.
*/
@@ -35,7 +39,6 @@ public class Partition implements Serializable {
private String id;
private String description;
private boolean isPublic;
- private String kubernetesClusterId;
private Properties properties = new Properties();
/**
@@ -121,6 +124,14 @@ public class Partition implements Serializable {
this.provider = provider;
}
+ public String getKubernetesClusterId() {
+ Property property = properties.getProperty(KUBERNETES_CLUSTER);
+ if(property != null) {
+ return property.getValue();
+ }
+ return null;
+ }
+
@Override
public String toString() {
return "Partition [id=" + id + ", description=" + description + ", isPublic=" + isPublic
@@ -139,12 +150,4 @@ public class Partition implements Serializable {
public int hashCode() {
return this.id.hashCode();
}
-
- public String getKubernetesClusterId() {
- return kubernetesClusterId;
- }
-
- public void setKubernetesClusterId(String kubernetesClusterId) {
- this.kubernetesClusterId = kubernetesClusterId;
- }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/eb9b8731/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesPartitionValidator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesPartitionValidator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesPartitionValidator.java
index 0c79309..8eedc88 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesPartitionValidator.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesPartitionValidator.java
@@ -56,7 +56,7 @@ public class KubernetesPartitionValidator implements PartitionValidator {
String kubernetesClusterId = partition.getKubernetesClusterId();
if (StringUtils.isBlank(kubernetesClusterId)) {
- String message = "Kubernetes cluster id not found in partition: [partition-id] " + partition.getId();
+ String message = "Kubernetes cluster not defined in partition: [partition-id] " + partition.getId();
log.error(message);
throw new InvalidPartitionException(message);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/eb9b8731/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 3f17439..d39fb00 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
@@ -32,8 +32,6 @@ import org.apache.stratos.cloud.controller.domain.kubernetes.KubernetesHost;
import org.apache.stratos.cloud.controller.domain.kubernetes.KubernetesMaster;
import org.apache.stratos.cloud.controller.exception.*;
import org.apache.stratos.cloud.controller.iaases.Iaas;
-import org.apache.stratos.cloud.controller.messaging.publisher.StatisticsDataPublisher;
-import org.apache.stratos.cloud.controller.messaging.publisher.TopologyEventPublisher;
import org.apache.stratos.cloud.controller.messaging.topology.TopologyBuilder;
import org.apache.stratos.cloud.controller.messaging.topology.TopologyManager;
import org.apache.stratos.cloud.controller.services.CloudControllerService;
@@ -42,7 +40,6 @@ import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
import org.apache.stratos.common.Property;
import org.apache.stratos.common.threading.StratosThreadPool;
import org.apache.stratos.messaging.domain.topology.*;
-import org.apache.stratos.messaging.event.topology.MemberReadyToShutdownEvent;
import java.net.MalformedURLException;
import java.net.URL;
@@ -1501,10 +1498,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
}
}
}
-
- // overwrites partitions' kubernetes cluster ids with network partition's kubernetes cluster id
- CloudControllerServiceUtil.overwritesPartitionsKubernetesClusterIdsWithNetworkPartitionKubernetesClusterId(networkPartition);
-
+
// adding network partition to CC-Context
CloudControllerContext.getInstance().addNetworkPartition(networkPartition);
// persisting CC-Context
http://git-wip-us.apache.org/repos/asf/stratos/blob/eb9b8731/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceUtil.java
index 7cc8bed..dc492d5 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceUtil.java
@@ -19,22 +19,11 @@
package org.apache.stratos.cloud.controller.services.impl;
-import java.util.List;
-import java.util.Properties;
-
import com.google.common.net.InetAddresses;
-
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.context.CloudControllerContext;
-import org.apache.stratos.cloud.controller.domain.DeploymentPolicy;
-import org.apache.stratos.cloud.controller.domain.IaasProvider;
-import org.apache.stratos.cloud.controller.domain.MemberContext;
-import org.apache.stratos.cloud.controller.domain.NetworkPartition;
-import org.apache.stratos.cloud.controller.domain.NetworkPartitionRef;
-import org.apache.stratos.cloud.controller.domain.Partition;
-import org.apache.stratos.cloud.controller.domain.PartitionRef;
+import org.apache.stratos.cloud.controller.domain.*;
import org.apache.stratos.cloud.controller.exception.InvalidDeploymentPolicyException;
import org.apache.stratos.cloud.controller.exception.InvalidIaasProviderException;
import org.apache.stratos.cloud.controller.exception.InvalidPartitionException;
@@ -46,6 +35,8 @@ import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
import org.apache.stratos.common.constants.StratosConstants;
import org.apache.stratos.messaging.domain.topology.MemberStatus;
+import java.util.Properties;
+
/**
* Cloud controller service utility methods.
*/
@@ -236,27 +227,4 @@ public class CloudControllerServiceUtil {
}
}
}
-
- /**
- * Overwrites partition's kubernetes cluster ids with network partition's kubernetes cluster ids.
- * @param networkPartitions
- */
- public static void overwritesPartitionsKubernetesClusterIdsWithNetworkPartitionKubernetesClusterId(NetworkPartition networkPartition) {
-
- if(StringUtils.isNotBlank(networkPartition.getKubernetesClusterId())) {
- Partition[] partitions = networkPartition.getPartitions();
- if(partitions != null) {
- for(Partition partition : partitions) {
- if(partition != null) {
- if(log.isInfoEnabled()) {
- log.info(String.format("Overwriting partition's kubernetes cluster id: " +
- "[network-partition-id] %s [partition-id] %s [kubernetes-cluster-id] %s",
- networkPartition.getId(), partition.getId(), networkPartition.getKubernetesClusterId()));
- }
- partition.setKubernetesClusterId(networkPartition.getKubernetesClusterId());
- }
- }
- }
- }
- }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/eb9b8731/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java
index 9a6cd37..dcdea43 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/NetworkPartitionBean.java
@@ -26,7 +26,6 @@ import java.util.List;
public class NetworkPartitionBean {
private String id;
- private String kubernetesClusterId;
private List<PartitionBean> partitions;
public String getId() {
@@ -37,14 +36,6 @@ public class NetworkPartitionBean {
this.id = id;
}
- public String getKubernetesClusterId() {
- return kubernetesClusterId;
- }
-
- public void setKubernetesClusterId(String kubernetesClusterId) {
- this.kubernetesClusterId = kubernetesClusterId;
- }
-
public List<PartitionBean> getPartitions() {
return partitions;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/eb9b8731/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index a53c511..0f05e5a 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -522,7 +522,6 @@ public class ObjectConverter {
org.apache.stratos.cloud.controller.stub.domain.NetworkPartition networkPartition = new org.apache.stratos.cloud.controller.stub.domain.NetworkPartition();
networkPartition.setId(networkPartitionBean.getId());
- networkPartition.setKubernetesClusterId(networkPartitionBean.getKubernetesClusterId());
if (networkPartitionBean.getPartitions() != null && !networkPartitionBean.getPartitions().isEmpty()) {
networkPartition.setPartitions(convertPartitionToCCPartitionPojos(networkPartitionBean.getPartitions()));
}