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/05/21 16:09:30 UTC
[1/3] stratos git commit: Fixing load balancer IP type assignment
issue in cloud controller
Repository: stratos
Updated Branches:
refs/heads/master b3489c381 -> 1098029e0
Fixing load balancer IP type assignment issue in cloud controller
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b8e5a7c2
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b8e5a7c2
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b8e5a7c2
Branch: refs/heads/master
Commit: b8e5a7c272ce17814a97c7d9078b4154a86748ff
Parents: b3489c3
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu May 21 19:48:47 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu May 21 19:50:50 2015 +0530
----------------------------------------------------------------------
.../impl/CloudControllerServiceImpl.java | 18 +++++++--------
.../util/CloudControllerConstants.java | 2 +-
.../controller/util/CloudControllerUtil.java | 24 ++++++--------------
3 files changed, 17 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/b8e5a7c2/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 6a6f988..13d84ac 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
@@ -111,41 +111,41 @@ public class CloudControllerServiceImpl implements CloudControllerService {
}
@Override
- public boolean updateCartridge(Cartridge cartridgeConfig) throws InvalidCartridgeDefinitionException,
+ public boolean updateCartridge(Cartridge cartridge) throws InvalidCartridgeDefinitionException,
InvalidIaasProviderException,
CartridgeDefinitionNotExistsException {
- handleNullObject(cartridgeConfig, "Cartridge definition is null");
+ handleNullObject(cartridge, "Cartridge definition is null");
if (log.isInfoEnabled()) {
- log.info("Updating cartridge: [cartridge-type] " + cartridgeConfig.getType());
+ log.info("Updating cartridge: [cartridge-type] " + cartridge.getType());
}
if (log.isDebugEnabled()) {
- log.debug("Cartridge definition: " + cartridgeConfig.toString());
+ log.debug("Cartridge definition: " + cartridge.toString());
}
try {
- CloudControllerUtil.extractIaaSProvidersFromCartridge(cartridgeConfig);
+ CloudControllerUtil.extractIaaSProvidersFromCartridge(cartridge);
} catch (Exception e) {
- String msg = "Invalid cartridge definition: [cartridge-type] " + cartridgeConfig.getType();
+ String msg = "Invalid cartridge definition: [cartridge-type] " + cartridge.getType();
log.error(msg, e);
throw new InvalidCartridgeDefinitionException(msg, e);
}
- String cartridgeType = cartridgeConfig.getType();
+ String cartridgeType = cartridge.getType();
if (cloudControllerContext.getCartridge(cartridgeType) != null) {
Cartridge cartridgeToBeRemoved = cloudControllerContext.getCartridge(cartridgeType);
try {
removeCartridgeFromCC(cartridgeToBeRemoved.getType());
} catch (InvalidCartridgeTypeException ignore) {
}
- copyIaasProviders(cartridgeConfig, cartridgeToBeRemoved);
+ copyIaasProviders(cartridge, cartridgeToBeRemoved);
} else {
throw new CartridgeDefinitionNotExistsException("This cartridge definition not exists");
}
// Add cartridge to the cloud controller context and persist
- CloudControllerContext.getInstance().addCartridge(cartridgeConfig);
+ CloudControllerContext.getInstance().addCartridge(cartridge);
CloudControllerContext.getInstance().persist();
// transaction ends
http://git-wip-us.apache.org/repos/asf/stratos/blob/b8e5a7c2/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 19e589d..5e6115f 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
@@ -299,6 +299,6 @@ public final class CloudControllerConstants {
* Load balancing ip type enumeration values
*/
public static final String LOADBALANCING_IP_TYPE_PRIVATE = "private";
- public static final String LOADBALANCING_IP_TYPE_PUBLIE = "public";
+ public static final String LOADBALANCING_IP_TYPE_PUBLIC = "public";
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b8e5a7c2/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 8906eec..dfee4c0 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
@@ -70,15 +70,15 @@ public class CloudControllerUtil {
}
}
- public static void extractIaaSProvidersFromCartridge(Cartridge config) {
- if (config == null) {
+ public static void extractIaaSProvidersFromCartridge(Cartridge cartridge) {
+ if (cartridge == null) {
return;
}
List<IaasProvider> iaases = CloudControllerConfig.getInstance().getIaasProviders();
// populate IaaSes
- IaasConfig[] iaasConfigs = config.getIaasConfigs();
+ IaasConfig[] iaasConfigs = cartridge.getIaasConfigs();
if (iaasConfigs != null) {
for (IaasConfig iaasConfig : iaasConfigs) {
if (iaasConfig != null) {
@@ -144,19 +144,10 @@ public class CloudControllerUtil {
iaasProvider.setNetworkInterfaces(networkInterfaces.getNetworkInterfaces());
}
- CloudControllerContext.getInstance().addIaasProvider(config.getType(), iaasProvider);
+ CloudControllerContext.getInstance().addIaasProvider(cartridge.getType(), iaasProvider);
}
}
}
-
- //Setting load balancing type
- config.setLoadBalancingIPType(getLoadBalancingIPTypeStringFromEnum(LoadBalancingIPType.Private));
- if (StringUtils.isNotBlank(config.getLoadBalancingIPType())) {
- if (config.getLoadBalancingIPType().equals("public")) {
- config.setLoadBalancingIPType(
- getLoadBalancingIPTypeStringFromEnum(LoadBalancingIPType.Public));
- }
- }
}
public static void sleep(long time) {
@@ -388,17 +379,16 @@ public class CloudControllerUtil {
if (loadBalancingIPType == LoadBalancingIPType.Private) {
return CloudControllerConstants.LOADBALANCING_IP_TYPE_PRIVATE;
} else if (loadBalancingIPType == LoadBalancingIPType.Public) {
- return CloudControllerConstants.LOADBALANCING_IP_TYPE_PUBLIE;
+ return CloudControllerConstants.LOADBALANCING_IP_TYPE_PUBLIC;
}
return null;
}
public static LoadBalancingIPType getLoadBalancingIPTypeEnumFromString(String loadBalancingIPType) {
- if (loadBalancingIPType.equals(CloudControllerConstants.LOADBALANCING_IP_TYPE_PUBLIE)) {
+ if (CloudControllerConstants.LOADBALANCING_IP_TYPE_PUBLIC.equals(loadBalancingIPType)) {
return LoadBalancingIPType.Public;
- } else if (loadBalancingIPType.equals(CloudControllerConstants.LOADBALANCING_IP_TYPE_PRIVATE)) {
+ } else {
return LoadBalancingIPType.Private;
}
- return null;
}
}
[3/3] stratos git commit: Updating load balancer product name
Posted by im...@apache.org.
Updating load balancer product name
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1098029e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1098029e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1098029e
Branch: refs/heads/master
Commit: 1098029e06d1a2e09b8128525f912cb694d9298c
Parents: 59c1a33
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu May 21 19:50:38 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu May 21 19:50:51 2015 +0530
----------------------------------------------------------------------
.../modules/distribution/src/main/assembly/filter.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/1098029e/products/load-balancer/modules/distribution/src/main/assembly/filter.properties
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/src/main/assembly/filter.properties b/products/load-balancer/modules/distribution/src/main/assembly/filter.properties
index c5cf2c2..8432fab 100644
--- a/products/load-balancer/modules/distribution/src/main/assembly/filter.properties
+++ b/products/load-balancer/modules/distribution/src/main/assembly/filter.properties
@@ -17,10 +17,10 @@
# under the License.
#
-product.name=Apache Stratos LB
+product.name=Apache Stratos Load Balancer
product.key=LB
product.version=4.1.0
lb.version=2.0.5
-default.server.role=ElasticLoadBalancer
+default.server.role=LoadBalancer
bundle.creators=org.wso2.carbon.mediator.bridge.MediatorBundleCreator
[2/3] stratos git commit: Adding logic to display access URLs for
Kubernetes services in the UI
Posted by im...@apache.org.
Adding logic to display access URLs for Kubernetes services in the UI
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/59c1a335
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/59c1a335
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/59c1a335
Branch: refs/heads/master
Commit: 59c1a335aca4ea70a5bd5676c1e37ba1bbef0795
Parents: b8e5a7c
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu May 21 19:49:36 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu May 21 19:50:51 2015 +0530
----------------------------------------------------------------------
.../topology/ClusterInstanceActivatedProcessor.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/59c1a335/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceActivatedProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceActivatedProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceActivatedProcessor.java
index 7c3e04e..c783ddc 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceActivatedProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceActivatedProcessor.java
@@ -29,6 +29,7 @@ import org.apache.stratos.messaging.message.processor.MessageProcessor;
import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater;
import org.apache.stratos.messaging.util.MessagingUtil;
+import java.net.URL;
import java.util.List;
/**
@@ -117,6 +118,20 @@ public class ClusterInstanceActivatedProcessor extends MessageProcessor {
cluster.setKubernetesServices(kubernetesServices);
}
+ try {
+ // Generate access URLs for kubernetes services
+ for (KubernetesService kubernetesService : kubernetesServices) {
+ String[] publicIPs = kubernetesService.getPublicIPs();
+ if((publicIPs != null) && (publicIPs.length > 0)) {
+ URL accessURL = new URL(kubernetesService.getProtocol(), publicIPs[0],
+ kubernetesService.getPort(), "");
+ cluster.addAccessUrl(accessURL.toString());
+ }
+ }
+ } catch (Exception e) {
+ log.error("Could not create access URLs for Kubernetes services");
+ }
+
ClusterInstance context = cluster.getInstanceContexts(event.getInstanceId());
if (context == null) {
log.warn("Cluster instance context is not found for [cluster] " +