Repository: stratos Updated Branches: refs/heads/master 60fdd83ea -> 5beeb089f
Adding ALLOCATED_SERVICE_HOST_PORT into the member context. Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5beeb089 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5beeb089 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5beeb089 Branch: refs/heads/master Commit: 5beeb089f29b7ec82d66d186f2046911faae0585 Parents: 60fdd83 Author: Nirmal Fernando <[email protected]> Authored: Thu Oct 2 13:08:47 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Thu Oct 2 13:08:47 2014 +0530 ---------------------------------------------------------------------- .../controller/impl/CloudControllerServiceImpl.java | 10 +++++++--- .../cloud/controller/util/CloudControllerUtil.java | 13 +++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5beeb089/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java index 7abc6b7..3dff46f 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java @@ -1426,9 +1426,13 @@ public class CloudControllerServiceImpl implements CloudControllerService { + controller + " via Kubernetes layer."); } - memberContext.setPublicIpAddress(kubernetesMasterIp); - memberContext.setPrivateIpAddress(kubernetesMasterIp); - dataHolder.addMemberContext(memberContext); + memberContext.setPublicIpAddress(kubernetesMasterIp); + memberContext.setPrivateIpAddress(kubernetesMasterIp); + memberContext.setProperties(CloudControllerUtil.addProperty(memberContext + .getProperties(), StratosConstants.ALLOCATED_SERVICE_HOST_PORT, + CloudControllerUtil.getProperty(ctxt.getProperties(), + StratosConstants.ALLOCATED_SERVICE_HOST_PORT))); + dataHolder.addMemberContext(memberContext); // persist in registry persist(); http://git-wip-us.apache.org/repos/asf/stratos/blob/5beeb089/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java index 019dbdb..6374cc9 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java @@ -18,6 +18,7 @@ */ package org.apache.stratos.cloud.controller.util; +import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.deployment.partition.Partition; @@ -309,6 +310,18 @@ public class CloudControllerUtil { return getProperty(props, key); } + public static org.apache.stratos.cloud.controller.pojo.Properties addProperty( + org.apache.stratos.cloud.controller.pojo.Properties properties, String key, String value) { + Property property = new Property(); + property.setName(key); + property.setValue(value); + + org.apache.stratos.cloud.controller.pojo.Properties newProperties = + new org.apache.stratos.cloud.controller.pojo.Properties(); + newProperties.setProperties(ArrayUtils.add(properties.getProperties(), property)); + return newProperties; + } + /** * Converts org.apache.stratos.messaging.util.Properties to java.util.Properties * @param properties org.apache.stratos.messaging.util.Properties
