You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/08/12 13:32:25 UTC
[02/50] [abbrv] stratos git commit: Changing UI to have a default
value in kubernetesPortType
Changing UI to have a default value in kubernetesPortType
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/43d8d0ef
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/43d8d0ef
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/43d8d0ef
Branch: refs/heads/data-publisher-integration
Commit: 43d8d0efaf1924eaf5a5f4db5304bc84194488a7
Parents: 53c9fac
Author: Pubudu Gunatilaka <pu...@gmail.com>
Authored: Wed Aug 5 12:34:22 2015 +0530
Committer: Pubudu Gunatilaka <pu...@gmail.com>
Committed: Wed Aug 5 12:34:22 2015 +0530
----------------------------------------------------------------------
.../console/controllers/forms/default/configure/cartridges.json | 4 ++--
.../console/controllers/forms/schema/configure/cartridges.json | 2 +-
.../org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/43d8d0ef/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 a9dc9c2..9bd2e6e 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
@@ -15,14 +15,14 @@
"protocol":"http",
"port":"80",
"proxyPort":"8280",
- "kubernetesPortType":"NodePort"
+ "kubernetesPortType":""
},
{
"name":"http-80",
"protocol":"https",
"port":"443",
"proxyPort":"8243",
- "kubernetesPortType":"NodePort"
+ "kubernetesPortType":""
}
],
"iaasProvider":[
http://git-wip-us.apache.org/repos/asf/stratos/blob/43d8d0ef/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 c750620..6033c78 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
@@ -159,7 +159,7 @@
"id": "root/portMapping/0/kubernetesPortType",
"title": "Kubernetes Port Type",
"default": "NodePort",
- "enum": ["NodePort","ClusterIP"]
+ "enum": ["","NodePort","ClusterIP"]
}
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/43d8d0ef/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 0a3970c..716076d 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
@@ -151,7 +151,7 @@ public class StratosApiV41Utils {
String type = portMapping.getKubernetesPortType();
if (isKubernetesIaasProviderAvailable) {
- if (type == null) {
+ if (type == null || type.equals("")) {
portMapping.setKubernetesPortType(KubernetesConstants.NODE_PORT);
} else if (!type.equals(KubernetesConstants.NODE_PORT) && !type.equals
(KubernetesConstants.CLUSTER_IP)) {