Repository: stratos Updated Branches: refs/heads/tenant-isolation e57a2f735 -> 31a496fd3
Update the updateAutoscalePolicy Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/31a496fd Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/31a496fd Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/31a496fd Branch: refs/heads/tenant-isolation Commit: 31a496fd300527f23077d3972b1bfe7833b25652 Parents: e57a2f7 Author: Gayan Gunarathne <[email protected]> Authored: Tue Aug 4 18:10:59 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Tue Aug 4 18:10:59 2015 +0530 ---------------------------------------------------------------------- .../apache/stratos/rest/endpoint/api/StratosApiV40Utils.java | 2 +- .../apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 4 ++-- .../rest/endpoint/util/converter/ObjectConverter.java | 3 ++- .../stratos/integration/tests/SampleApplicationsTest.java | 8 ++++---- 4 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/31a496fd/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java index e837e01..552fe1c 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java @@ -156,7 +156,7 @@ public class StratosApiV40Utils { if (autoscalerServiceClient != null) { org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy autoscalePolicy = ObjectConverter. - convertToCCAutoscalerPojo(autoscalePolicyBean,null); + convertToCCAutoscalerPojo(autoscalePolicyBean,null,-1234); try { autoscalerServiceClient http://git-wip-us.apache.org/repos/asf/stratos/blob/31a496fd/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 b79435c..47f1164 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 @@ -677,7 +677,7 @@ public class StratosApiV41Utils { if (autoscalerServiceClient != null) { org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy autoscalePolicy = ObjectConverter. - convertToCCAutoscalerPojo(autoscalePolicyBean,autoscalePolicyBean.getUuid()); + convertToCCAutoscalerPojo(autoscalePolicyBean,autoscalePolicyBean.getUuid(),autoscalePolicyBean.getTenantId()); try { autoscalerServiceClient.addAutoscalingPolicy(autoscalePolicy); @@ -893,7 +893,7 @@ public class StratosApiV41Utils { .getAutoScalePolicyForTenant(autoscalePolicyBean.getId(), carbonContext.getTenantId()) .getUuid(); org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy autoscalePolicy = - ObjectConverter.convertToCCAutoscalerPojo(autoscalePolicyBean,autoscalerUuid); + 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/31a496fd/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 fd80297..f1e2ff5 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) { + AutoscalePolicyBean autoscalePolicyBean,String uuid,int tenantId) { if (autoscalePolicyBean == null) { return null; @@ -435,6 +435,7 @@ public class ObjectConverter { autoscalePolicy.setTenantId(autoscalePolicyBean.getTenantId()); autoscalePolicy.setDescription(autoscalePolicyBean.getDescription()); autoscalePolicy.setDisplayName(autoscalePolicyBean.getDisplayName()); + autoscalePolicy.setTenantId(tenantId); if (autoscalePolicyBean.getLoadThresholds() != null) { http://git-wip-us.apache.org/repos/asf/stratos/blob/31a496fd/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java index 5881c32..0d71ddd 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java @@ -120,14 +120,14 @@ public class SampleApplicationsTest extends StratosTestServerManager { assertEquals(bean.getLoadThresholds().getMemoryConsumption().getThreshold(), 45.0, 0.0); assertEquals(bean.getLoadThresholds().getLoadAverage().getThreshold(), 25.0, 0.0); - /* boolean updated = autoscalingPolicyTest.updateAutoscalingPolicy("autoscaling-policy-c0.json", - endpoint, restClient); + boolean updated = autoscalingPolicyTest.updateAutoscalingPolicy("autoscaling-policy-c0.json", + endpoint, restClient,"admin","admin"); assertEquals(updated, true); AutoscalePolicyBean updatedBean = autoscalingPolicyTest.getAutoscalingPolicy("autoscaling-policy-c0", endpoint, - restClient); + restClient,"admin","admin"); assertEquals(updatedBean.getLoadThresholds().getRequestsInFlight().getThreshold(), 30.0, 0.0); assertEquals(updatedBean.getLoadThresholds().getMemoryConsumption().getThreshold(), 40.0, 0.0); - assertEquals(updatedBean.getLoadThresholds().getLoadAverage().getThreshold(), 20.0, 0.0); */ + assertEquals(updatedBean.getLoadThresholds().getLoadAverage().getThreshold(), 20.0, 0.0); boolean removed = autoscalingPolicyTest.removeAutoscalingPolicy("autoscaling-policy-c0", endpoint, restClient, "admin", "admin");
