Refactor varibales with uuid
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ca0333bb Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ca0333bb Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ca0333bb Branch: refs/heads/tenant-isolation Commit: ca0333bb2cfd39e7436b99d0aae920fb3a470759 Parents: 6b16576 Author: Gayan Gunarathne <[email protected]> Authored: Tue Jul 21 14:18:23 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Tue Jul 21 14:18:23 2015 +0530 ---------------------------------------------------------------------- .../client/AutoscalerCloudControllerClient.java | 4 +- .../autoscaler/monitor/MonitorFactory.java | 14 +- .../context/CloudControllerContext.java | 24 +- .../cloud/controller/domain/ClusterContext.java | 16 +- .../iaases/kubernetes/KubernetesIaas.java | 8 +- .../publisher/TopologyEventPublisher.java | 4 +- .../messaging/topology/TopologyBuilder.java | 6 +- .../impl/CloudControllerServiceImpl.java | 72 +-- .../client/CloudControllerServiceClient.java | 4 +- .../rest/endpoint/api/StratosApiV41.java | 16 +- .../rest/endpoint/api/StratosApiV41Utils.java | 10 +- .../main/resources/CloudControllerService.wsdl | 580 +++++++++---------- 12 files changed, 380 insertions(+), 378 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/ca0333bb/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/AutoscalerCloudControllerClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/AutoscalerCloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/AutoscalerCloudControllerClient.java index 9eb3d8e..712bf2f 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/AutoscalerCloudControllerClient.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/AutoscalerCloudControllerClient.java @@ -145,7 +145,7 @@ public class AutoscalerCloudControllerClient { } } - public synchronized void createApplicationClusters(String appId, + public synchronized void createApplicationClusters(String appUuid, ApplicationClusterContext[] applicationClusterContexts) { List<org.apache.stratos.cloud.controller.stub.domain.ApplicationClusterContext> contextDTOs = new ArrayList<org.apache.stratos.cloud.controller.stub.domain.ApplicationClusterContext>(); @@ -177,7 +177,7 @@ public class AutoscalerCloudControllerClient { new org.apache.stratos.cloud.controller.stub.domain.ApplicationClusterContext[contextDTOs.size()]; contextDTOs.toArray(applicationClusterContextDTOs); try { - stub.createApplicationClusters(appId, applicationClusterContextDTOs); + stub.createApplicationClusters(appUuid, applicationClusterContextDTOs); } catch (RemoteException e) { String msg = e.getMessage(); log.error(msg, e); http://git-wip-us.apache.org/repos/asf/stratos/blob/ca0333bb/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorFactory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorFactory.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorFactory.java index 516cef6..372e43e 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorFactory.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/MonitorFactory.java @@ -215,22 +215,22 @@ public class MonitorFactory { //Retrieving the Cluster from Topology String clusterId = context.getId(); - String serviceName = context.getServiceUuid(); + String serviceUuid = context.getServiceUuid(); Cluster cluster; //acquire read lock for the service and cluster - TopologyManager.acquireReadLockForCluster(serviceName, clusterId); + TopologyManager.acquireReadLockForCluster(serviceUuid, clusterId); try { Topology topology = TopologyManager.getTopology(); - Service service = topology.getService(serviceName); + Service service = topology.getService(serviceUuid); if (service == null) { - String msg = String.format("Service not found in topology: [service] %s", serviceName); + String msg = String.format("Service not found in topology: [service] %s", serviceUuid); throw new RuntimeException(msg); } cluster = service.getCluster(clusterId); if (cluster == null) { String msg = String.format("Cluster not found in topology: [service] %s [cluster] %s", - serviceName, clusterId); + serviceUuid, clusterId); throw new RuntimeException(msg); } //Find whether any other instances exists in group @@ -263,7 +263,7 @@ public class MonitorFactory { try { CloudControllerServiceClient.getInstance(). - validateNetworkPartitionOfDeploymentPolicy(serviceName, + validateNetworkPartitionOfDeploymentPolicy(serviceUuid, networkPartitionRef.getUuid()); } catch (Exception e) { String msg = String.format("Error while validating deployment policy " + @@ -323,7 +323,7 @@ public class MonitorFactory { return clusterMonitor; } finally { - TopologyManager.releaseReadLockForCluster(serviceName, clusterId); + TopologyManager.releaseReadLockForCluster(serviceUuid, clusterId); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/ca0333bb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java index b5f69cb..35d0da2 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java @@ -290,16 +290,16 @@ public class CloudControllerContext implements Serializable { networkPartitionIDToNetworkPartitionMap.put(networkPartition.getUuid(), networkPartition); } - public NetworkPartition getNetworkPartition(String networkPartitionID) { - return networkPartitionIDToNetworkPartitionMap.get(networkPartitionID); + public NetworkPartition getNetworkPartition(String networkPartitionUuid) { + return networkPartitionIDToNetworkPartitionMap.get(networkPartitionUuid); } public Collection<NetworkPartition> getNetworkPartitions() { return networkPartitionIDToNetworkPartitionMap.values(); } - public void removeNetworkPartition(String networkPartitionID) { - networkPartitionIDToNetworkPartitionMap.remove(networkPartitionID); + public void removeNetworkPartition(String networkPartitionUuid) { + networkPartitionIDToNetworkPartitionMap.remove(networkPartitionUuid); } public NetworkPartition getNetworkPartitionForTenant(String networkPartitionId, int tenantId) { @@ -821,8 +821,8 @@ public class CloudControllerContext implements Serializable { this.cartridgeTypeToIaasProviders = cartridgeTypeToIaasProviders; } - public void addIaasProvider(String cartridgeType, IaasProvider iaasProvider) { - List<IaasProvider> iaasProviders = cartridgeTypeToIaasProviders.get(cartridgeType); + public void addIaasProvider(String cartridgeUuid, IaasProvider iaasProvider) { + List<IaasProvider> iaasProviders = cartridgeTypeToIaasProviders.get(cartridgeUuid); if (iaasProviders == null) { iaasProviders = new ArrayList<IaasProvider>(); } @@ -839,7 +839,7 @@ public class CloudControllerContext implements Serializable { // Else, add iaas provider against cartridge type iaasProviders.add(iaasProvider); - cartridgeTypeToIaasProviders.put(cartridgeType, iaasProviders); + cartridgeTypeToIaasProviders.put(cartridgeUuid, iaasProviders); } public IaasProvider getIaasProvider(String cartridgeUuid, String iaasType) { @@ -855,8 +855,8 @@ public class CloudControllerContext implements Serializable { return null; } - public List<IaasProvider> getIaasProviders(String cartridgeType) { - List<IaasProvider> iaasProviderList = cartridgeTypeToIaasProviders.get(cartridgeType); + public List<IaasProvider> getIaasProviders(String cartridgeUuid) { + List<IaasProvider> iaasProviderList = cartridgeTypeToIaasProviders.get(cartridgeUuid); return iaasProviderList; } @@ -890,13 +890,13 @@ public class CloudControllerContext implements Serializable { /** * Get cluster port mappings of an application cluster. - * @param applicationId + * @param applicationUuid * @param clusterId * @return */ - public List<ClusterPortMapping> getClusterPortMappings(String applicationId, String clusterId) { + public List<ClusterPortMapping> getClusterPortMappings(String applicationUuid, String clusterId) { Map<String, List<ClusterPortMapping>> clusterIdToPortMappings = - applicationIdToClusterIdToPortMappings.get(applicationId); + applicationIdToClusterIdToPortMappings.get(applicationUuid); if(clusterIdToPortMappings != null) { return clusterIdToPortMappings.get(clusterId); http://git-wip-us.apache.org/repos/asf/stratos/blob/ca0333bb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterContext.java index 09b987d..87cc7f7 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterContext.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/ClusterContext.java @@ -32,9 +32,9 @@ public class ClusterContext implements Serializable { private static final long serialVersionUID = 4830667953031229223L; - private final String applicationId; + private final String applicationUuid; private final String clusterId; - private final String cartridgeType; + private final String cartridgeUuid; private final String payload; private final String hostName; private final boolean isLbCluster; @@ -50,8 +50,8 @@ public class ClusterContext implements Serializable { public ClusterContext(String applicationId, String cartridgeType, String clusterId, String payload, String hostName, boolean isLbCluster, Properties properties) { - this.applicationId = applicationId; - this.cartridgeType = cartridgeType; + this.applicationUuid = applicationId; + this.cartridgeUuid = cartridgeType; this.clusterId = clusterId; this.payload = payload; this.hostName = hostName; @@ -59,16 +59,16 @@ public class ClusterContext implements Serializable { this.setProperties(properties); } - public String getApplicationId() { - return applicationId; + public String getApplicationUuid() { + return applicationUuid; } public String getClusterId() { return clusterId; } - public String getCartridgeType() { - return cartridgeType; + public String getCartridgeUuid() { + return cartridgeUuid; } public String getPayload() { http://git-wip-us.apache.org/repos/asf/stratos/blob/ca0333bb/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 155d3dc..d2fcaba 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 @@ -173,7 +173,7 @@ public class KubernetesIaas extends Iaas { memberContext.getMemberId())); // Validate cartridge - String cartridgeType = clusterContext.getCartridgeType(); + String cartridgeType = clusterContext.getCartridgeUuid(); Cartridge cartridge = CloudControllerContext.getInstance().getCartridge(cartridgeType); if (cartridge == null) { String msg = String.format("Cartridge not found: [application] %s [cartridge] %s", @@ -215,7 +215,7 @@ public class KubernetesIaas extends Iaas { kubernetesPortRange.getLower()); // Generate kubernetes service ports and update port mappings in cartridge - generateKubernetesServicePorts(clusterContext.getApplicationId(), clusterContext.getClusterId(), + generateKubernetesServicePorts(clusterContext.getApplicationUuid(), clusterContext.getClusterId(), kubernetesClusterContext, cartridge); // Create kubernetes services for port mappings @@ -456,7 +456,7 @@ public class KubernetesIaas extends Iaas { throws KubernetesClientException { String clusterId = clusterContext.getClusterId(); - String cartridgeType = clusterContext.getCartridgeType(); + String cartridgeType = clusterContext.getCartridgeUuid(); Cartridge cartridge = CloudControllerContext.getInstance().getCartridge(cartridgeType); if (cartridge == null) { @@ -496,7 +496,7 @@ public class KubernetesIaas extends Iaas { } Collection<ClusterPortMapping> clusterPortMappings = CloudControllerContext.getInstance() - .getClusterPortMappings(clusterContext.getApplicationId(), clusterId); + .getClusterPortMappings(clusterContext.getApplicationUuid(), clusterId); if (clusterPortMappings != null) { for (ClusterPortMapping clusterPortMapping : clusterPortMappings) { http://git-wip-us.apache.org/repos/asf/stratos/blob/ca0333bb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java index 3f7b0d7..37ba56e 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/publisher/TopologyEventPublisher.java @@ -128,11 +128,11 @@ public class TopologyEventPublisher { public static void sendClusterRemovedEvent(ClusterContext ctxt, String deploymentPolicy) { ClusterRemovedEvent clusterRemovedEvent = new ClusterRemovedEvent( - ctxt.getCartridgeType(), ctxt.getClusterId(), deploymentPolicy, ctxt.isLbCluster()); + ctxt.getCartridgeUuid(), ctxt.getClusterId(), deploymentPolicy, ctxt.isLbCluster()); if (log.isInfoEnabled()) { log.info(String .format("Publishing cluster removed event: [service-name] %s [cluster-id] %s", - ctxt.getCartridgeType(), ctxt.getClusterId())); + ctxt.getCartridgeUuid(), ctxt.getClusterId())); } publishEvent(clusterRemovedEvent); http://git-wip-us.apache.org/repos/asf/stratos/blob/ca0333bb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java index a8d8827..b960909 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java @@ -363,18 +363,18 @@ public class TopologyBuilder { public static void handleClusterRemoved(ClusterContext ctxt) { Topology topology = TopologyManager.getTopology(); - Service service = topology.getService(ctxt.getCartridgeType()); + Service service = topology.getService(ctxt.getCartridgeUuid()); String deploymentPolicy; if (service == null) { log.warn(String.format("Service %s does not exist", - ctxt.getCartridgeType())); + ctxt.getCartridgeUuid())); return; } if (!service.clusterExists(ctxt.getClusterId())) { log.warn(String.format("Cluster %s does not exist for service %s", ctxt.getClusterId(), - ctxt.getCartridgeType())); + ctxt.getCartridgeUuid())); return; } http://git-wip-us.apache.org/repos/asf/stratos/blob/ca0333bb/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 0aee888..7c699be 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 @@ -362,7 +362,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { handleNullObject(clusterContext, "Could not start instance, cluster context not found: [cluster-id] " + clusterId); // Validate cartridge - String cartridgeType = clusterContext.getCartridgeType(); + String cartridgeType = clusterContext.getCartridgeUuid(); Cartridge cartridge = CloudControllerContext.getInstance().getCartridge(cartridgeType); if (cartridge == null) { String msg = "Could not startup instance, cartridge not found: [cartridge-type] " + cartridgeType; @@ -385,7 +385,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { String memberId = generateMemberId(clusterId); // Create member context - String applicationId = clusterContext.getApplicationId(); + String applicationId = clusterContext.getApplicationUuid(); MemberContext memberContext = createMemberContext(applicationId, cartridgeType, memberId, CloudControllerUtil.getLoadBalancingIPTypeEnumFromString(cartridge.getLoadBalancingIPType()), instanceContext); @@ -761,13 +761,13 @@ public class CloudControllerServiceImpl implements CloudControllerService { } @Override - public Cartridge getCartridge(String cartridgeType) throws CartridgeNotFoundException { - Cartridge cartridge = CloudControllerContext.getInstance().getCartridge(cartridgeType); + public Cartridge getCartridge(String cartridgeUuid) throws CartridgeNotFoundException { + Cartridge cartridge = CloudControllerContext.getInstance().getCartridge(cartridgeUuid); if (cartridge != null) { return cartridge; } - String msg = "Could not find cartridge: [cartridge-type] " + cartridgeType; + String msg = "Could not find cartridge: [cartridge-uuid] " + cartridgeUuid; throw new CartridgeNotFoundException(msg); } @@ -798,7 +798,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { Collection<Cartridge> allCartridges = CloudControllerContext.getInstance().getCartridges(); List<Cartridge> cartridges = new ArrayList<Cartridge>(); if (allCartridges == null || allCartridges.size() == 0) { - log.info("No registered Cartridge found."); + log.info("No registered Cartridge found for [tenant-id]" + tenantId); return null; } for (Cartridge cartridge : allCartridges) { @@ -819,13 +819,13 @@ public class CloudControllerServiceImpl implements CloudControllerService { ClusterContext ctxt = CloudControllerContext.getInstance().getClusterContext(clusterId_); handleNullObject(ctxt, "Service unregistration failed. Invalid cluster id: " + clusterId); - final String cartridgeType = ctxt.getCartridgeType(); - Cartridge cartridge = CloudControllerContext.getInstance().getCartridge(cartridgeType); + final String cartridgeUuid = ctxt.getCartridgeUuid(); + Cartridge cartridge = CloudControllerContext.getInstance().getCartridge(cartridgeUuid); if (cartridge == null) { String msg = - String.format("Service unregistration failed. No matching cartridge found: [cartridge-type] %s " + - "[application-id] %s", cartridgeType, ctxt.getApplicationId()); + String.format("Service unregistration failed. No matching cartridge found: [cartridge-uuid] %s " + + "[application-id] %s", cartridgeUuid, ctxt.getApplicationUuid()); log.error(msg); throw new UnregisteredClusterException(msg); } @@ -836,12 +836,12 @@ public class CloudControllerServiceImpl implements CloudControllerService { ClusterContext ctxt = CloudControllerContext.getInstance().getClusterContext(clusterId_); if (ctxt == null) { String msg = String.format("Service unregistration failed. Cluster not found: [cluster-id] %s " + - "[application-id] %s", clusterId_, ctxt.getApplicationId()); + "[application-id] %s", clusterId_, ctxt.getApplicationUuid()); log.error(msg); return; } Collection<Member> members = TopologyManager.getTopology(). - getService(ctxt.getCartridgeType()).getCluster(clusterId_).getMembers(); + getService(ctxt.getCartridgeUuid()).getCluster(clusterId_).getMembers(); //finding the responding members from the existing members in the topology. int sizeOfRespondingMembers = 0; for (Member member : members) { @@ -866,7 +866,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { } catch (Exception e) { // we are not gonna stop the execution due to errors. log.warn((String.format("Instance termination failed of member [member-id] %s " + - "[application-id] %s", member.getMemberId(), ctxt.getApplicationId())), e); + "[application-id] %s", member.getMemberId(), ctxt.getApplicationUuid())), e); } } @@ -881,12 +881,12 @@ public class CloudControllerServiceImpl implements CloudControllerService { ClusterContext ctxt = CloudControllerContext.getInstance().getClusterContext(clusterId_); if (ctxt == null) { String msg = String.format("Service unregistration failed. Cluster not found: [cluster-id] %s " + - "[application-id] %s ", clusterId_, ctxt.getApplicationId()); + "[application-id] %s ", clusterId_, ctxt.getApplicationUuid()); log.error(msg); return; } Collection<Member> members = TopologyManager.getTopology(). - getService(ctxt.getCartridgeType()).getCluster(clusterId_).getMembers(); + getService(ctxt.getCartridgeUuid()).getCluster(clusterId_).getMembers(); while (members.size() > 0) { //waiting until all the members got removed from the Topology/ timed out @@ -894,7 +894,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { } log.info(String.format("Unregistration of service cluster: [cluster-id] %s [application-id]", - clusterId_, ctxt.getApplicationId())); + clusterId_, ctxt.getApplicationUuid())); deleteVolumes(ctxt); onClusterRemoval(clusterId_); } finally { @@ -910,7 +910,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { try { lock = CloudControllerContext.getInstance().acquireCartridgesWriteLock(); - Cartridge cartridge = CloudControllerContext.getInstance().getCartridge(ctxt.getCartridgeType()); + Cartridge cartridge = CloudControllerContext.getInstance().getCartridge(ctxt.getCartridgeUuid()); if (cartridge != null && CloudControllerContext.getInstance().getIaasProviders(cartridge.getType()) != null && ctxt.getVolumes() != null) { for (Volume volume : ctxt.getVolumes()) { if (volume.getId() != null) { @@ -926,7 +926,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { } catch (Exception ignore) { if (log.isErrorEnabled()) { log.error((String.format("Error while deleting volume [id] %s " + - "[application-id]", volume.getId(), ctxt.getApplicationId())), + "[application-id]", volume.getId(), ctxt.getApplicationUuid())), ignore); } } @@ -952,32 +952,32 @@ public class CloudControllerServiceImpl implements CloudControllerService { * FIXME: A validate method shouldn't persist data */ @Override - public boolean validateDeploymentPolicyNetworkPartition(String cartridgeType, String networkPartitionId) + public boolean validateDeploymentPolicyNetworkPartition(String cartridgeUuid, String networkPartitionUuid) throws InvalidPartitionException, InvalidCartridgeTypeException { - NetworkPartition networkPartition = CloudControllerContext.getInstance().getNetworkPartition(networkPartitionId); + NetworkPartition networkPartition = CloudControllerContext.getInstance().getNetworkPartition(networkPartitionUuid); Lock lock = null; try { lock = CloudControllerContext.getInstance().acquireCartridgesWriteLock(); - List<String> validatedPartitions = CloudControllerContext.getInstance().getPartitionIds(cartridgeType); + List<String> validatedPartitions = CloudControllerContext.getInstance().getPartitionIds(cartridgeUuid); if (validatedPartitions != null) { // cache hit for this cartridge // get list of partitions if (log.isDebugEnabled()) { - log.debug("Partition validation cache hit for cartridge type: " + cartridgeType); + log.debug("Partition validation cache hit for cartridge uuid: " + cartridgeUuid); } } Map<String, IaasProvider> partitionToIaasProviders = new ConcurrentHashMap<String, IaasProvider>(); if (log.isDebugEnabled()) { - log.debug("Deployment policy validation started for cartridge type: " + cartridgeType); + log.debug("Deployment policy validation started for cartridge uuid: " + cartridgeUuid); } - Cartridge cartridge = CloudControllerContext.getInstance().getCartridge(cartridgeType); + Cartridge cartridge = CloudControllerContext.getInstance().getCartridge(cartridgeUuid); if (cartridge == null) { - String msg = "Cartridge not found: " + cartridgeType; + String msg = "Cartridge not found: " + cartridgeUuid; log.error(msg); throw new InvalidCartridgeTypeException(msg); } @@ -1014,28 +1014,28 @@ public class CloudControllerServiceImpl implements CloudControllerService { } // add to cache - CloudControllerContext.getInstance().addToCartridgeTypeToPartitionIdMap(cartridgeType, partitionId); + CloudControllerContext.getInstance().addToCartridgeTypeToPartitionIdMap(cartridgeUuid, partitionId); if (log.isDebugEnabled()) { log.debug("Partition " + partitionId + " added to the cache against cartridge: " + - "[cartridge-type] " + cartridgeType); + "[cartridge-uuid] " + cartridgeUuid); } } catch (Exception e) { - String message = "Could not cache partitions against the cartridge: [cartridge-type] " + cartridgeType; + String message = "Could not cache partitions against the cartridge: [cartridge-uuid] " + cartridgeUuid; log.error(message, e); throw new InvalidPartitionException(message, e); } } // if and only if the deployment policy valid - CloudControllerContext.getInstance().addIaasProviders(cartridgeType, partitionToIaasProviders); + CloudControllerContext.getInstance().addIaasProviders(cartridgeUuid, partitionToIaasProviders); CloudControllerContext.getInstance().updateCartridge(cartridge); // persist data CloudControllerContext.getInstance().persist(); log.info("All partitions [" + CloudControllerUtil.getPartitionIds(networkPartition.getPartitions()) + "]" + - " were validated successfully, against the cartridge: " + cartridgeType); + " were validated successfully, against the cartridge: " + cartridgeUuid); return true; } finally { @@ -1084,11 +1084,11 @@ public class CloudControllerServiceImpl implements CloudControllerService { } @Override - public boolean createApplicationClusters(String appId, ApplicationClusterContext[] appClustersContexts) throws + public boolean createApplicationClusters(String appUuid, ApplicationClusterContext[] appClustersContexts) throws ApplicationClusterRegistrationException { if (appClustersContexts == null || appClustersContexts.length == 0) { String errorMsg = "No application cluster information found, unable to create clusters: " + - "[application-id] " + appId; + "[application-uuid] " + appUuid; log.error(errorMsg); throw new ApplicationClusterRegistrationException(errorMsg); } @@ -1110,7 +1110,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { List<String> accessUrlPerCluster = new ArrayList(); Collection<ClusterPortMapping> clusterPortMappings = - CloudControllerContext.getInstance().getClusterPortMappings(appId, clusterId); + CloudControllerContext.getInstance().getClusterPortMappings(appUuid, clusterId); for (ClusterPortMapping clusterPortMapping : clusterPortMappings) { try { @@ -1137,7 +1137,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { for (ApplicationClusterContext appClusterCtxt : appClustersContexts) { ClusterContext clusterContext = new ClusterContext( - appId, appClusterCtxt.getCartridgeType(), appClusterCtxt.getClusterId(), + appUuid, appClusterCtxt.getCartridgeType(), appClusterCtxt.getClusterId(), appClusterCtxt.getTextPayload(), appClusterCtxt.getHostName(), appClusterCtxt.isLbCluster(), appClusterCtxt.getProperties()); @@ -1149,7 +1149,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { // Create cluster object Cluster cluster = new Cluster(appClusterCtxt.getCartridgeType(), appClusterCtxt.getClusterId(), - appClusterCtxt.getDeploymentPolicyName(), appClusterCtxt.getAutoscalePolicyName(), appId); + appClusterCtxt.getDeploymentPolicyName(), appClusterCtxt.getAutoscalePolicyName(), appUuid); cluster.setLbCluster(false); cluster.setTenantRange(appClusterCtxt.getTenantRange()); cluster.setHostNames(Arrays.asList(appClusterCtxt.getHostName())); @@ -1162,7 +1162,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { clusters.add(cluster); } - TopologyBuilder.handleApplicationClustersCreated(appId, clusters); + TopologyBuilder.handleApplicationClustersCreated(appUuid, clusters); CloudControllerContext.getInstance().persist(); } finally { if (lock != null) { http://git-wip-us.apache.org/repos/asf/stratos/blob/ca0333bb/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java index a41db85..52fbea3 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/CloudControllerServiceClient.java @@ -195,11 +195,11 @@ public class CloudControllerServiceClient { return stub.updateKubernetesHost(kubernetesHost); } - public void validateNetworkPartitionOfDeploymentPolicy(String cartridgeType, String networkPartitionId) + public void validateNetworkPartitionOfDeploymentPolicy(String cartridgeUuid, String networkPartitionId) throws RemoteException, CloudControllerServiceInvalidPartitionExceptionException, CloudControllerServiceInvalidCartridgeTypeExceptionException { - stub.validateDeploymentPolicyNetworkPartition(cartridgeType, networkPartitionId); + stub.validateDeploymentPolicyNetworkPartition(cartridgeUuid, networkPartitionId); } public void addNetworkPartition(NetworkPartition networkPartition) throws RemoteException, http://git-wip-us.apache.org/repos/asf/stratos/blob/ca0333bb/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java index 7cce069..2de856a 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java @@ -303,7 +303,8 @@ public class StratosApiV41 extends AbstractApi { //Ignore this since this is valid(cartridge is does not exist) when adding the cartridge for first time } if (cartridgeBean != null) { - String msg = String.format("Cartridge already exists: [cartridge-type] %s", cartridgeType); + String msg = String.format("Cartridge already exists: [cartridge-type] %s [cartridge-uuid] %s [tenant-id] %d", + cartridgeType,cartridgeDefinitionBean.getUuid(),cartridgeDefinitionBean.getTenantId()); log.warn(msg); return Response.status(Response.Status.CONFLICT) .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, msg)).build(); @@ -312,7 +313,8 @@ public class StratosApiV41 extends AbstractApi { StratosApiV41Utils.addCartridge(cartridgeDefinitionBean); URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeType).build(); return Response.created(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, - String.format("Cartridge added successfully: [cartridge-type] %s", cartridgeType))).build(); + String.format("Cartridge added successfully: [cartridge-type] %s [cartridge-uuid] %s [tenant-id] %d", + cartridgeType,cartridgeDefinitionBean.getUuid(),cartridgeDefinitionBean.getTenantId()))).build(); } /** @@ -464,7 +466,7 @@ public class StratosApiV41 extends AbstractApi { try { StratosApiV41Utils.removeCartridge(cartridgeType,carbonContext.getTenantId()); return Response.ok().entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, - String.format("Cartridge deleted successfully: [cartridge-type] %s [tenantId]", cartridgeType,carbonContext.getTenantId()))).build(); + String.format("Cartridge deleted successfully: [cartridge-type] %s [tenantId] %d", cartridgeType,carbonContext.getTenantId()))).build(); } catch (RemoteException e) { throw new RestAPIException(e.getMessage()); } catch (CloudControllerServiceInvalidCartridgeTypeExceptionException e) { @@ -502,8 +504,8 @@ public class StratosApiV41 extends AbstractApi { URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeGroupBean.getUuid()).build(); return Response.created(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, - String.format("Cartridge Group added successfully: [cartridge-group] %s", - cartridgeGroupBean.getUuid()))).build(); + String.format("Cartridge Group added successfully: [cartridge-group-uuid] %s [cartridge-group-name] %s [tenant-id] %d", + cartridgeGroupBean.getUuid(),cartridgeGroupBean.getName(),cartridgeGroupBean.getTenantId()))).build(); } catch (InvalidCartridgeGroupDefinitionException e) { return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean( ResponseMessageBean.ERROR, e.getMessage())).build(); @@ -540,8 +542,8 @@ public class StratosApiV41 extends AbstractApi { URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeGroupBean.getUuid()).build(); return Response.ok(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, - String.format("Cartridge group updated successfully: [cartridge-group] %s", - cartridgeGroupBean.getUuid()))).build(); + String.format("Cartridge group updated successfully: [cartridge-group-uuid] %s [cartridge-group-name] %s [tenant-id] %d", + cartridgeGroupBean.getUuid(),cartridgeGroupBean.getName(),cartridgeGroupBean.getTenantId()))).build(); } catch (InvalidCartridgeGroupDefinitionException e) { return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean( http://git-wip-us.apache.org/repos/asf/stratos/blob/ca0333bb/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 a1ff800..8e7bbf9 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 @@ -200,8 +200,8 @@ public class StratosApiV41Utils { cloudControllerServiceClient.updateCartridge(cartridgeConfig); if (log.isDebugEnabled()) { - log.debug(String.format("Successfully updated cartridge: [cartridge-uuid] %s [cartridge-type] %s ", - cartridgeBean.getUuid() ,cartridgeBean.getType())); + log.debug(String.format("Successfully updated cartridge: [cartridge-uuid] %s [cartridge-type] %s [tenant-id]", + cartridgeBean.getUuid() ,cartridgeBean.getType(), cartridgeBean.getTenantId())); } } catch (CloudControllerServiceCartridgeDefinitionNotExistsExceptionException e) { String msg = "Could not add cartridge"; @@ -242,7 +242,7 @@ public class StratosApiV41Utils { } if (StringUtils.isEmpty(cartridgeConfig.getCategory())) { throw new RestAPIException(String.format("Category is not specified in cartridge: [cartridge-uuid] %s " + - "[cartridge-type] %s", cartridgeConfig.getUuid(), cartridgeConfig.getType())); + "[cartridge-type] %s [tenant-id] %d", cartridgeConfig.getUuid(), cartridgeConfig.getType(),cartridgeConfig.getTenantId())); } return cartridgeConfig; } @@ -275,8 +275,8 @@ public class StratosApiV41Utils { // Validate whether cartridge can be removed if (!smServiceClient.canCartridgeBeRemoved(cartridge.getUuid())) { - String message = String.format("Cannot remove cartridge : [cartridge-uuid] %s [cartridge-type] %s ", - cartridge.getUuid(), cartridgeType + "since it is used in another cartridge group or an " + + String message = String.format("Cannot remove cartridge : [cartridge-uuid] %s [cartridge-type] %s [tenant-id] %d", + cartridge.getUuid(), cartridgeType,tenantId + "since it is used in another cartridge group or an " + "application"); log.error(message); throw new RestAPIException(message);
