You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/08/12 07:39:22 UTC
[1/3] stratos git commit: Fixing minor issues in artifact addition
and updation
Repository: stratos
Updated Branches:
refs/heads/tenant-isolation dd6aedea3 -> 0f6b228bc
Fixing minor issues in artifact addition and updation
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f1c3b324
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f1c3b324
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f1c3b324
Branch: refs/heads/tenant-isolation
Commit: f1c3b32477705d90f76c0d077bd8bc55823c6236
Parents: 7dc7336
Author: Dinithi <di...@wso2.com>
Authored: Tue Aug 11 18:00:16 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Tue Aug 11 18:00:16 2015 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/util/AutoscalerUtil.java | 4 ++--
.../stratos/rest/endpoint/api/StratosApiV41.java | 15 ++++++++++++++-
.../rest/endpoint/api/StratosApiV41Utils.java | 16 ++++++++++++++++
3 files changed, 32 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f1c3b324/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
index 26ca7fb..85a4acc 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
@@ -639,7 +639,7 @@ public class AutoscalerUtil {
}
// application policy should contain at least one network partition reference
- String[] networkPartitionIds = applicationPolicy.getNetworkPartitionsUuid();
+ String[] networkPartitionIds = applicationPolicy.getNetworkPartitions();
if (null == networkPartitionIds || networkPartitionIds.length == 0) {
String msg = "Invalid Application Policy: "
+ "Application Policy is not containing any network partition reference";
@@ -663,7 +663,7 @@ public class AutoscalerUtil {
NetworkPartition networkPartitionForTenant = null;
if (networkPartitions != null) {
for (NetworkPartition networkPartition : networkPartitions) {
- if (applicationPolicy.getTenantId() == networkPartition.getTenantId() && networkPartition.getUuid()
+ if (applicationPolicy.getTenantId() == networkPartition.getTenantId() && networkPartition.getId()
.equals(networkPartitionId)) {
networkPartitionForTenant = networkPartition;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f1c3b324/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 7ca3070..8aefcea 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
@@ -498,6 +498,18 @@ public class StratosApiV41 extends AbstractApi {
PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
String cartrideGroupUuid= UUID.randomUUID().toString();
int tenantId = carbonContext.getTenantId();
+
+ CartridgeGroupBean groupBean = null;
+ groupBean = StratosApiV41Utils.getServiceGroupDefinition(cartridgeGroupBean.getName(), carbonContext.getTenantId());
+
+ if (groupBean != null) {
+ String msg = String.format("Cartridge already exists: [cartridge-type] %s [cartridge-uuid] %s [tenant-id] %d",
+ cartridgeGroupBean.getName(), cartrideGroupUuid, tenantId);
+ log.warn(msg);
+ return Response.status(Response.Status.CONFLICT)
+ .entity(new ResponseMessageBean(ResponseMessageBean.ERROR, msg)).build();
+ }
+
try {
StratosApiV41Utils.addCartridgeGroup(cartridgeGroupBean, cartrideGroupUuid, tenantId);
URI url = uriInfo.getAbsolutePathBuilder().path(cartridgeGroupBean.getName()).build();
@@ -573,7 +585,8 @@ public class StratosApiV41 extends AbstractApi {
@PathParam("name") String name) throws RestAPIException {
PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
- CartridgeGroupBean serviceGroupDefinition = StratosApiV41Utils.getServiceGroupDefinition(name,carbonContext.getTenantId());
+ CartridgeGroupBean serviceGroupDefinition = StratosApiV41Utils.getServiceGroupDefinition(name,
+ carbonContext.getTenantId());
if (serviceGroupDefinition != null) {
return Response.ok().entity(serviceGroupDefinition).build();
http://git-wip-us.apache.org/repos/asf/stratos/blob/f1c3b324/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 5c9ab69..36dc04e 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
@@ -2981,6 +2981,14 @@ public class StratosApiV41Utils {
.getNetworkPartitions()) {
NetworkPartition networkPartition = CloudControllerServiceClient.getInstance()
.getNetworkPartitionByTenant(networkPartitionReferenceBean.getId(), tenantId);
+
+ if (networkPartition == null) {
+ String message = String.format("Network partition not found: for [deployment-policy-id] %s" +
+ "[network-partition-id] %s" , deploymentPolicyDefinitionBean.getId(),
+ networkPartitionReferenceBean.getId());
+ throw new RestAPIException(message);
+ }
+
for (NetworkPartitionBean networkPartitionBean : networkPartitions) {
if (networkPartition.getTenantId() == tenantId && networkPartitionBean.getId().equals
(networkPartitionReferenceBean.getId())) {
@@ -3080,6 +3088,14 @@ public class StratosApiV41Utils {
.getNetworkPartitions()) {
NetworkPartition networkPartition = CloudControllerServiceClient.getInstance()
.getNetworkPartitionByTenant(networkPartitionReferenceBean.getId(), tenantId);
+
+ if (networkPartition == null) {
+ String message = String.format("Network partition not found: for [deployment-policy-id] %s" +
+ "[network-partition-id] %s" , deploymentPolicyDefinitionBean.getId(),
+ networkPartitionReferenceBean.getId());
+ throw new RestAPIException(message);
+ }
+
for (NetworkPartitionBean networkPartitionBean : networkPartitions) {
if (networkPartition.getTenantId() == tenantId && networkPartitionBean.getId().equals
(networkPartitionReferenceBean.getId())) {
[2/3] stratos git commit: Merge branch 'tenant-isolation' of
https://github.com/apache/stratos into tenant-isolation-v1
Posted by ga...@apache.org.
Merge branch 'tenant-isolation' of https://github.com/apache/stratos into tenant-isolation-v1
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/573c5a80
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/573c5a80
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/573c5a80
Branch: refs/heads/tenant-isolation
Commit: 573c5a8078232943136ccefd83f2d15fa6829980
Parents: f1c3b32 dd6aede
Author: Dinithi <di...@wso2.com>
Authored: Wed Aug 12 10:10:35 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Wed Aug 12 10:10:35 2015 +0530
----------------------------------------------------------------------
.../services/CloudControllerService.java | 10 +-
.../impl/CloudControllerServiceImpl.java | 32 +-
.../client/CloudControllerServiceClient.java | 8 +-
.../rest/endpoint/api/StratosApiV41.java | 7 +-
.../rest/endpoint/api/StratosApiV41Utils.java | 15 +-
.../integration/tests/RestConstants.java | 6 +
.../tests/StratosTestServerManager.java | 14 +
.../integration/tests/rest/RestClient.java | 22 +-
.../src/test/resources/tenant/tenant1.json | 9 +
.../src/test/resources/tenant/tenant2.json | 9 +
.../main/resources/CloudControllerService.wsdl | 1010 +++++++++---------
11 files changed, 605 insertions(+), 537 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/573c5a80/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/573c5a80/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
[3/3] stratos git commit: remove UUID and tenantId from
AutoscalingPolicyBean
Posted by ga...@apache.org.
remove UUID and tenantId from AutoscalingPolicyBean
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0f6b228b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0f6b228b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0f6b228b
Branch: refs/heads/tenant-isolation
Commit: 0f6b228bcbdfabd8c009863076d38604af645774
Parents: 573c5a8
Author: Dinithi <di...@wso2.com>
Authored: Wed Aug 12 10:37:55 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Wed Aug 12 10:37:55 2015 +0530
----------------------------------------------------------------------
.../policy/autoscale/AutoscalePolicyBean.java | 18 ------------------
.../stratos/rest/endpoint/api/StratosApiV41.java | 14 ++++++--------
.../rest/endpoint/api/StratosApiV41Utils.java | 14 +++++++-------
.../endpoint/util/converter/ObjectConverter.java | 6 ++----
4 files changed, 15 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/0f6b228b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/AutoscalePolicyBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/AutoscalePolicyBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/AutoscalePolicyBean.java
index bb3de10..5dc025d 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/AutoscalePolicyBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/AutoscalePolicyBean.java
@@ -25,28 +25,10 @@ import javax.xml.bind.annotation.XmlRootElement;
public class AutoscalePolicyBean {
private String id;
- private String uuid;
- private int tenantId;
private String displayName;
private String description;
private LoadThresholdsBean loadThresholds;
- public String getUuid() {
- return uuid;
- }
-
- public void setUuid(String uuid) {
- this.uuid = uuid;
- }
-
- public int getTenantId() {
- return tenantId;
- }
-
- public void setTenantId(int tenantId) {
- this.tenantId = tenantId;
- }
-
public String getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0f6b228b/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 16c2b35..a682c9e 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
@@ -161,8 +161,8 @@ public class StratosApiV41 extends AbstractApi {
}
URI url = uriInfo.getAbsolutePathBuilder().path(deploymentPolicyId).build();
return Response.created(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS,
- String.format("Deployment policy added successfully: [deployment-policy-uuid] %s " +
- "[deployment-policy-uuid] %s", deploymentPolicyUuid, deploymentPolicyId))).build();
+ String.format("Deployment policy added successfully: [deployment-policy-id] %s ",
+ deploymentPolicyId))).build();
}
/**
@@ -1453,13 +1453,12 @@ public class StratosApiV41 extends AbstractApi {
public Response addAutoscalingPolicy(
AutoscalePolicyBean autoscalePolicy) throws RestAPIException {
String autoscalingPolicyId = autoscalePolicy.getId();
- autoscalePolicy.setUuid(UUID.randomUUID().toString());
- String autoscalingPolicyUuid = autoscalePolicy.getUuid();
+ String autoscalingPolicyUuid = UUID.randomUUID().toString();
PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
- autoscalePolicy.setTenantId(carbonContext.getTenantId());
+ int tenantId = carbonContext.getTenantId();
try {
- StratosApiV41Utils.addAutoscalingPolicy(autoscalePolicy);
+ StratosApiV41Utils.addAutoscalingPolicy(autoscalePolicy, autoscalingPolicyUuid, tenantId);
URI url = uriInfo.getAbsolutePathBuilder().path(autoscalePolicy.getId()).build();
return Response.created(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS,
String.format("Autoscaling policy added successfully: [autoscale-policy-uuid] %s " +
@@ -1497,8 +1496,7 @@ public class StratosApiV41 extends AbstractApi {
ResponseMessageBean.ERROR, "Autoscaling policy is invalid")).build();
}
return Response.ok().entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS,
- String.format("Autoscaling policy updated successfully: [autoscale-policy-uuid] %s " +
- "[autoscale-policy-id] %s", autoscalePolicy.getUuid(),
+ String.format("Autoscaling policy updated successfully: [autoscale-policy-id] %s",
autoscalePolicy.getId()))).build();
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0f6b228b/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 025c010..6e354ee 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
@@ -674,18 +674,18 @@ public class StratosApiV41Utils {
* @param autoscalePolicyBean autoscalePolicyBean
* @throws RestAPIException
*/
- public static void addAutoscalingPolicy(AutoscalePolicyBean autoscalePolicyBean) throws RestAPIException,
+ public static void addAutoscalingPolicy(AutoscalePolicyBean autoscalePolicyBean, String autoscalingPolicyUuid,
+ int tenantId) throws RestAPIException,
AutoscalerServiceInvalidPolicyExceptionException,
AutoscalerServiceAutoScalingPolicyAlreadyExistExceptionException {
log.info(String.format("Adding autoscaling policy: [autoscaling-policy-uuid] %s [autoscaling-policy-id] %s",
- autoscalePolicyBean.getUuid(), autoscalePolicyBean.getId()));
+ autoscalingPolicyUuid, autoscalePolicyBean.getId()));
AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient();
if (autoscalerServiceClient != null) {
-
org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy autoscalePolicy = ObjectConverter.
- convertToCCAutoscalerPojo(autoscalePolicyBean,autoscalePolicyBean.getUuid(),autoscalePolicyBean.getTenantId());
+ convertToCCAutoscalerPojo(autoscalePolicyBean, autoscalingPolicyUuid, tenantId);
try {
autoscalerServiceClient.addAutoscalingPolicy(autoscalePolicy);
@@ -890,8 +890,7 @@ public class StratosApiV41Utils {
public static void updateAutoscalingPolicy(AutoscalePolicyBean autoscalePolicyBean) throws RestAPIException,
AutoscalerServiceInvalidPolicyExceptionException {
- log.info(String.format("Updating autoscaling policy: [autoscaling-policy-uuid] %s [autoscaling-policy-id] %s",
- autoscalePolicyBean.getUuid(), autoscalePolicyBean.getId()));
+ log.info(String.format("Updating autoscaling policy: [autoscaling-policy-id] %s", autoscalePolicyBean.getId()));
AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient();
if (autoscalerServiceClient != null) {
@@ -901,7 +900,8 @@ public class StratosApiV41Utils {
.getAutoScalePolicyForTenant(autoscalePolicyBean.getId(), carbonContext.getTenantId())
.getUuid();
org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy autoscalePolicy =
- ObjectConverter.convertToCCAutoscalerPojo(autoscalePolicyBean,autoscalerUuid,carbonContext.getTenantId());
+ ObjectConverter.convertToCCAutoscalerPojo(autoscalePolicyBean, autoscalerUuid,
+ carbonContext.getTenantId());
autoscalerServiceClient.updateAutoscalingPolicy(autoscalePolicy);
} catch (RemoteException e) {
log.error(e.getMessage(), e);
http://git-wip-us.apache.org/repos/asf/stratos/blob/0f6b228b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index fbb0039..03f14d3 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -421,7 +421,7 @@ public class ObjectConverter {
}
public static org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy convertToCCAutoscalerPojo(
- AutoscalePolicyBean autoscalePolicyBean,String uuid,int tenantId) {
+ AutoscalePolicyBean autoscalePolicyBean, String uuid, int tenantId) {
if (autoscalePolicyBean == null) {
return null;
@@ -432,7 +432,7 @@ public class ObjectConverter {
autoscalePolicy.setId(autoscalePolicyBean.getId());
autoscalePolicy.setUuid(uuid);
- autoscalePolicy.setTenantId(autoscalePolicyBean.getTenantId());
+ autoscalePolicy.setTenantId(tenantId);
autoscalePolicy.setDescription(autoscalePolicyBean.getDescription());
autoscalePolicy.setDisplayName(autoscalePolicyBean.getDisplayName());
autoscalePolicy.setTenantId(tenantId);
@@ -886,8 +886,6 @@ public class ObjectConverter {
AutoscalePolicyBean autoscalePolicyBean = new AutoscalePolicyBean();
autoscalePolicyBean.setId(autoscalePolicy.getId());
- autoscalePolicyBean.setUuid(autoscalePolicy.getUuid());
- autoscalePolicyBean.setTenantId(autoscalePolicy.getTenantId());
autoscalePolicyBean.setDescription(autoscalePolicy.getDescription());
autoscalePolicyBean.setDisplayName(autoscalePolicy.getDisplayName());
if (autoscalePolicy.getLoadThresholds() != null) {