Fixing the merge confict
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bcfdfa3b Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bcfdfa3b Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bcfdfa3b Branch: refs/heads/master Commit: bcfdfa3b1d54e747d546d4a97e5bedaa52c31326 Parents: 9d02a59 Author: gayangunarathne <[email protected]> Authored: Fri Sep 11 19:33:28 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Fri Sep 11 19:33:28 2015 +0530 ---------------------------------------------------------------------- .../autoscaler/monitor/cluster/ClusterMonitor.java | 2 +- .../mock/iaas/statistics/MockHealthStatistics.java | 6 ++++-- .../tests/application/ApplicationUpdateTest.java | 4 ++-- .../src/test/resources/stratos-testng.xml | 17 ++++++----------- 4 files changed, 13 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/bcfdfa3b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java index 952be10..b86502c 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java @@ -1503,7 +1503,7 @@ public class ClusterMonitor extends Monitor { } public boolean createInstanceOnDemand(String instanceId) { - Cluster cluster = TopologyManager.getTopology().getService(this.serviceType). + Cluster cluster = TopologyManager.getTopology().getService(this.serviceUuid). getCluster(this.clusterId); try { return createInstance(instanceId, cluster); http://git-wip-us.apache.org/repos/asf/stratos/blob/bcfdfa3b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/MockHealthStatistics.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/MockHealthStatistics.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/MockHealthStatistics.java index d8563c5..4cab45c 100644 --- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/MockHealthStatistics.java +++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/statistics/MockHealthStatistics.java @@ -60,7 +60,8 @@ public class MockHealthStatistics { * @param value */ public void addStatistics(String cartridgeType, MockScalingFactor scalingFactor, Integer value) { - Map<String, Integer> factorValueMap = statisticsMap.get(cartridgeType); + String[] cartridgeDetails = cartridgeType.split("~"); + Map<String, Integer> factorValueMap = statisticsMap.get(cartridgeDetails[0]); if (factorValueMap == null) { synchronized (MockHealthStatistics.class) { if (factorValueMap == null) { @@ -100,7 +101,8 @@ public class MockHealthStatistics { * @param scalingFactor */ public void removeStatistics(String cartridgeType, MockScalingFactor scalingFactor) { - Map<String, Integer> factorValueMap = statisticsMap.get(cartridgeType); + String[] cartridgeDetails = cartridgeType.split("~"); + Map<String, Integer> factorValueMap = statisticsMap.get(cartridgeDetails[0]); if (factorValueMap != null) { if (factorValueMap.containsKey(scalingFactor.toString())) { factorValueMap.remove(scalingFactor.toString()); http://git-wip-us.apache.org/repos/asf/stratos/blob/bcfdfa3b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTest.java b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTest.java index fd173b6..abec8f0 100644 --- a/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTest.java +++ b/products/stratos/modules/integration/test-integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTest.java @@ -90,9 +90,9 @@ public class ApplicationUpdateTest extends StratosIntegrationTest { testApplicationRuntimeForTenant(restClientTenant2, tenant2Id, autoscalingPolicyId); - //testApplicationUndeplymentForTenant(restClientTenant1, tenant1Id, autoscalingPolicyId); + testApplicationUndeplymentForTenant(restClientTenant1, tenant1Id, autoscalingPolicyId); - //TopologyHandler.getInstance().assertApplicationForNonAvailability(applicationId, tenant1Id); + TopologyHandler.getInstance().assertApplicationForNonAvailability(applicationId, tenant1Id); testApplicationUndeplymentForTenant(restClientTenant2, tenant2Id, autoscalingPolicyId); http://git-wip-us.apache.org/repos/asf/stratos/blob/bcfdfa3b/products/stratos/modules/integration/test-integration/src/test/resources/stratos-testng.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-integration/src/test/resources/stratos-testng.xml b/products/stratos/modules/integration/test-integration/src/test/resources/stratos-testng.xml index e9b0bce..5d86a6f 100644 --- a/products/stratos/modules/integration/test-integration/src/test/resources/stratos-testng.xml +++ b/products/stratos/modules/integration/test-integration/src/test/resources/stratos-testng.xml @@ -73,29 +73,24 @@ <class name="org.apache.stratos.integration.tests.application.ApplicationUpdateTest"/> </classes> </test> - <!--test name="SingleClusterScalingTest" preserve-order="true" parallel="false"> + <test name="SingleClusterScalingTest" preserve-order="true" parallel="false"> <classes> <class name="org.apache.stratos.integration.tests.application.SingleClusterScalingTest"/> </classes> - </test--> - <!--test name="ApplicationBurstingTest" preserve-order="true" parallel="false"> + </test> + <test name="ApplicationBurstingTest" preserve-order="true" parallel="false"> <classes> <class name="org.apache.stratos.integration.tests.application.ApplicationBurstingTest"/> </classes> - </test--> + </test> <test name="PartitionRoundRobinClusterTest" preserve-order="true" parallel="false"> <classes> <class name="org.apache.stratos.integration.tests.application.PartitionRoundRobinClusterTest"/> </classes> </test> - <!--test name="GroupStartupOrderTest" preserve-order="true" parallel="false"> - <classes> - <class name="org.apache.stratos.integration.tests.application.GroupStartupOrderTest"/> - </classes> - </test--> - <!--test name="GroupTerminationBehaviorTest" preserve-order="true" parallel="false"> + <test name="GroupTerminationBehaviorTest" preserve-order="true" parallel="false"> <classes> <class name="org.apache.stratos.integration.tests.application.GroupTerminationBehaviorTest"/> </classes> - </test--> + </test> </suite> \ No newline at end of file
