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 <[email protected]> Authored: Thu May 21 19:48:47 2015 +0530 Committer: Imesh Gunaratne <[email protected]> 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; } }
