Renaming kubernetes pod name to pod label
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/746a15bf Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/746a15bf Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/746a15bf Branch: refs/heads/master Commit: 746a15bf44262bfe44261672422c0762ed55ac3b Parents: 6a5f4cd Author: Imesh Gunaratne <[email protected]> Authored: Fri Feb 27 18:03:08 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Fri Feb 27 18:03:08 2015 +0530 ---------------------------------------------------------------------- .../cloud/controller/domain/MemberContext.java | 12 +- .../iaases/kubernetes/KubernetesIaas.java | 2 +- .../main/resources/CloudControllerService.wsdl | 1944 +++++++++--------- 3 files changed, 974 insertions(+), 984 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/746a15bf/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/MemberContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/MemberContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/MemberContext.java index 2f9c058..df2f990 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/MemberContext.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/MemberContext.java @@ -73,7 +73,7 @@ public class MemberContext implements Serializable { private Properties properties; private NameValuePair[] dynamicPayload; private String kubernetesPodId; - private String kubernetesPodName; + private String kubernetesPodLabel; public MemberContext(String applicationId, String cartridgeType, String clusterId, String memberId) { @@ -270,12 +270,12 @@ public class MemberContext implements Serializable { return kubernetesPodId; } - public void setKubernetesPodName(String kubernetesPodName) { - this.kubernetesPodName = kubernetesPodName; + public void setKubernetesPodLabel(String kubernetesPodLabel) { + this.kubernetesPodLabel = kubernetesPodLabel; } - public String getKubernetesPodName() { - return kubernetesPodName; + public String getKubernetesPodLabel() { + return kubernetesPodLabel; } @Override @@ -296,7 +296,7 @@ public class MemberContext implements Serializable { + ", lbClusterId=" + lbClusterId + ", networkPartitionId=" + networkPartitionId + ", kubernetesPodId=" + kubernetesPodId - + ", kubernetesPodName=" + kubernetesPodName + + ", kubernetesPodLabel=" + kubernetesPodLabel + ", instanceMetadata=" + instanceMetadata + ", properties=" + properties + "]"; } http://git-wip-us.apache.org/repos/asf/stratos/blob/746a15bf/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java index 4ba2393..47e620c 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java @@ -390,7 +390,7 @@ public class KubernetesIaas extends Iaas { // Add pod id to member context and persist memberContext.setKubernetesPodId(podId); - memberContext.setKubernetesPodName(podLabel); + memberContext.setKubernetesPodLabel(podLabel); CloudControllerContext.getInstance().persist(); if (log.isInfoEnabled()) {
