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/03/25 02:23:47 UTC
[02/10] stratos git commit: LoadBalancingIPType Enum to String due to
a limitation in Axis2
LoadBalancingIPType Enum to String due to a limitation in Axis2
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c575f4b3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c575f4b3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c575f4b3
Branch: refs/heads/master
Commit: c575f4b3bc89e2eb2eeaba9c06cf0a5a2495ab17
Parents: 6c4746c
Author: Vishanth <vi...@gmail.com>
Authored: Mon Mar 16 14:00:39 2015 +0530
Committer: Vishanth <vi...@gmail.com>
Committed: Tue Mar 24 11:56:31 2015 +0530
----------------------------------------------------------------------
.../cloud/controller/domain/Cartridge.java | 6 +-
.../impl/CloudControllerServiceImpl.java | 3 +-
.../util/CloudControllerConstants.java | 7 +
.../controller/util/CloudControllerUtil.java | 24 +-
.../main/resources/CloudControllerService.wsdl | 1145 +++++++++---------
5 files changed, 607 insertions(+), 578 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c575f4b3/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
index 9b6160d..9cdd886 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
@@ -48,7 +48,7 @@ public class Cartridge implements Serializable{
private List<PortMapping> portMappings;
private Persistence persistence;
private List<AppType> appTypeMappings;
- private LoadBalancingIPType loadBalancingIPType;
+ private String loadBalancingIPType;
private String[] metadataKeys;
/**
@@ -345,11 +345,11 @@ public class Cartridge implements Serializable{
this.metadataKeys = metadataKeys;
}
- public LoadBalancingIPType getLoadBalancingIPType() {
+ public String getLoadBalancingIPType() {
return loadBalancingIPType;
}
- public void setLoadBalancingIPType(LoadBalancingIPType loadBalancingIPType) {
+ public void setLoadBalancingIPType(String loadBalancingIPType) {
this.loadBalancingIPType = loadBalancingIPType;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/c575f4b3/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
index c9b57d1..5b6b487 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
@@ -396,7 +396,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
// Create member context
String applicationId = clusterContext.getApplicationId();
MemberContext memberContext = createMemberContext(applicationId, cartridgeType, memberId,
- cartridge.getLoadBalancingIPType(), instanceContext);
+ CloudControllerUtil.getLoadBalancingIPTypeEnumFromString(cartridge.getLoadBalancingIPType()), instanceContext);
// Prepare payload
StringBuilder payload = new StringBuilder(clusterContext.getPayload());
@@ -1615,4 +1615,3 @@ public class CloudControllerServiceImpl implements CloudControllerService {
}
}
}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/c575f4b3/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
index b55bc7f..4c248a0 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
@@ -294,4 +294,11 @@ public final class CloudControllerConstants {
public static final int PORT_RANGE_MIN = 1;
public static final String KUBERNETES_PARTITION_PROVIDER = "kubernetes";
+
+ /**
+ * Load balancing ip type enumeration values
+ */
+ public static final String LOADBALANCING_IP_TYPE_PRIVATE = "private";
+ public static final String LOADBALANCING_IP_TYPE_PUBLIE = "public";
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/c575f4b3/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
index 60b95eb..e0837af 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
@@ -106,10 +106,10 @@ public class CloudControllerUtil {
}
cartridge.setMultiTenant(config.isMultiTenant());
cartridge.setTenantPartitions(config.getTenantPartitions());
- cartridge.setLoadBalancingIPType(LoadBalancingIPType.Private);
+ cartridge.setLoadBalancingIPType(getLoadBalancingIPTypeStringFromEnum(LoadBalancingIPType.Private));
if(StringUtils.isNotBlank(config.getLoadBalancingIPType())) {
if(config.getLoadBalancingIPType().equals("public")) {
- cartridge.setLoadBalancingIPType(LoadBalancingIPType.Public);
+ cartridge.setLoadBalancingIPType(getLoadBalancingIPTypeStringFromEnum(LoadBalancingIPType.Public));
}
}
@@ -466,4 +466,24 @@ public class CloudControllerUtil {
throw new InvalidKubernetesMasterException(e.getMessage());
}
}
+
+ public static String getLoadBalancingIPTypeStringFromEnum(LoadBalancingIPType loadBalancingIPType) {
+ if (loadBalancingIPType == LoadBalancingIPType.Private) {
+ return CloudControllerConstants.LOADBALANCING_IP_TYPE_PRIVATE;
+ }
+ else if (loadBalancingIPType == LoadBalancingIPType.Public) {
+ return CloudControllerConstants.LOADBALANCING_IP_TYPE_PUBLIE;
+ }
+ return null;
+ }
+
+ public static LoadBalancingIPType getLoadBalancingIPTypeEnumFromString(String loadBalancingIPType) {
+ if(loadBalancingIPType.equals(CloudControllerConstants.LOADBALANCING_IP_TYPE_PUBLIE)) {
+ return LoadBalancingIPType.Public;
+ }
+ else if(loadBalancingIPType.equals(CloudControllerConstants.LOADBALANCING_IP_TYPE_PRIVATE)) {
+ return LoadBalancingIPType.Private;
+ }
+ return null;
+ }
}