Repository: stratos Updated Branches: refs/heads/master 67a439253 -> 3222a1266
Changing UI for portmapping Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/53c9facd Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/53c9facd Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/53c9facd Branch: refs/heads/master Commit: 53c9facdc482270eabfc4682ce8f3c9c1e3bc315 Parents: 874a220 Author: Pubudu Gunatilaka <[email protected]> Authored: Tue Aug 4 17:54:23 2015 +0530 Committer: Pubudu Gunatilaka <[email protected]> Committed: Tue Aug 4 17:54:23 2015 +0530 ---------------------------------------------------------------------- .../controller/domain/ClusterPortMapping.java | 3 ++- .../forms/default/configure/cartridges.json | 8 ++++++-- .../forms/schema/configure/cartridges.json | 13 +++++++++++++ .../org.apache.stratos.rest.endpoint/pom.xml | 6 ++++++ .../rest/endpoint/api/StratosApiV41Utils.java | 17 ++++++++--------- samples/cartridges/kubernetes/c1.json | 3 ++- samples/cartridges/kubernetes/c2.json | 3 ++- samples/cartridges/kubernetes/c3.json | 3 ++- samples/cartridges/kubernetes/c4.json | 3 ++- samples/cartridges/kubernetes/esb.json | 3 ++- samples/cartridges/kubernetes/tomcat.json | 3 ++- samples/cartridges/kubernetes/tomcat1.json | 3 ++- samples/cartridges/kubernetes/tomcat2.json | 3 ++- samples/cartridges/kubernetes/tomcat3.json | 3 ++- samples/cartridges/kubernetes/wso2-is.json | 3 ++- 15 files changed, 55 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/53c9facd/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterPortMapping.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterPortMapping.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterPortMapping.java index ee0ba91..a7413fe 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterPortMapping.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterPortMapping.java @@ -82,6 +82,7 @@ public class ClusterPortMapping extends PortMapping implements Serializable { public String toString() { return "[application-id] " + getApplicationId() + " [cluster-id] " + getClusterId() + ", " + - super.toString() + " [kubernetes-service-port] " + getKubernetesServicePort(); + super.toString() + " [kubernetes-service-port] " + getKubernetesServicePort() + ", " + + "[kubernetes-service-type] " + getKubernetesServiceType(); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/53c9facd/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json index 328428c..a9dc9c2 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json +++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json @@ -11,14 +11,18 @@ "metadataKeys" : [], "portMapping":[ { + "name":"http-80", "protocol":"http", "port":"80", - "proxyPort":"8280" + "proxyPort":"8280", + "kubernetesPortType":"NodePort" }, { + "name":"http-80", "protocol":"https", "port":"443", - "proxyPort":"8243" + "proxyPort":"8243", + "kubernetesPortType":"NodePort" } ], "iaasProvider":[ http://git-wip-us.apache.org/repos/asf/stratos/blob/53c9facd/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json index 1720fe6..c750620 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json +++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json @@ -128,6 +128,12 @@ "required": ["port", "protocol", "proxyPort"], "title": "PortMapping", "properties": { + "name": { + "type": "string", + "id": "root/portMapping/0/name", + "title": "Name", + "default": "http-8280" + }, "protocol": { "type": "string", "id": "root/portMapping/0/protocol", @@ -147,6 +153,13 @@ "title": "Proxy Port", "default": "8280", "format": "number" + }, + "kubernetesPortType": { + "type": "string", + "id": "root/portMapping/0/kubernetesPortType", + "title": "Kubernetes Port Type", + "default": "NodePort", + "enum": ["NodePort","ClusterIP"] } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/53c9facd/components/org.apache.stratos.rest.endpoint/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/pom.xml b/components/org.apache.stratos.rest.endpoint/pom.xml index 1ebfce4..c3372a3 100644 --- a/components/org.apache.stratos.rest.endpoint/pom.xml +++ b/components/org.apache.stratos.rest.endpoint/pom.xml @@ -131,6 +131,12 @@ </dependency> <dependency> <groupId>org.apache.stratos</groupId> + <artifactId>org.apache.stratos.kubernetes.client</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.cloud.controller.service.stub</artifactId> <version>${project.version}</version> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/stratos/blob/53c9facd/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index fdf9aa6..0a3970c 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java @@ -93,6 +93,7 @@ import org.wso2.carbon.user.api.UserStoreManager; import org.wso2.carbon.user.core.tenant.Tenant; import org.wso2.carbon.user.core.tenant.TenantManager; import org.wso2.carbon.utils.multitenancy.MultitenantConstants; +import org.apache.stratos.kubernetes.client.KubernetesConstants; import java.rmi.RemoteException; import java.util.*; @@ -104,8 +105,6 @@ public class StratosApiV41Utils { public static final String APPLICATION_STATUS_DEPLOYED = "Deployed"; public static final String APPLICATION_STATUS_CREATED = "Created"; public static final String APPLICATION_STATUS_UNDEPLOYING = "Undeploying"; - public static final String KUBERNETES_SERVICE_TYPE_NODEPORT = "NodePort"; - public static final String KUBERNETES_SERVICE_TYPE_CLUSTERIP = "ClusterIP"; public static final String KUBERNETES_IAAS_PROVIDER = "kubernetes"; private static final Log log = LogFactory.getLog(StratosApiV41Utils.class); @@ -135,6 +134,7 @@ public class StratosApiV41Utils { for (IaasProviderBean providers : iaasProviders) { if (providers.getType().equals(KUBERNETES_IAAS_PROVIDER)) { isKubernetesIaasProviderAvailable = true; + break; } } @@ -152,13 +152,12 @@ public class StratosApiV41Utils { if (isKubernetesIaasProviderAvailable) { if (type == null) { - throw new RestAPIException((String.format("Type is not found in portmapping: %s - Possible " + - "values - %s and %s", portMapping.getName(), KUBERNETES_SERVICE_TYPE_NODEPORT, - KUBERNETES_SERVICE_TYPE_CLUSTERIP))); - } else if (!type.equals(KUBERNETES_SERVICE_TYPE_NODEPORT) && !type.equals(KUBERNETES_SERVICE_TYPE_CLUSTERIP)) { - throw new RestAPIException((String.format("Type is not found in portmapping: %s - Possible " + - "values - %s and %s", portMapping.getName(), KUBERNETES_SERVICE_TYPE_NODEPORT, - KUBERNETES_SERVICE_TYPE_CLUSTERIP))); + portMapping.setKubernetesPortType(KubernetesConstants.NODE_PORT); + } else if (!type.equals(KubernetesConstants.NODE_PORT) && !type.equals + (KubernetesConstants.CLUSTER_IP)) { + throw new RestAPIException((String.format("Kubernetes" + + "PortType is invalid : %s - Possible values - %s and %s", portMapping.getName(), + KubernetesConstants.NODE_PORT, KubernetesConstants.CLUSTER_IP))); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/53c9facd/samples/cartridges/kubernetes/c1.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/c1.json b/samples/cartridges/kubernetes/c1.json index 145e2ce..26aa35a 100755 --- a/samples/cartridges/kubernetes/c1.json +++ b/samples/cartridges/kubernetes/c1.json @@ -12,7 +12,8 @@ "name": "http-22", "protocol": "http", "port": "22", - "proxyPort": "8280" + "proxyPort": "8280", + "kubernetesPortType":"NodePort" } ], "deployment": { http://git-wip-us.apache.org/repos/asf/stratos/blob/53c9facd/samples/cartridges/kubernetes/c2.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/c2.json b/samples/cartridges/kubernetes/c2.json index fd85892..e58ab6d 100755 --- a/samples/cartridges/kubernetes/c2.json +++ b/samples/cartridges/kubernetes/c2.json @@ -12,7 +12,8 @@ "name": "http-22", "protocol": "http", "port": "22", - "proxyPort": "8280" + "proxyPort": "8280", + "kubernetesPortType":"NodePort" } ], "deployment": { http://git-wip-us.apache.org/repos/asf/stratos/blob/53c9facd/samples/cartridges/kubernetes/c3.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/c3.json b/samples/cartridges/kubernetes/c3.json index 937e8d3..e83e139 100755 --- a/samples/cartridges/kubernetes/c3.json +++ b/samples/cartridges/kubernetes/c3.json @@ -12,7 +12,8 @@ "name": "http-22", "protocol": "http", "port": "22", - "proxyPort": "8280" + "proxyPort": "8280", + "kubernetesPortType":"NodePort" } ], "deployment": { http://git-wip-us.apache.org/repos/asf/stratos/blob/53c9facd/samples/cartridges/kubernetes/c4.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/c4.json b/samples/cartridges/kubernetes/c4.json index ec7d8b2..a8df05e 100755 --- a/samples/cartridges/kubernetes/c4.json +++ b/samples/cartridges/kubernetes/c4.json @@ -12,7 +12,8 @@ "name": "http-22", "protocol": "http", "port": "22", - "proxyPort": "8280" + "proxyPort": "8280", + "kubernetesPortType":"NodePort" } ], "deployment": { http://git-wip-us.apache.org/repos/asf/stratos/blob/53c9facd/samples/cartridges/kubernetes/esb.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/esb.json b/samples/cartridges/kubernetes/esb.json index 71af613..800f9ff 100755 --- a/samples/cartridges/kubernetes/esb.json +++ b/samples/cartridges/kubernetes/esb.json @@ -12,7 +12,8 @@ "name": "http-22", "protocol": "http", "port": "22", - "proxyPort": "8280" + "proxyPort": "8280", + "kubernetesPortType":"NodePort" } ], "deployment": { http://git-wip-us.apache.org/repos/asf/stratos/blob/53c9facd/samples/cartridges/kubernetes/tomcat.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/tomcat.json b/samples/cartridges/kubernetes/tomcat.json index 643584b..773fdbc 100755 --- a/samples/cartridges/kubernetes/tomcat.json +++ b/samples/cartridges/kubernetes/tomcat.json @@ -13,7 +13,8 @@ "name": "http-8080", "protocol": "http", "port": "8080", - "proxyPort": "8281" + "proxyPort": "8281", + "kubernetesPortType":"NodePort" } ], "deployment": { http://git-wip-us.apache.org/repos/asf/stratos/blob/53c9facd/samples/cartridges/kubernetes/tomcat1.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/tomcat1.json b/samples/cartridges/kubernetes/tomcat1.json index 1a2fc74..83c517d 100755 --- a/samples/cartridges/kubernetes/tomcat1.json +++ b/samples/cartridges/kubernetes/tomcat1.json @@ -12,7 +12,8 @@ "name": "http-22", "protocol": "http", "port": "22", - "proxyPort": "8280" + "proxyPort": "8280", + "kubernetesPortType":"NodePort" } ], "deployment": { http://git-wip-us.apache.org/repos/asf/stratos/blob/53c9facd/samples/cartridges/kubernetes/tomcat2.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/tomcat2.json b/samples/cartridges/kubernetes/tomcat2.json index 74172ff..a062ee3 100755 --- a/samples/cartridges/kubernetes/tomcat2.json +++ b/samples/cartridges/kubernetes/tomcat2.json @@ -12,7 +12,8 @@ "name": "http-22", "protocol": "http", "port": "22", - "proxyPort": "8280" + "proxyPort": "8280", + "kubernetesPortType":"NodePort" } ], "deployment": { http://git-wip-us.apache.org/repos/asf/stratos/blob/53c9facd/samples/cartridges/kubernetes/tomcat3.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/tomcat3.json b/samples/cartridges/kubernetes/tomcat3.json index b5bf194..6562183 100755 --- a/samples/cartridges/kubernetes/tomcat3.json +++ b/samples/cartridges/kubernetes/tomcat3.json @@ -12,7 +12,8 @@ "name": "tomcat-http", "protocol": "http", "port": "8080", - "proxyPort": "8280" + "proxyPort": "8280", + "kubernetesPortType":"NodePort" } ], "deployment": { http://git-wip-us.apache.org/repos/asf/stratos/blob/53c9facd/samples/cartridges/kubernetes/wso2-is.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/wso2-is.json b/samples/cartridges/kubernetes/wso2-is.json index 2b51714..41c8714 100644 --- a/samples/cartridges/kubernetes/wso2-is.json +++ b/samples/cartridges/kubernetes/wso2-is.json @@ -12,7 +12,8 @@ "name": "mgt-console", "protocol": "https", "port": "9443", - "proxyPort": "8443" + "proxyPort": "8443", + "kubernetesPortType":"NodePort" } ], "iaasProvider": [
