You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/10/08 18:53:06 UTC
[12/27] git commit: Refactoring MemberContext ->
ContainerClusterContext
Refactoring MemberContext -> ContainerClusterContext
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8d57937e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8d57937e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8d57937e
Branch: refs/heads/container-autoscaling
Commit: 8d57937e2585d02862adb83a31e5623fa9aadc83
Parents: 25f0ec6
Author: Nirmal Fernando <ni...@gmail.com>
Authored: Tue Oct 7 17:55:33 2014 +0530
Committer: Nirmal Fernando <ni...@gmail.com>
Committed: Wed Oct 8 22:21:29 2014 +0530
----------------------------------------------------------------------
...ontainerClusterContextToKubernetesContainer.java | 16 ++++++----------
.../ContainerClusterContextToKubernetesService.java | 7 ++++---
...tainerClusterContextToReplicationController.java | 11 ++++++-----
3 files changed, 16 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d57937e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToKubernetesContainer.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToKubernetesContainer.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToKubernetesContainer.java
index dd45b3e..4c892eb 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToKubernetesContainer.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToKubernetesContainer.java
@@ -25,6 +25,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.pojo.Cartridge;
import org.apache.stratos.cloud.controller.pojo.ClusterContext;
+import org.apache.stratos.cloud.controller.pojo.ContainerClusterContext;
import org.apache.stratos.cloud.controller.pojo.MemberContext;
import org.apache.stratos.cloud.controller.pojo.PortMapping;
import org.apache.stratos.cloud.controller.pojo.Property;
@@ -38,16 +39,16 @@ import org.apache.stratos.kubernetes.client.model.Port;
import com.google.common.base.Function;
/**
- * Is responsible for converting a {@link MemberContext} object to a Kubernetes
+ * Is responsible for converting a {@link ContainerClusterContext} object to a Kubernetes
* {@link Container} Object.
*/
-public class MemberContextToKubernetesContainer implements Function<MemberContext, Container> {
+public class ContainerClusterContextToKubernetesContainer implements Function<ContainerClusterContext, Container> {
- private static final Log log = LogFactory.getLog(MemberContextToKubernetesContainer.class);
+ private static final Log log = LogFactory.getLog(ContainerClusterContextToKubernetesContainer.class);
private FasterLookUpDataHolder dataHolder = FasterLookUpDataHolder.getInstance();
@Override
- public Container apply(MemberContext memberContext) {
+ public Container apply(ContainerClusterContext memberContext) {
String clusterId = memberContext.getClusterId();
ClusterContext clusterContext = dataHolder.getClusterContext(clusterId);
@@ -94,18 +95,13 @@ public class MemberContextToKubernetesContainer implements Function<MemberContex
return portList.toArray(ports);
}
- private EnvironmentVariable[] getEnvironmentVars(MemberContext memberCtxt, ClusterContext ctxt) {
+ private EnvironmentVariable[] getEnvironmentVars(ContainerClusterContext memberCtxt, ClusterContext ctxt) {
String kubernetesClusterId = CloudControllerUtil.getProperty(ctxt.getProperties(),
StratosConstants.KUBERNETES_CLUSTER_ID);
List<EnvironmentVariable> envVars = new ArrayList<EnvironmentVariable>();
addToEnvironment(envVars, ctxt.getPayload());
- // FIXME member id, should it be unique for a container?
- addToEnvironment(envVars, StratosConstants.MEMBER_ID, memberCtxt.getMemberId());
- addToEnvironment(envVars, StratosConstants.LB_CLUSTER_ID, memberCtxt.getLbClusterId());
- addToEnvironment(envVars, StratosConstants.NETWORK_PARTITION_ID,
- memberCtxt.getNetworkPartitionId());
addToEnvironment(envVars, StratosConstants.KUBERNETES_CLUSTER_ID, kubernetesClusterId);
if (memberCtxt.getProperties() != null) {
org.apache.stratos.cloud.controller.pojo.Properties props1 = memberCtxt.getProperties();
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d57937e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToKubernetesService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToKubernetesService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToKubernetesService.java
index 724891e..c515a3b 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToKubernetesService.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToKubernetesService.java
@@ -19,6 +19,7 @@
package org.apache.stratos.cloud.controller.functions;
import org.apache.stratos.cloud.controller.pojo.ClusterContext;
+import org.apache.stratos.cloud.controller.pojo.ContainerClusterContext;
import org.apache.stratos.cloud.controller.pojo.KubernetesClusterContext;
import org.apache.stratos.cloud.controller.pojo.MemberContext;
import org.apache.stratos.cloud.controller.runtime.FasterLookUpDataHolder;
@@ -30,15 +31,15 @@ import org.apache.stratos.kubernetes.client.model.Service;
import com.google.common.base.Function;
/**
- * Is responsible for converting a {@link MemberContext} object to a Kubernetes
+ * Is responsible for converting a {@link ContainerClusterContext} object to a Kubernetes
* {@link Service} Object.
*/
-public class MemberContextToKubernetesService implements Function<MemberContext, Service> {
+public class ContainerClusterContextToKubernetesService implements Function<ContainerClusterContext, Service> {
private FasterLookUpDataHolder dataHolder = FasterLookUpDataHolder.getInstance();
@Override
- public Service apply(MemberContext memberContext) {
+ public Service apply(ContainerClusterContext memberContext) {
String clusterId = memberContext.getClusterId();
ClusterContext clusterContext = dataHolder.getClusterContext(clusterId);
http://git-wip-us.apache.org/repos/asf/stratos/blob/8d57937e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToReplicationController.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToReplicationController.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToReplicationController.java
index b2805cb..08b7ab5 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToReplicationController.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToReplicationController.java
@@ -19,6 +19,7 @@
package org.apache.stratos.cloud.controller.functions;
import org.apache.stratos.cloud.controller.pojo.ClusterContext;
+import org.apache.stratos.cloud.controller.pojo.ContainerClusterContext;
import org.apache.stratos.cloud.controller.pojo.MemberContext;
import org.apache.stratos.cloud.controller.runtime.FasterLookUpDataHolder;
import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
@@ -34,16 +35,16 @@ import org.apache.stratos.kubernetes.client.model.State;
import com.google.common.base.Function;
/**
- * Is responsible for converting a {@link MemberContext} object to a Kubernetes
+ * Is responsible for converting a {@link ContainerClusterContext} object to a Kubernetes
* {@link ReplicationController} Object.
*/
-public class MemberContextToReplicationController implements
- Function<MemberContext, ReplicationController> {
+public class ContainerClusterContextToReplicationController implements
+ Function<ContainerClusterContext, ReplicationController> {
private FasterLookUpDataHolder dataHolder = FasterLookUpDataHolder.getInstance();
@Override
- public ReplicationController apply(MemberContext memberContext) {
+ public ReplicationController apply(ContainerClusterContext memberContext) {
String clusterId = memberContext.getClusterId();
ClusterContext clusterContext = dataHolder.getClusterContext(clusterId);
@@ -66,7 +67,7 @@ public class MemberContextToReplicationController implements
manifest.setVersion("v1beta1");
manifest.setId(clusterContext.getClusterId());
- MemberContextToKubernetesContainer containerFunc = new MemberContextToKubernetesContainer();
+ ContainerClusterContextToKubernetesContainer containerFunc = new ContainerClusterContextToKubernetesContainer();
Container container = containerFunc.apply(memberContext);
manifest.setContainers(new Container[] { container });