Repository: stratos Updated Branches: refs/heads/stratos-4.1.x 89d8a7af8 -> 755a15b1d
Reverting the validation to limit the length of the ApplicationId Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/755a15b1 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/755a15b1 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/755a15b1 Branch: refs/heads/stratos-4.1.x Commit: 755a15b1df8a6ff9b167fa7172c21a23ff0f813e Parents: 89d8a7a Author: Dinithi <[email protected]> Authored: Fri Sep 18 14:29:32 2015 +0530 Committer: Dinithi <[email protected]> Committed: Fri Sep 18 14:29:32 2015 +0530 ---------------------------------------------------------------------- .../cloud/controller/iaases/kubernetes/KubernetesIaas.java | 4 ++-- .../apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/755a15b1/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java index 53a8c98..cf913b0 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java @@ -64,8 +64,8 @@ public class KubernetesIaas extends Iaas { private static final String KUBERNETES_SERVICE_SESSION_AFFINITY = "KUBERNETES_SERVICE_SESSION_AFFINITY"; private static final String KUBERNETES_CONTAINER_CPU_DEFAULT = "kubernetes.container.cpu.default"; private static final String KUBERNETES_CONTAINER_MEMORY_DEFAULT = "kubernetes.container.memory.default"; - public static final String POD_ID_PREFIX = "p"; - public static final String SERVICE_NAME_PREFIX = "s"; + public static final String POD_ID_PREFIX = "pod"; + public static final String SERVICE_NAME_PREFIX = "service"; private PartitionValidator partitionValidator; private List<NameValuePair> payload; http://git-wip-us.apache.org/repos/asf/stratos/blob/755a15b1/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 311f294..20ae749 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 @@ -109,7 +109,6 @@ public class StratosApiV41Utils { public static final String APPLICATION_STATUS_UNDEPLOYING = "Undeploying"; public static final String KUBERNETES_IAAS_PROVIDER = "kubernetes"; private static final String METADATA_REG_PATH = "metadata/"; - private static final int MAX_APPLICATION_ID_LENGTH = 40; /** @@ -1368,11 +1367,6 @@ public class StratosApiV41Utils { log.error(message); throw new ApplicationAlreadyExistException(message); } - if(StringUtils.length(appDefinition.getApplicationId())> MAX_APPLICATION_ID_LENGTH){ - String message = String.format("Application ID length is too long.(Application ID maximum length %d characters", MAX_APPLICATION_ID_LENGTH); - log.error(message); - throw new ApplicationAlreadyExistException(message); - } // check if an application with same id already exists try { if (AutoscalerServiceClient.getInstance().existApplication(appDefinition.getApplicationId())) {
