You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/08/13 14:02:40 UTC
[4/6] stratos git commit: Adding method comments and constants
Adding method comments and constants
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/cc8f9de3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/cc8f9de3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/cc8f9de3
Branch: refs/heads/master
Commit: cc8f9de3d3dc6516c46703d00be8188b69307182
Parents: 27190b7
Author: anuruddhal <an...@gmail.com>
Authored: Thu Aug 13 09:28:28 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Aug 13 17:32:32 2015 +0530
----------------------------------------------------------------------
.../applications/ApplicationUtils.java | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/cc8f9de3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java
index 56dc571..fc04723 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/ApplicationUtils.java
@@ -39,6 +39,7 @@ import java.util.regex.Pattern;
public class ApplicationUtils {
public static final String TOKEN_PAYLOAD_PARAM_NAME = "TOKEN";
public static final String DEPLOYMENT = "DEPLOYMENT";
+ private static final String PORT_SEPARATOR="|";
public static final String PAYLOAD_PARAMETER = "payload_parameter.";
private static final Log log = LogFactory.getLog(ApplicationUtils.class);
public static Pattern ALIAS_PATTERN = Pattern.compile("([a-z0-9]+([-][a-z0-9])*)+");
@@ -75,6 +76,14 @@ public class ApplicationUtils {
return globalProperties;
}
+ /**
+ * This method creates payload string with port mappings in following format.
+ * PORT_MAPPINGS='NAME:mgt-console|PROTOCOL:https|PORT:30649|PROXY_PORT:0|TYPE:NodePort;
+ * NAME:pt-http|PROTOCOL:http|PORT:30650|PROXY_PORT:0|TYPE:NodePort;
+ * NAME:pt-https|PROTOCOL:https|PORT:30651|PROXY_PORT:0|TYPE:NodePort
+ * @param cartridge
+ * @return String containing port mapping
+ */
private static String createPortsToPayloadString(Cartridge cartridge) {
// port mappings
@@ -87,7 +96,7 @@ public class ApplicationUtils {
}
for (PortMapping portMapping : portMappings) {
- portMapBuilder.append(portMapping.getPort()).append("|");
+ portMapBuilder.append(portMapping.getPort()).append(PORT_SEPARATOR);
}
// remove last "|" character
@@ -96,6 +105,12 @@ public class ApplicationUtils {
return portMappingString;
}
+ /**
+ * This method creates payload string with port numbers in
+ * 'PORTS': '9443|8280|8243' format
+ * @param cartridge
+ * @return
+ */
private static String createPortMappingsToPayloadString(Cartridge cartridge) {
// port mappings
@@ -115,7 +130,7 @@ public class ApplicationUtils {
portMapping.getPort(), portMapping.getProxyPort(),
portMapping.getKubernetesPortType()));
}
- //remove last ;
+ //remove last ";" character
String portMappingString = portMapBuilder.toString().replaceAll(";$", "");
return portMappingString;