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:37 UTC
[1/6] stratos git commit: Adding PORT_MAPPINGS to payload parameters
in jcloud IaaS
Repository: stratos
Updated Branches:
refs/heads/master 6ff03c4b9 -> 0f2b953bf
Adding PORT_MAPPINGS to payload parameters in jcloud IaaS
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/27190b76
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/27190b76
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/27190b76
Branch: refs/heads/master
Commit: 27190b76b7a87270dfd0814cc34e8ce0695bf1e3
Parents: 6ff03c4
Author: anuruddhal <an...@gmail.com>
Authored: Wed Aug 12 22:47:32 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Aug 13 17:32:31 2015 +0530
----------------------------------------------------------------------
.../applications/ApplicationUtils.java | 33 +++++++++++++++++---
.../applications/payload/BasicPayloadData.java | 14 ++++++++-
2 files changed, 42 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/27190b76/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 c8de90f..56dc571 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
@@ -75,7 +75,7 @@ public class ApplicationUtils {
return globalProperties;
}
- private static String createPortMappingPayloadString(Cartridge cartridge) {
+ private static String createPortsToPayloadString(Cartridge cartridge) {
// port mappings
StringBuilder portMapBuilder = new StringBuilder();
@@ -87,8 +87,7 @@ public class ApplicationUtils {
}
for (PortMapping portMapping : portMappings) {
- int port = portMapping.getPort();
- portMapBuilder.append(port).append("|");
+ portMapBuilder.append(portMapping.getPort()).append("|");
}
// remove last "|" character
@@ -97,6 +96,31 @@ public class ApplicationUtils {
return portMappingString;
}
+ private static String createPortMappingsToPayloadString(Cartridge cartridge) {
+
+ // port mappings
+ StringBuilder portMapBuilder = new StringBuilder();
+ PortMapping[] portMappings = cartridge.getPortMappings();
+
+ if (cartridge.getPortMappings()[0] == null) {
+ // first element is null, which means no port mappings.
+ return null;
+ }
+
+ for (PortMapping portMapping : portMappings) {
+ int port = portMapping.getPort();
+ //'NAME:mgt-console|PROTOCOL:https|PORT:30649|PROXY_PORT:0|TYPE:NodePort
+ portMapBuilder.append(String.format("NAME:%s|PROTOCOL:%s|PORT:%d|PROXY_PORT:%d|TYPE:%s;",
+ portMapping.getName(), portMapping.getProtocol(),
+ portMapping.getPort(), portMapping.getProxyPort(),
+ portMapping.getKubernetesPortType()));
+ }
+ //remove last ;
+ String portMappingString = portMapBuilder.toString().replaceAll(";$", "");
+ return portMappingString;
+
+ }
+
public static StringBuilder getTextPayload(String appId, String groupName, String clusterId) {
StringBuilder payloadBuilder = new StringBuilder();
@@ -220,7 +244,8 @@ public class ApplicationUtils {
basicPayloadData.setSubscriptionKey(subscriptionKey);
//basicPayloadData.setDeployment("default");//currently hard coded to default
basicPayloadData.setMultitenant(String.valueOf(cartridge.getMultiTenant()));
- basicPayloadData.setPortMappings(createPortMappingPayloadString(cartridge));
+ basicPayloadData.setPorts(createPortsToPayloadString(cartridge));
+ basicPayloadData.setPortMappings(createPortMappingsToPayloadString(cartridge));
basicPayloadData.setServiceName(cartridge.getType());
basicPayloadData.setProvider(cartridge.getProvider());
basicPayloadData.setLvsVirtualIP(lvsVirtualIP);
http://git-wip-us.apache.org/repos/asf/stratos/blob/27190b76/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java
index 86fbac7..67d88e4 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/payload/BasicPayloadData.java
@@ -48,6 +48,7 @@ public class BasicPayloadData implements Serializable {
private String subscriptionKey;
private String applicationPath;
private String gitRepositoryUrl;
+ private String ports;
private String portMappings;
private String multitenant;
private String provider;
@@ -94,7 +95,9 @@ public class BasicPayloadData implements Serializable {
payloadBuilder.append(",");
payloadBuilder.append("REPO_URL=" + getGitRepositoryUrl());
payloadBuilder.append(",");
- payloadBuilder.append("PORTS=" + getPortMappings());
+ payloadBuilder.append("PORTS=" + getPorts());
+ payloadBuilder.append(",");
+ payloadBuilder.append("PORT_MAPPINGS=" + getPortMappings());
payloadBuilder.append(",");
payloadBuilder.append("PROVIDER=" + getProvider());
@@ -226,6 +229,14 @@ public class BasicPayloadData implements Serializable {
this.gitRepositoryUrl = gitRepositoryUrl;
}
+ public String getPorts() {
+ return ports;
+ }
+
+ public void setPorts(String ports) {
+ this.ports = ports;
+ }
+
public String getPortMappings() {
return portMappings;
}
@@ -234,6 +245,7 @@ public class BasicPayloadData implements Serializable {
this.portMappings = portMappings;
}
+
public String getMultitenant() {
return multitenant;
}
[5/6] stratos git commit: Changing comment
Posted by im...@apache.org.
Changing comment
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0b749e6b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0b749e6b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0b749e6b
Branch: refs/heads/master
Commit: 0b749e6bd0248f58fd6c5384f52e672cebf20745
Parents: c539fd7
Author: anuruddhal <an...@gmail.com>
Authored: Thu Aug 13 09:44:47 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Aug 13 17:32:32 2015 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/applications/ApplicationUtils.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/0b749e6b/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 6996768..d43f364 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
@@ -80,7 +80,7 @@ public class ApplicationUtils {
* This method creates payload string with port numbers in
* 'PORTS': '9443|8280|8243' format
* @param cartridge
- * @return String containing port mapping
+ * @return String containing ports
*/
private static String createPortsToPayloadString(Cartridge cartridge) {
@@ -108,9 +108,8 @@ public class ApplicationUtils {
* 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
+ * @return string containing port mapping
*/
private static String createPortMappingsToPayloadString(Cartridge cartridge) {
[2/6] stratos git commit: This closes #432 on GitHub
Posted by im...@apache.org.
This closes #432 on GitHub
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0f2b953b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0f2b953b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0f2b953b
Branch: refs/heads/master
Commit: 0f2b953bf51ff5d70c7f4c0fb163fce63cd0f112
Parents: 0b749e6
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu Aug 13 17:32:32 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Aug 13 17:32:32 2015 +0530
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/6] stratos git commit: Adding method comments and constants
Posted by im...@apache.org.
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;
[6/6] stratos git commit: Fixing comment
Posted by im...@apache.org.
Fixing comment
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bc435288
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bc435288
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bc435288
Branch: refs/heads/master
Commit: bc435288a5993b86ab4667f35d66ddc493b34d40
Parents: cc8f9de
Author: anuruddhal <an...@gmail.com>
Authored: Thu Aug 13 09:30:36 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Aug 13 17:32:32 2015 +0530
----------------------------------------------------------------------
.../apache/stratos/autoscaler/applications/ApplicationUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bc435288/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 fc04723..b9d04e0 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
@@ -124,7 +124,7 @@ public class ApplicationUtils {
for (PortMapping portMapping : portMappings) {
int port = portMapping.getPort();
- //'NAME:mgt-console|PROTOCOL:https|PORT:30649|PROXY_PORT:0|TYPE:NodePort
+ //Format : NAME:mgt-console|PROTOCOL:https|PORT:30649|PROXY_PORT:0|TYPE:NodePort;
portMapBuilder.append(String.format("NAME:%s|PROTOCOL:%s|PORT:%d|PROXY_PORT:%d|TYPE:%s;",
portMapping.getName(), portMapping.getProtocol(),
portMapping.getPort(), portMapping.getProxyPort(),
[3/6] stratos git commit: Changing comment
Posted by im...@apache.org.
Changing comment
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c539fd7f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c539fd7f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c539fd7f
Branch: refs/heads/master
Commit: c539fd7ff7190255e9812404515d5384d0864917
Parents: bc43528
Author: anuruddhal <an...@gmail.com>
Authored: Thu Aug 13 09:42:09 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Aug 13 17:32:32 2015 +0530
----------------------------------------------------------------------
.../autoscaler/applications/ApplicationUtils.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c539fd7f/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 b9d04e0..6996768 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
@@ -77,10 +77,8 @@ public class ApplicationUtils {
}
/**
- * 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
+ * This method creates payload string with port numbers in
+ * 'PORTS': '9443|8280|8243' format
* @param cartridge
* @return String containing port mapping
*/
@@ -106,8 +104,11 @@ public class ApplicationUtils {
}
/**
- * This method creates payload string with port numbers in
- * 'PORTS': '9443|8280|8243' format
+ * 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
*/